2124 files changed, 906 insertions, 118 deletions

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