Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1280 files changed, 1530 insertions, 23 deletions

diff --git a/src/test/ui/parser/ascii-only-character-escape.rs b/tests/ui/parser/ascii-only-character-escape.rs
index 725c8ad23..725c8ad23 100644
--- a/src/test/ui/parser/ascii-only-character-escape.rs
+++ b/tests/ui/parser/ascii-only-character-escape.rs
diff --git a/src/test/ui/parser/ascii-only-character-escape.stderr b/tests/ui/parser/ascii-only-character-escape.stderr
index b599b35f4..b599b35f4 100644
--- a/src/test/ui/parser/ascii-only-character-escape.stderr
+++ b/tests/ui/parser/ascii-only-character-escape.stderr
diff --git a/src/test/ui/parser/assoc-const-underscore-semantic-fail.rs b/tests/ui/parser/assoc-const-underscore-semantic-fail.rs
index d37ce06c5..d37ce06c5 100644
--- a/src/test/ui/parser/assoc-const-underscore-semantic-fail.rs
+++ b/tests/ui/parser/assoc-const-underscore-semantic-fail.rs
diff --git a/src/test/ui/parser/assoc-const-underscore-semantic-fail.stderr b/tests/ui/parser/assoc-const-underscore-semantic-fail.stderr
index 538bf0ec1..538bf0ec1 100644
--- a/src/test/ui/parser/assoc-const-underscore-semantic-fail.stderr
+++ b/tests/ui/parser/assoc-const-underscore-semantic-fail.stderr
diff --git a/src/test/ui/parser/assoc-const-underscore-syntactic-pass.rs b/tests/ui/parser/assoc-const-underscore-syntactic-pass.rs
index 60da408c8..60da408c8 100644
--- a/src/test/ui/parser/assoc-const-underscore-syntactic-pass.rs
+++ b/tests/ui/parser/assoc-const-underscore-syntactic-pass.rs
diff --git a/src/test/ui/parser/assoc-oddities-1.rs b/tests/ui/parser/assoc-oddities-1.rs
index 5914805e5..5914805e5 100644
--- a/src/test/ui/parser/assoc-oddities-1.rs
+++ b/tests/ui/parser/assoc-oddities-1.rs
diff --git a/src/test/ui/parser/assoc-oddities-1.stderr b/tests/ui/parser/assoc-oddities-1.stderr
index acf71b489..acf71b489 100644
--- a/src/test/ui/parser/assoc-oddities-1.stderr
+++ b/tests/ui/parser/assoc-oddities-1.stderr
diff --git a/src/test/ui/parser/assoc-oddities-2.rs b/tests/ui/parser/assoc-oddities-2.rs
index 3d35aad74..3d35aad74 100644
--- a/src/test/ui/parser/assoc-oddities-2.rs
+++ b/tests/ui/parser/assoc-oddities-2.rs
diff --git a/src/test/ui/parser/assoc-oddities-2.stderr b/tests/ui/parser/assoc-oddities-2.stderr
index d3b90c34c..d3b90c34c 100644
--- a/src/test/ui/parser/assoc-oddities-2.stderr
+++ b/tests/ui/parser/assoc-oddities-2.stderr
diff --git a/src/test/ui/parser/assoc-static-semantic-fail.rs b/tests/ui/parser/assoc-static-semantic-fail.rs
index a8759d209..a8759d209 100644
--- a/src/test/ui/parser/assoc-static-semantic-fail.rs
+++ b/tests/ui/parser/assoc-static-semantic-fail.rs
diff --git a/src/test/ui/parser/assoc-static-semantic-fail.stderr b/tests/ui/parser/assoc-static-semantic-fail.stderr
index 8a74f49b9..8a74f49b9 100644
--- a/src/test/ui/parser/assoc-static-semantic-fail.stderr
+++ b/tests/ui/parser/assoc-static-semantic-fail.stderr
diff --git a/src/test/ui/parser/assoc-static-syntactic-fail.rs b/tests/ui/parser/assoc-static-syntactic-fail.rs
index 492f2ea16..492f2ea16 100644
--- a/src/test/ui/parser/assoc-static-syntactic-fail.rs
+++ b/tests/ui/parser/assoc-static-syntactic-fail.rs
diff --git a/src/test/ui/parser/assoc-static-syntactic-fail.stderr b/tests/ui/parser/assoc-static-syntactic-fail.stderr
index e97236145..e97236145 100644
--- a/src/test/ui/parser/assoc-static-syntactic-fail.stderr
+++ b/tests/ui/parser/assoc-static-syntactic-fail.stderr
diff --git a/src/test/ui/parser/assoc-type-in-type-arg.rs b/tests/ui/parser/assoc-type-in-type-arg.rs
index 000956ea2..000956ea2 100644
--- a/src/test/ui/parser/assoc-type-in-type-arg.rs
+++ b/tests/ui/parser/assoc-type-in-type-arg.rs
diff --git a/src/test/ui/parser/assoc-type-in-type-arg.stderr b/tests/ui/parser/assoc-type-in-type-arg.stderr
index b637702f2..b637702f2 100644
--- a/src/test/ui/parser/assoc-type-in-type-arg.stderr
+++ b/tests/ui/parser/assoc-type-in-type-arg.stderr
diff --git a/src/test/ui/parser/associated-types-project-from-hrtb-explicit.rs b/tests/ui/parser/associated-types-project-from-hrtb-explicit.rs
index b238a9ca2..b238a9ca2 100644
--- a/src/test/ui/parser/associated-types-project-from-hrtb-explicit.rs
+++ b/tests/ui/parser/associated-types-project-from-hrtb-explicit.rs
diff --git a/src/test/ui/parser/associated-types-project-from-hrtb-explicit.stderr b/tests/ui/parser/associated-types-project-from-hrtb-explicit.stderr
index aa0fa0e3c..aa0fa0e3c 100644
--- a/src/test/ui/parser/associated-types-project-from-hrtb-explicit.stderr
+++ b/tests/ui/parser/associated-types-project-from-hrtb-explicit.stderr
diff --git a/src/test/ui/parser/attr-bad-meta-2.rs b/tests/ui/parser/attr-bad-meta-2.rs
index db612ed88..db612ed88 100644
--- a/src/test/ui/parser/attr-bad-meta-2.rs
+++ b/tests/ui/parser/attr-bad-meta-2.rs
diff --git a/src/test/ui/parser/attr-bad-meta-2.stderr b/tests/ui/parser/attr-bad-meta-2.stderr
index 6fc6fb665..6fc6fb665 100644
--- a/src/test/ui/parser/attr-bad-meta-2.stderr
+++ b/tests/ui/parser/attr-bad-meta-2.stderr
diff --git a/src/test/ui/parser/attr-bad-meta-3.rs b/tests/ui/parser/attr-bad-meta-3.rs
index b51e9f221..b51e9f221 100644
--- a/src/test/ui/parser/attr-bad-meta-3.rs
+++ b/tests/ui/parser/attr-bad-meta-3.rs
diff --git a/src/test/ui/parser/attr-bad-meta-3.stderr b/tests/ui/parser/attr-bad-meta-3.stderr
index 4fa420c79..4fa420c79 100644
--- a/src/test/ui/parser/attr-bad-meta-3.stderr
+++ b/tests/ui/parser/attr-bad-meta-3.stderr
diff --git a/src/test/ui/parser/attr-bad-meta.rs b/tests/ui/parser/attr-bad-meta.rs
index 8001977f5..8001977f5 100644
--- a/src/test/ui/parser/attr-bad-meta.rs
+++ b/tests/ui/parser/attr-bad-meta.rs
diff --git a/src/test/ui/parser/attr-bad-meta.stderr b/tests/ui/parser/attr-bad-meta.stderr
index 8d65c423c..8d65c423c 100644
--- a/src/test/ui/parser/attr-bad-meta.stderr
+++ b/tests/ui/parser/attr-bad-meta.stderr
diff --git a/src/test/ui/parser/attr-before-eof.rs b/tests/ui/parser/attr-before-eof.rs
index 6af1783e6..6af1783e6 100644
--- a/src/test/ui/parser/attr-before-eof.rs
+++ b/tests/ui/parser/attr-before-eof.rs
diff --git a/src/test/ui/parser/attr-before-eof.stderr b/tests/ui/parser/attr-before-eof.stderr
index a2acb9437..a2acb9437 100644
--- a/src/test/ui/parser/attr-before-eof.stderr
+++ b/tests/ui/parser/attr-before-eof.stderr
diff --git a/src/test/ui/parser/attr-dangling-in-fn.rs b/tests/ui/parser/attr-dangling-in-fn.rs
index c7c45bafb..c7c45bafb 100644
--- a/src/test/ui/parser/attr-dangling-in-fn.rs
+++ b/tests/ui/parser/attr-dangling-in-fn.rs
diff --git a/src/test/ui/parser/attr-dangling-in-fn.stderr b/tests/ui/parser/attr-dangling-in-fn.stderr
index b1bb3ab3b..b1bb3ab3b 100644
--- a/src/test/ui/parser/attr-dangling-in-fn.stderr
+++ b/tests/ui/parser/attr-dangling-in-fn.stderr
diff --git a/src/test/ui/parser/attr-dangling-in-mod.rs b/tests/ui/parser/attr-dangling-in-mod.rs
index 261ed3913..261ed3913 100644
--- a/src/test/ui/parser/attr-dangling-in-mod.rs
+++ b/tests/ui/parser/attr-dangling-in-mod.rs
diff --git a/src/test/ui/parser/attr-dangling-in-mod.stderr b/tests/ui/parser/attr-dangling-in-mod.stderr
index 1c892eac0..1c892eac0 100644
--- a/src/test/ui/parser/attr-dangling-in-mod.stderr
+++ b/tests/ui/parser/attr-dangling-in-mod.stderr
diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad.rs b/tests/ui/parser/attr-stmt-expr-attr-bad.rs
index 469c3855c..469c3855c 100644
--- a/src/test/ui/parser/attr-stmt-expr-attr-bad.rs
+++ b/tests/ui/parser/attr-stmt-expr-attr-bad.rs
diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr b/tests/ui/parser/attr-stmt-expr-attr-bad.stderr
index 872c560cb..872c560cb 100644
--- a/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr
+++ b/tests/ui/parser/attr-stmt-expr-attr-bad.stderr
diff --git a/src/test/ui/parser/attr-with-a-semicolon.rs b/tests/ui/parser/attr-with-a-semicolon.rs
index 56fe40b91..56fe40b91 100644
--- a/src/test/ui/parser/attr-with-a-semicolon.rs
+++ b/tests/ui/parser/attr-with-a-semicolon.rs
diff --git a/src/test/ui/parser/attr-with-a-semicolon.stderr b/tests/ui/parser/attr-with-a-semicolon.stderr
index 0de3490b8..0de3490b8 100644
--- a/src/test/ui/parser/attr-with-a-semicolon.stderr
+++ b/tests/ui/parser/attr-with-a-semicolon.stderr
diff --git a/src/test/ui/parser/attr.rs b/tests/ui/parser/attr.rs
index 42b2dfde8..42b2dfde8 100644
--- a/src/test/ui/parser/attr.rs
+++ b/tests/ui/parser/attr.rs
diff --git a/src/test/ui/parser/attr.stderr b/tests/ui/parser/attr.stderr
index 7cd0ac224..7cd0ac224 100644
--- a/src/test/ui/parser/attr.stderr
+++ b/tests/ui/parser/attr.stderr
diff --git a/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.rs b/tests/ui/parser/attribute-with-no-generics-in-parameter-list.rs
index c2cc91d8f..c2cc91d8f 100644
--- a/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.rs
+++ b/tests/ui/parser/attribute-with-no-generics-in-parameter-list.rs
diff --git a/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.stderr b/tests/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
index 4c5964715..4c5964715 100644
--- a/src/test/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
+++ b/tests/ui/parser/attribute-with-no-generics-in-parameter-list.stderr
diff --git a/src/test/ui/parser/attrs-after-extern-mod.rs b/tests/ui/parser/attrs-after-extern-mod.rs
index e3f0fa0fc..e3f0fa0fc 100644
--- a/src/test/ui/parser/attrs-after-extern-mod.rs
+++ b/tests/ui/parser/attrs-after-extern-mod.rs
diff --git a/src/test/ui/parser/attrs-after-extern-mod.stderr b/tests/ui/parser/attrs-after-extern-mod.stderr
index 135d98457..135d98457 100644
--- a/src/test/ui/parser/attrs-after-extern-mod.stderr
+++ b/tests/ui/parser/attrs-after-extern-mod.stderr
diff --git a/src/test/ui/parser/bad-char-literals.rs b/tests/ui/parser/bad-char-literals.rs
index 748b4a222..748b4a222 100644
--- a/src/test/ui/parser/bad-char-literals.rs
+++ b/tests/ui/parser/bad-char-literals.rs
diff --git a/src/test/ui/parser/bad-char-literals.stderr b/tests/ui/parser/bad-char-literals.stderr
index a22ddbac1..a22ddbac1 100644
--- a/src/test/ui/parser/bad-char-literals.stderr
+++ b/tests/ui/parser/bad-char-literals.stderr
diff --git a/src/test/ui/parser/bad-crate-name.rs b/tests/ui/parser/bad-crate-name.rs
index 837d5c354..837d5c354 100644
--- a/src/test/ui/parser/bad-crate-name.rs
+++ b/tests/ui/parser/bad-crate-name.rs
diff --git a/src/test/ui/parser/bad-crate-name.stderr b/tests/ui/parser/bad-crate-name.stderr
index c98a620f1..c98a620f1 100644
--- a/src/test/ui/parser/bad-crate-name.stderr
+++ b/tests/ui/parser/bad-crate-name.stderr
diff --git a/src/test/ui/parser/bad-escape-suggest-raw-string.rs b/tests/ui/parser/bad-escape-suggest-raw-string.rs
index 978b92cbc..978b92cbc 100644
--- a/src/test/ui/parser/bad-escape-suggest-raw-string.rs
+++ b/tests/ui/parser/bad-escape-suggest-raw-string.rs
diff --git a/src/test/ui/parser/bad-escape-suggest-raw-string.stderr b/tests/ui/parser/bad-escape-suggest-raw-string.stderr
index fc34bd328..fc34bd328 100644
--- a/src/test/ui/parser/bad-escape-suggest-raw-string.stderr
+++ b/tests/ui/parser/bad-escape-suggest-raw-string.stderr
diff --git a/src/test/ui/parser/bad-fn-ptr-qualifier.fixed b/tests/ui/parser/bad-fn-ptr-qualifier.fixed
index ad8e718cf..ad8e718cf 100644
--- a/src/test/ui/parser/bad-fn-ptr-qualifier.fixed
+++ b/tests/ui/parser/bad-fn-ptr-qualifier.fixed
diff --git a/src/test/ui/parser/bad-fn-ptr-qualifier.rs b/tests/ui/parser/bad-fn-ptr-qualifier.rs
index c04813dad..c04813dad 100644
--- a/src/test/ui/parser/bad-fn-ptr-qualifier.rs
+++ b/tests/ui/parser/bad-fn-ptr-qualifier.rs
diff --git a/src/test/ui/parser/bad-fn-ptr-qualifier.stderr b/tests/ui/parser/bad-fn-ptr-qualifier.stderr
index 265e31329..265e31329 100644
--- a/src/test/ui/parser/bad-fn-ptr-qualifier.stderr
+++ b/tests/ui/parser/bad-fn-ptr-qualifier.stderr
diff --git a/src/test/ui/parser/bad-if-statements.rs b/tests/ui/parser/bad-if-statements.rs
index 2c501e3a5..2c501e3a5 100644
--- a/src/test/ui/parser/bad-if-statements.rs
+++ b/tests/ui/parser/bad-if-statements.rs
diff --git a/src/test/ui/parser/bad-if-statements.stderr b/tests/ui/parser/bad-if-statements.stderr
index ee839db64..ee839db64 100644
--- a/src/test/ui/parser/bad-if-statements.stderr
+++ b/tests/ui/parser/bad-if-statements.stderr
diff --git a/src/test/ui/parser/bad-interpolated-block.rs b/tests/ui/parser/bad-interpolated-block.rs
index c6d7ae383..c6d7ae383 100644
--- a/src/test/ui/parser/bad-interpolated-block.rs
+++ b/tests/ui/parser/bad-interpolated-block.rs
diff --git a/src/test/ui/parser/bad-interpolated-block.stderr b/tests/ui/parser/bad-interpolated-block.stderr
index 2a0999afd..2a0999afd 100644
--- a/src/test/ui/parser/bad-interpolated-block.stderr
+++ b/tests/ui/parser/bad-interpolated-block.stderr
diff --git a/src/test/ui/parser/bad-let-as-field.rs b/tests/ui/parser/bad-let-as-field.rs
index fec2bc256..fec2bc256 100644
--- a/src/test/ui/parser/bad-let-as-field.rs
+++ b/tests/ui/parser/bad-let-as-field.rs
diff --git a/src/test/ui/parser/bad-let-as-field.stderr b/tests/ui/parser/bad-let-as-field.stderr
index 57def42b1..57def42b1 100644
--- a/src/test/ui/parser/bad-let-as-field.stderr
+++ b/tests/ui/parser/bad-let-as-field.stderr
diff --git a/src/test/ui/parser/bad-lit-suffixes.rs b/tests/ui/parser/bad-lit-suffixes.rs
index 8cb9ef7e0..8cb9ef7e0 100644
--- a/src/test/ui/parser/bad-lit-suffixes.rs
+++ b/tests/ui/parser/bad-lit-suffixes.rs
diff --git a/src/test/ui/parser/bad-lit-suffixes.stderr b/tests/ui/parser/bad-lit-suffixes.stderr
index 756f99ab1..756f99ab1 100644
--- a/src/test/ui/parser/bad-lit-suffixes.stderr
+++ b/tests/ui/parser/bad-lit-suffixes.stderr
diff --git a/src/test/ui/parser/bad-match.rs b/tests/ui/parser/bad-match.rs
index 04100d170..04100d170 100644
--- a/src/test/ui/parser/bad-match.rs
+++ b/tests/ui/parser/bad-match.rs
diff --git a/src/test/ui/parser/bad-match.stderr b/tests/ui/parser/bad-match.stderr
index 13784c409..13784c409 100644
--- a/src/test/ui/parser/bad-match.stderr
+++ b/tests/ui/parser/bad-match.stderr
diff --git a/src/test/ui/parser/bad-name.rs b/tests/ui/parser/bad-name.rs
index 9b4271692..9b4271692 100644
--- a/src/test/ui/parser/bad-name.rs
+++ b/tests/ui/parser/bad-name.rs
diff --git a/src/test/ui/parser/bad-name.stderr b/tests/ui/parser/bad-name.stderr
index a36b67794..a36b67794 100644
--- a/src/test/ui/parser/bad-name.stderr
+++ b/tests/ui/parser/bad-name.stderr
diff --git a/src/test/ui/parser/bad-pointer-type.rs b/tests/ui/parser/bad-pointer-type.rs
index 6a82acb4c..6a82acb4c 100644
--- a/src/test/ui/parser/bad-pointer-type.rs
+++ b/tests/ui/parser/bad-pointer-type.rs
diff --git a/src/test/ui/parser/bad-pointer-type.stderr b/tests/ui/parser/bad-pointer-type.stderr
index b7225ca88..b7225ca88 100644
--- a/src/test/ui/parser/bad-pointer-type.stderr
+++ b/tests/ui/parser/bad-pointer-type.stderr
diff --git a/tests/ui/parser/bad-recover-kw-after-impl.rs b/tests/ui/parser/bad-recover-kw-after-impl.rs
new file mode 100644
index 000000000..218cd7678
--- /dev/null
+++ b/tests/ui/parser/bad-recover-kw-after-impl.rs
@@ -0,0 +1,15 @@
+// check-pass
+
+// edition:2021
+// for the `impl` + keyword test
+
+macro_rules! impl_primitive {
+    ($ty:ty) => {
+        compile_error!("whoops");
+    };
+    (impl async) => {};
+}
+
+impl_primitive!(impl async);
+
+fn main() {}
diff --git a/tests/ui/parser/bad-recover-ty-after-impl.rs b/tests/ui/parser/bad-recover-ty-after-impl.rs
new file mode 100644
index 000000000..510e08ba0
--- /dev/null
+++ b/tests/ui/parser/bad-recover-ty-after-impl.rs
@@ -0,0 +1,17 @@
+// check-pass
+
+macro_rules! impl_primitive {
+    ($ty:ty) => { impl_primitive!(impl $ty); };
+    (impl $ty:ty) => { fn a(_: $ty) {} }
+}
+
+impl_primitive! { u8 }
+
+macro_rules! test {
+    ($ty:ty) => { compile_error!("oh no"); };
+    (impl &) => {};
+}
+
+test!(impl &);
+
+fn main() {}
diff --git a/src/test/ui/parser/bad-struct-following-where.rs b/tests/ui/parser/bad-struct-following-where.rs
index 823880b1b..823880b1b 100644
--- a/src/test/ui/parser/bad-struct-following-where.rs
+++ b/tests/ui/parser/bad-struct-following-where.rs
diff --git a/src/test/ui/parser/bad-struct-following-where.stderr b/tests/ui/parser/bad-struct-following-where.stderr
index bb79776dc..bb79776dc 100644
--- a/src/test/ui/parser/bad-struct-following-where.stderr
+++ b/tests/ui/parser/bad-struct-following-where.stderr
diff --git a/src/test/ui/parser/bad-value-ident-false.rs b/tests/ui/parser/bad-value-ident-false.rs
index 4645ab4a7..4645ab4a7 100644
--- a/src/test/ui/parser/bad-value-ident-false.rs
+++ b/tests/ui/parser/bad-value-ident-false.rs
diff --git a/src/test/ui/parser/bad-value-ident-false.stderr b/tests/ui/parser/bad-value-ident-false.stderr
index 30c05ecf3..30c05ecf3 100644
--- a/src/test/ui/parser/bad-value-ident-false.stderr
+++ b/tests/ui/parser/bad-value-ident-false.stderr
diff --git a/src/test/ui/parser/bad-value-ident-true.rs b/tests/ui/parser/bad-value-ident-true.rs
index 0f64266d3..0f64266d3 100644
--- a/src/test/ui/parser/bad-value-ident-true.rs
+++ b/tests/ui/parser/bad-value-ident-true.rs
diff --git a/src/test/ui/parser/bad-value-ident-true.stderr b/tests/ui/parser/bad-value-ident-true.stderr
index 74137fa70..74137fa70 100644
--- a/src/test/ui/parser/bad-value-ident-true.stderr
+++ b/tests/ui/parser/bad-value-ident-true.stderr
diff --git a/src/test/ui/parser/bare-struct-body.rs b/tests/ui/parser/bare-struct-body.rs
index a557e861d..a557e861d 100644
--- a/src/test/ui/parser/bare-struct-body.rs
+++ b/tests/ui/parser/bare-struct-body.rs
diff --git a/src/test/ui/parser/bare-struct-body.stderr b/tests/ui/parser/bare-struct-body.stderr
index c77992b2c..7d17ea596 100644
--- a/src/test/ui/parser/bare-struct-body.stderr
+++ b/tests/ui/parser/bare-struct-body.stderr
@@ -34,7 +34,9 @@ error[E0308]: mismatched types
   --> $DIR/bare-struct-body.rs:11:14
    |
 LL |     x.val == 42;
-   |              ^^ expected `()`, found integer
+   |     -----    ^^ expected `()`, found integer
+   |     |
+   |     expected because this is `()`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/parser/bastion-of-the-turbofish.rs b/tests/ui/parser/bastion-of-the-turbofish.rs
index e12857008..e12857008 100644
--- a/src/test/ui/parser/bastion-of-the-turbofish.rs
+++ b/tests/ui/parser/bastion-of-the-turbofish.rs
diff --git a/src/test/ui/parser/better-expected.rs b/tests/ui/parser/better-expected.rs
index 16b61caa4..16b61caa4 100644
--- a/src/test/ui/parser/better-expected.rs
+++ b/tests/ui/parser/better-expected.rs
diff --git a/src/test/ui/parser/better-expected.stderr b/tests/ui/parser/better-expected.stderr
index 21bf8d19a..21bf8d19a 100644
--- a/src/test/ui/parser/better-expected.stderr
+++ b/tests/ui/parser/better-expected.stderr
diff --git a/src/test/ui/parser/bind-struct-early-modifiers.rs b/tests/ui/parser/bind-struct-early-modifiers.rs
index c4b1937de..c4b1937de 100644
--- a/src/test/ui/parser/bind-struct-early-modifiers.rs
+++ b/tests/ui/parser/bind-struct-early-modifiers.rs
diff --git a/src/test/ui/parser/bind-struct-early-modifiers.stderr b/tests/ui/parser/bind-struct-early-modifiers.stderr
index b35762a88..b35762a88 100644
--- a/src/test/ui/parser/bind-struct-early-modifiers.stderr
+++ b/tests/ui/parser/bind-struct-early-modifiers.stderr
diff --git a/src/test/ui/parser/block-no-opening-brace.rs b/tests/ui/parser/block-no-opening-brace.rs
index 8a6599488..8a6599488 100644
--- a/src/test/ui/parser/block-no-opening-brace.rs
+++ b/tests/ui/parser/block-no-opening-brace.rs
diff --git a/src/test/ui/parser/block-no-opening-brace.stderr b/tests/ui/parser/block-no-opening-brace.stderr
index f232f480c..f232f480c 100644
--- a/src/test/ui/parser/block-no-opening-brace.stderr
+++ b/tests/ui/parser/block-no-opening-brace.stderr
diff --git a/src/test/ui/parser/bound-single-question-mark.rs b/tests/ui/parser/bound-single-question-mark.rs
index 64d702d14..64d702d14 100644
--- a/src/test/ui/parser/bound-single-question-mark.rs
+++ b/tests/ui/parser/bound-single-question-mark.rs
diff --git a/src/test/ui/parser/bound-single-question-mark.stderr b/tests/ui/parser/bound-single-question-mark.stderr
index 82937a517..82937a517 100644
--- a/src/test/ui/parser/bound-single-question-mark.stderr
+++ b/tests/ui/parser/bound-single-question-mark.stderr
diff --git a/src/test/ui/parser/bounds-lifetime-1.rs b/tests/ui/parser/bounds-lifetime-1.rs
index e458f644c..e458f644c 100644
--- a/src/test/ui/parser/bounds-lifetime-1.rs
+++ b/tests/ui/parser/bounds-lifetime-1.rs
diff --git a/src/test/ui/parser/bounds-lifetime-1.stderr b/tests/ui/parser/bounds-lifetime-1.stderr
index 000e84f63..000e84f63 100644
--- a/src/test/ui/parser/bounds-lifetime-1.stderr
+++ b/tests/ui/parser/bounds-lifetime-1.stderr
diff --git a/src/test/ui/parser/bounds-lifetime-2.rs b/tests/ui/parser/bounds-lifetime-2.rs
index f184107bb..f184107bb 100644
--- a/src/test/ui/parser/bounds-lifetime-2.rs
+++ b/tests/ui/parser/bounds-lifetime-2.rs
diff --git a/src/test/ui/parser/bounds-lifetime-2.stderr b/tests/ui/parser/bounds-lifetime-2.stderr
index dd3e69c11..dd3e69c11 100644
--- a/src/test/ui/parser/bounds-lifetime-2.stderr
+++ b/tests/ui/parser/bounds-lifetime-2.stderr
diff --git a/src/test/ui/parser/bounds-lifetime-where-1.rs b/tests/ui/parser/bounds-lifetime-where-1.rs
index f1a002a9f..f1a002a9f 100644
--- a/src/test/ui/parser/bounds-lifetime-where-1.rs
+++ b/tests/ui/parser/bounds-lifetime-where-1.rs
diff --git a/src/test/ui/parser/bounds-lifetime-where-1.stderr b/tests/ui/parser/bounds-lifetime-where-1.stderr
index b6bd86693..b6bd86693 100644
--- a/src/test/ui/parser/bounds-lifetime-where-1.stderr
+++ b/tests/ui/parser/bounds-lifetime-where-1.stderr
diff --git a/src/test/ui/parser/bounds-lifetime-where.rs b/tests/ui/parser/bounds-lifetime-where.rs
index 7ff75233d..7ff75233d 100644
--- a/src/test/ui/parser/bounds-lifetime-where.rs
+++ b/tests/ui/parser/bounds-lifetime-where.rs
diff --git a/src/test/ui/parser/bounds-lifetime-where.stderr b/tests/ui/parser/bounds-lifetime-where.stderr
index 785a1fb67..785a1fb67 100644
--- a/src/test/ui/parser/bounds-lifetime-where.stderr
+++ b/tests/ui/parser/bounds-lifetime-where.stderr
diff --git a/src/test/ui/parser/bounds-lifetime.rs b/tests/ui/parser/bounds-lifetime.rs
index c9251ac53..c9251ac53 100644
--- a/src/test/ui/parser/bounds-lifetime.rs
+++ b/tests/ui/parser/bounds-lifetime.rs
diff --git a/src/test/ui/parser/bounds-lifetime.stderr b/tests/ui/parser/bounds-lifetime.stderr
index e47a21d89..e47a21d89 100644
--- a/src/test/ui/parser/bounds-lifetime.stderr
+++ b/tests/ui/parser/bounds-lifetime.stderr
diff --git a/src/test/ui/parser/bounds-obj-parens.rs b/tests/ui/parser/bounds-obj-parens.rs
index 8c446d27d..8c446d27d 100644
--- a/src/test/ui/parser/bounds-obj-parens.rs
+++ b/tests/ui/parser/bounds-obj-parens.rs
diff --git a/src/test/ui/parser/bounds-type-where.rs b/tests/ui/parser/bounds-type-where.rs
index 2520ecb29..2520ecb29 100644
--- a/src/test/ui/parser/bounds-type-where.rs
+++ b/tests/ui/parser/bounds-type-where.rs
diff --git a/src/test/ui/parser/bounds-type-where.stderr b/tests/ui/parser/bounds-type-where.stderr
index 5636ee75c..5636ee75c 100644
--- a/src/test/ui/parser/bounds-type-where.stderr
+++ b/tests/ui/parser/bounds-type-where.stderr
diff --git a/src/test/ui/parser/bounds-type.rs b/tests/ui/parser/bounds-type.rs
index 4ae4549ea..4ae4549ea 100644
--- a/src/test/ui/parser/bounds-type.rs
+++ b/tests/ui/parser/bounds-type.rs
diff --git a/src/test/ui/parser/bounds-type.stderr b/tests/ui/parser/bounds-type.stderr
index 005bc1e54..005bc1e54 100644
--- a/src/test/ui/parser/bounds-type.stderr
+++ b/tests/ui/parser/bounds-type.stderr
diff --git a/src/test/ui/parser/byte-literals.rs b/tests/ui/parser/byte-literals.rs
index 896dc1a1a..896dc1a1a 100644
--- a/src/test/ui/parser/byte-literals.rs
+++ b/tests/ui/parser/byte-literals.rs
diff --git a/src/test/ui/parser/byte-literals.stderr b/tests/ui/parser/byte-literals.stderr
index efa55ae05..efa55ae05 100644
--- a/src/test/ui/parser/byte-literals.stderr
+++ b/tests/ui/parser/byte-literals.stderr
diff --git a/src/test/ui/parser/byte-string-literals.rs b/tests/ui/parser/byte-string-literals.rs
index 30a4f50c4..30a4f50c4 100644
--- a/src/test/ui/parser/byte-string-literals.rs
+++ b/tests/ui/parser/byte-string-literals.rs
diff --git a/src/test/ui/parser/byte-string-literals.stderr b/tests/ui/parser/byte-string-literals.stderr
index 5b96cc3d1..5b96cc3d1 100644
--- a/src/test/ui/parser/byte-string-literals.stderr
+++ b/tests/ui/parser/byte-string-literals.stderr
diff --git a/src/test/ui/parser/can-begin-expr-check.rs b/tests/ui/parser/can-begin-expr-check.rs
index e5be8de79..e5be8de79 100644
--- a/src/test/ui/parser/can-begin-expr-check.rs
+++ b/tests/ui/parser/can-begin-expr-check.rs
diff --git a/src/test/ui/parser/can-begin-expr-check.stderr b/tests/ui/parser/can-begin-expr-check.stderr
index 9569ababa..9569ababa 100644
--- a/src/test/ui/parser/can-begin-expr-check.stderr
+++ b/tests/ui/parser/can-begin-expr-check.stderr
diff --git a/src/test/ui/parser/chained-comparison-suggestion.rs b/tests/ui/parser/chained-comparison-suggestion.rs
index bbd46082c..bbd46082c 100644
--- a/src/test/ui/parser/chained-comparison-suggestion.rs
+++ b/tests/ui/parser/chained-comparison-suggestion.rs
diff --git a/src/test/ui/parser/chained-comparison-suggestion.stderr b/tests/ui/parser/chained-comparison-suggestion.stderr
index 694b0b6eb..ae243816d 100644
--- a/src/test/ui/parser/chained-comparison-suggestion.stderr
+++ b/tests/ui/parser/chained-comparison-suggestion.stderr
@@ -123,37 +123,49 @@ error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:4:14
    |
 LL |     1 < 2 <= 3;
-   |              ^ expected `bool`, found integer
+   |     -----    ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:13:14
    |
 LL |     1 <= 2 < 3;
-   |              ^ expected `bool`, found integer
+   |     ------   ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:18:15
    |
 LL |     1 <= 2 <= 3;
-   |               ^ expected `bool`, found integer
+   |     ------    ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:23:14
    |
 LL |     1 > 2 >= 3;
-   |              ^ expected `bool`, found integer
+   |     -----    ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:36:15
    |
 LL |     1 >= 2 >= 3;
-   |               ^ expected `bool`, found integer
+   |     ------    ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error[E0308]: mismatched types
   --> $DIR/chained-comparison-suggestion.rs:49:15
    |
 LL |     1 == 2 == 3;
-   |               ^ expected `bool`, found integer
+   |     ------    ^ expected `bool`, found integer
+   |     |
+   |     expected because this is `bool`
 
 error: aborting due to 17 previous errors
 
diff --git a/src/test/ui/parser/char/whitespace-character-literal.rs b/tests/ui/parser/char/whitespace-character-literal.rs
index de5e09204..de5e09204 100644
--- a/src/test/ui/parser/char/whitespace-character-literal.rs
+++ b/tests/ui/parser/char/whitespace-character-literal.rs
diff --git a/src/test/ui/parser/char/whitespace-character-literal.stderr b/tests/ui/parser/char/whitespace-character-literal.stderr
index d73de41a8..d73de41a8 100644
--- a/src/test/ui/parser/char/whitespace-character-literal.stderr
+++ b/tests/ui/parser/char/whitespace-character-literal.stderr
diff --git a/src/test/ui/parser/circular_modules_hello.rs b/tests/ui/parser/circular_modules_hello.rs
index 6968ca97b..6968ca97b 100644
--- a/src/test/ui/parser/circular_modules_hello.rs
+++ b/tests/ui/parser/circular_modules_hello.rs
diff --git a/src/test/ui/parser/circular_modules_main.rs b/tests/ui/parser/circular_modules_main.rs
index d4b47efe6..d4b47efe6 100644
--- a/src/test/ui/parser/circular_modules_main.rs
+++ b/tests/ui/parser/circular_modules_main.rs
diff --git a/src/test/ui/parser/circular_modules_main.stderr b/tests/ui/parser/circular_modules_main.stderr
index 1094def60..1094def60 100644
--- a/src/test/ui/parser/circular_modules_main.stderr
+++ b/tests/ui/parser/circular_modules_main.stderr
diff --git a/src/test/ui/parser/class-implements-bad-trait.rs b/tests/ui/parser/class-implements-bad-trait.rs
index f2f85d026..f2f85d026 100644
--- a/src/test/ui/parser/class-implements-bad-trait.rs
+++ b/tests/ui/parser/class-implements-bad-trait.rs
diff --git a/src/test/ui/parser/class-implements-bad-trait.stderr b/tests/ui/parser/class-implements-bad-trait.stderr
index 3a4dea95d..3a4dea95d 100644
--- a/src/test/ui/parser/class-implements-bad-trait.stderr
+++ b/tests/ui/parser/class-implements-bad-trait.stderr
diff --git a/src/test/ui/parser/closure-return-syntax.rs b/tests/ui/parser/closure-return-syntax.rs
index c6a08abef..c6a08abef 100644
--- a/src/test/ui/parser/closure-return-syntax.rs
+++ b/tests/ui/parser/closure-return-syntax.rs
diff --git a/src/test/ui/parser/closure-return-syntax.stderr b/tests/ui/parser/closure-return-syntax.stderr
index 3d16a2067..3d16a2067 100644
--- a/src/test/ui/parser/closure-return-syntax.stderr
+++ b/tests/ui/parser/closure-return-syntax.stderr
diff --git a/src/test/ui/parser/column-offset-1-based.rs b/tests/ui/parser/column-offset-1-based.rs
index 0c24478c2..0c24478c2 100644
--- a/src/test/ui/parser/column-offset-1-based.rs
+++ b/tests/ui/parser/column-offset-1-based.rs
diff --git a/src/test/ui/parser/column-offset-1-based.stderr b/tests/ui/parser/column-offset-1-based.stderr
index 766d72a0a..766d72a0a 100644
--- a/src/test/ui/parser/column-offset-1-based.stderr
+++ b/tests/ui/parser/column-offset-1-based.stderr
diff --git a/src/test/ui/parser/const-param-decl-on-type-instead-of-impl.rs b/tests/ui/parser/const-param-decl-on-type-instead-of-impl.rs
index 53e3c6f96..53e3c6f96 100644
--- a/src/test/ui/parser/const-param-decl-on-type-instead-of-impl.rs
+++ b/tests/ui/parser/const-param-decl-on-type-instead-of-impl.rs
diff --git a/src/test/ui/parser/const-param-decl-on-type-instead-of-impl.stderr b/tests/ui/parser/const-param-decl-on-type-instead-of-impl.stderr
index 96885d11e..96885d11e 100644
--- a/src/test/ui/parser/const-param-decl-on-type-instead-of-impl.stderr
+++ b/tests/ui/parser/const-param-decl-on-type-instead-of-impl.stderr
diff --git a/src/test/ui/parser/constraints-before-generic-args-syntactic-pass.rs b/tests/ui/parser/constraints-before-generic-args-syntactic-pass.rs
index d8346653c..d8346653c 100644
--- a/src/test/ui/parser/constraints-before-generic-args-syntactic-pass.rs
+++ b/tests/ui/parser/constraints-before-generic-args-syntactic-pass.rs
diff --git a/src/test/ui/parser/constraints-before-generic-args-syntactic-pass.stderr b/tests/ui/parser/constraints-before-generic-args-syntactic-pass.stderr
index 7e843c7f4..7e843c7f4 100644
--- a/src/test/ui/parser/constraints-before-generic-args-syntactic-pass.stderr
+++ b/tests/ui/parser/constraints-before-generic-args-syntactic-pass.stderr
diff --git a/src/test/ui/parser/default-on-wrong-item-kind.rs b/tests/ui/parser/default-on-wrong-item-kind.rs
index 98a95cfa3..98a95cfa3 100644
--- a/src/test/ui/parser/default-on-wrong-item-kind.rs
+++ b/tests/ui/parser/default-on-wrong-item-kind.rs
diff --git a/src/test/ui/parser/default-on-wrong-item-kind.stderr b/tests/ui/parser/default-on-wrong-item-kind.stderr
index af513f761..af513f761 100644
--- a/src/test/ui/parser/default-on-wrong-item-kind.stderr
+++ b/tests/ui/parser/default-on-wrong-item-kind.stderr
diff --git a/src/test/ui/parser/default-unmatched-assoc.rs b/tests/ui/parser/default-unmatched-assoc.rs
index 168ea3e76..168ea3e76 100644
--- a/src/test/ui/parser/default-unmatched-assoc.rs
+++ b/tests/ui/parser/default-unmatched-assoc.rs
diff --git a/src/test/ui/parser/default-unmatched-assoc.stderr b/tests/ui/parser/default-unmatched-assoc.stderr
index ee35fded9..ee35fded9 100644
--- a/src/test/ui/parser/default-unmatched-assoc.stderr
+++ b/tests/ui/parser/default-unmatched-assoc.stderr
diff --git a/src/test/ui/parser/default-unmatched-extern.rs b/tests/ui/parser/default-unmatched-extern.rs
index 8d0ea590f..8d0ea590f 100644
--- a/src/test/ui/parser/default-unmatched-extern.rs
+++ b/tests/ui/parser/default-unmatched-extern.rs
diff --git a/src/test/ui/parser/default-unmatched-extern.stderr b/tests/ui/parser/default-unmatched-extern.stderr
index bb4efd516..bb4efd516 100644
--- a/src/test/ui/parser/default-unmatched-extern.stderr
+++ b/tests/ui/parser/default-unmatched-extern.stderr
diff --git a/src/test/ui/parser/default-unmatched.rs b/tests/ui/parser/default-unmatched.rs
index 49346e5c6..49346e5c6 100644
--- a/src/test/ui/parser/default-unmatched.rs
+++ b/tests/ui/parser/default-unmatched.rs
diff --git a/src/test/ui/parser/default-unmatched.stderr b/tests/ui/parser/default-unmatched.stderr
index 331e003f6..331e003f6 100644
--- a/src/test/ui/parser/default-unmatched.stderr
+++ b/tests/ui/parser/default-unmatched.stderr
diff --git a/src/test/ui/parser/default.rs b/tests/ui/parser/default.rs
index 52338c1f1..52338c1f1 100644
--- a/src/test/ui/parser/default.rs
+++ b/tests/ui/parser/default.rs
diff --git a/src/test/ui/parser/default.stderr b/tests/ui/parser/default.stderr
index 37aa48ccf..37aa48ccf 100644
--- a/src/test/ui/parser/default.stderr
+++ b/tests/ui/parser/default.stderr
diff --git a/tests/ui/parser/diff-markers/enum-2.rs b/tests/ui/parser/diff-markers/enum-2.rs
new file mode 100644
index 000000000..76ea980fc
--- /dev/null
+++ b/tests/ui/parser/diff-markers/enum-2.rs
@@ -0,0 +1,11 @@
+enum E {
+    Foo {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+        x: u8,
+|||||||
+        z: (),
+=======
+        y: i8,
+>>>>>>> branch
+    }
+}
diff --git a/tests/ui/parser/diff-markers/enum-2.stderr b/tests/ui/parser/diff-markers/enum-2.stderr
new file mode 100644
index 000000000..63da5c2a6
--- /dev/null
+++ b/tests/ui/parser/diff-markers/enum-2.stderr
@@ -0,0 +1,21 @@
+error: encountered diff marker
+  --> $DIR/enum-2.rs:3:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |         x: u8,
+LL | |||||||
+   | -------
+LL |         z: (),
+LL | =======
+   | -------
+LL |         y: i8,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/enum.rs b/tests/ui/parser/diff-markers/enum.rs
new file mode 100644
index 000000000..45df6e325
--- /dev/null
+++ b/tests/ui/parser/diff-markers/enum.rs
@@ -0,0 +1,7 @@
+enum E {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    Foo(u8),
+=======
+    Bar(i8),
+>>>>>>> branch
+}
diff --git a/tests/ui/parser/diff-markers/enum.stderr b/tests/ui/parser/diff-markers/enum.stderr
new file mode 100644
index 000000000..abbf3fb41
--- /dev/null
+++ b/tests/ui/parser/diff-markers/enum.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/enum.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     Foo(u8),
+LL | =======
+   | -------
+LL |     Bar(i8),
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/fn-arg.rs b/tests/ui/parser/diff-markers/fn-arg.rs
new file mode 100644
index 000000000..86c355628
--- /dev/null
+++ b/tests/ui/parser/diff-markers/fn-arg.rs
@@ -0,0 +1,16 @@
+trait T {
+    fn foo(
+<<<<<<< HEAD //~ ERROR encountered diff marker
+        x: u8,
+=======
+        x: i8,
+>>>>>>> branch
+    ) {}
+}
+
+struct S;
+impl T for S {}
+
+fn main() {
+    S::foo(42);
+}
diff --git a/tests/ui/parser/diff-markers/fn-arg.stderr b/tests/ui/parser/diff-markers/fn-arg.stderr
new file mode 100644
index 000000000..933a20641
--- /dev/null
+++ b/tests/ui/parser/diff-markers/fn-arg.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/fn-arg.rs:3:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |         x: u8,
+LL | =======
+   | -------
+LL |         x: i8,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/item-with-attr.rs b/tests/ui/parser/diff-markers/item-with-attr.rs
new file mode 100644
index 000000000..985907c08
--- /dev/null
+++ b/tests/ui/parser/diff-markers/item-with-attr.rs
@@ -0,0 +1,10 @@
+#[attribute]
+<<<<<<< HEAD //~ ERROR encountered diff marker
+fn foo() {}
+=======
+fn bar() {}
+>>>>>>> branch
+
+fn main() {
+    foo();
+}
diff --git a/tests/ui/parser/diff-markers/item-with-attr.stderr b/tests/ui/parser/diff-markers/item-with-attr.stderr
new file mode 100644
index 000000000..850e2368e
--- /dev/null
+++ b/tests/ui/parser/diff-markers/item-with-attr.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/item-with-attr.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL | fn foo() {}
+LL | =======
+   | -------
+LL | fn bar() {}
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/item.rs b/tests/ui/parser/diff-markers/item.rs
new file mode 100644
index 000000000..4ed36b7b4
--- /dev/null
+++ b/tests/ui/parser/diff-markers/item.rs
@@ -0,0 +1,9 @@
+<<<<<<< HEAD //~ ERROR encountered diff marker
+fn foo() {}
+=======
+fn bar() {}
+>>>>>>> branch
+
+fn main() {
+    foo();
+}
diff --git a/tests/ui/parser/diff-markers/item.stderr b/tests/ui/parser/diff-markers/item.stderr
new file mode 100644
index 000000000..9ab3631a6
--- /dev/null
+++ b/tests/ui/parser/diff-markers/item.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/item.rs:1:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL | fn foo() {}
+LL | =======
+   | -------
+LL | fn bar() {}
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/statement.rs b/tests/ui/parser/diff-markers/statement.rs
new file mode 100644
index 000000000..e55d16d3b
--- /dev/null
+++ b/tests/ui/parser/diff-markers/statement.rs
@@ -0,0 +1,15 @@
+trait T {
+    fn foo() {}
+    fn bar() {}
+}
+
+struct S;
+impl T for S {}
+
+fn main() {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    S::foo();
+=======
+    S::bar();
+>>>>>>> branch
+}
diff --git a/tests/ui/parser/diff-markers/statement.stderr b/tests/ui/parser/diff-markers/statement.stderr
new file mode 100644
index 000000000..7ca2495b8
--- /dev/null
+++ b/tests/ui/parser/diff-markers/statement.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/statement.rs:10:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     S::foo();
+LL | =======
+   | -------
+LL |     S::bar();
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/struct-expr.rs b/tests/ui/parser/diff-markers/struct-expr.rs
new file mode 100644
index 000000000..99d2fd662
--- /dev/null
+++ b/tests/ui/parser/diff-markers/struct-expr.rs
@@ -0,0 +1,12 @@
+struct S {
+    x: u8,
+}
+fn main() {
+    let _ = S {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+        x: 42,
+=======
+        x: 0,
+>>>>>>> branch
+    }
+}
diff --git a/tests/ui/parser/diff-markers/struct-expr.stderr b/tests/ui/parser/diff-markers/struct-expr.stderr
new file mode 100644
index 000000000..d70476a98
--- /dev/null
+++ b/tests/ui/parser/diff-markers/struct-expr.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/struct-expr.rs:6:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |         x: 42,
+LL | =======
+   | -------
+LL |         x: 0,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/struct.rs b/tests/ui/parser/diff-markers/struct.rs
new file mode 100644
index 000000000..d26464d47
--- /dev/null
+++ b/tests/ui/parser/diff-markers/struct.rs
@@ -0,0 +1,7 @@
+struct S {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    x: u8,
+=======
+    x: i8,
+>>>>>>> branch
+}
diff --git a/tests/ui/parser/diff-markers/struct.stderr b/tests/ui/parser/diff-markers/struct.stderr
new file mode 100644
index 000000000..cc0b3da66
--- /dev/null
+++ b/tests/ui/parser/diff-markers/struct.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/struct.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     x: u8,
+LL | =======
+   | -------
+LL |     x: i8,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/trait-item.rs b/tests/ui/parser/diff-markers/trait-item.rs
new file mode 100644
index 000000000..3227c8212
--- /dev/null
+++ b/tests/ui/parser/diff-markers/trait-item.rs
@@ -0,0 +1,14 @@
+trait T {
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    fn foo() {}
+=======
+    fn bar() {}
+>>>>>>> branch
+}
+
+struct S;
+impl T for S {}
+
+fn main() {
+    S::foo();
+}
diff --git a/tests/ui/parser/diff-markers/trait-item.stderr b/tests/ui/parser/diff-markers/trait-item.stderr
new file mode 100644
index 000000000..cdc19f8e0
--- /dev/null
+++ b/tests/ui/parser/diff-markers/trait-item.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/trait-item.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     fn foo() {}
+LL | =======
+   | -------
+LL |     fn bar() {}
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/tuple-struct.rs b/tests/ui/parser/diff-markers/tuple-struct.rs
new file mode 100644
index 000000000..7eec35c96
--- /dev/null
+++ b/tests/ui/parser/diff-markers/tuple-struct.rs
@@ -0,0 +1,7 @@
+struct S(
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    u8,
+=======
+    i8,
+>>>>>>> branch
+);
diff --git a/tests/ui/parser/diff-markers/tuple-struct.stderr b/tests/ui/parser/diff-markers/tuple-struct.stderr
new file mode 100644
index 000000000..d673db898
--- /dev/null
+++ b/tests/ui/parser/diff-markers/tuple-struct.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/tuple-struct.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     u8,
+LL | =======
+   | -------
+LL |     i8,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/diff-markers/use-statement.rs b/tests/ui/parser/diff-markers/use-statement.rs
new file mode 100644
index 000000000..6306243a5
--- /dev/null
+++ b/tests/ui/parser/diff-markers/use-statement.rs
@@ -0,0 +1,9 @@
+use foo::{
+<<<<<<< HEAD //~ ERROR encountered diff marker
+    bar,
+=======
+    baz,
+>>>>>>> branch
+};
+
+fn main() {}
diff --git a/tests/ui/parser/diff-markers/use-statement.stderr b/tests/ui/parser/diff-markers/use-statement.stderr
new file mode 100644
index 000000000..12e6f57dd
--- /dev/null
+++ b/tests/ui/parser/diff-markers/use-statement.stderr
@@ -0,0 +1,18 @@
+error: encountered diff marker
+  --> $DIR/use-statement.rs:2:1
+   |
+LL | <<<<<<< HEAD
+   | ^^^^^^^ after this is the code before the merge
+LL |     bar,
+LL | =======
+   | -------
+LL |     baz,
+LL | >>>>>>> branch
+   | ^^^^^^^ above this are the incoming code changes
+   |
+   = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code
+   = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased
+   = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/do-catch-suggests-try.rs b/tests/ui/parser/do-catch-suggests-try.rs
index f64568d06..f64568d06 100644
--- a/src/test/ui/parser/do-catch-suggests-try.rs
+++ b/tests/ui/parser/do-catch-suggests-try.rs
diff --git a/src/test/ui/parser/do-catch-suggests-try.stderr b/tests/ui/parser/do-catch-suggests-try.stderr
index cd8907b7e..cd8907b7e 100644
--- a/src/test/ui/parser/do-catch-suggests-try.stderr
+++ b/tests/ui/parser/do-catch-suggests-try.stderr
diff --git a/src/test/ui/parser/do-not-suggest-semicolon-before-array.rs b/tests/ui/parser/do-not-suggest-semicolon-before-array.rs
index 7ebf3f6b0..7ebf3f6b0 100644
--- a/src/test/ui/parser/do-not-suggest-semicolon-before-array.rs
+++ b/tests/ui/parser/do-not-suggest-semicolon-before-array.rs
diff --git a/src/test/ui/parser/do-not-suggest-semicolon-before-array.stderr b/tests/ui/parser/do-not-suggest-semicolon-before-array.stderr
index a9dd52632..a9dd52632 100644
--- a/src/test/ui/parser/do-not-suggest-semicolon-before-array.stderr
+++ b/tests/ui/parser/do-not-suggest-semicolon-before-array.stderr
diff --git a/src/test/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs b/tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs
index d6f798181..d6f798181 100644
--- a/src/test/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs
+++ b/tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.rs
diff --git a/src/test/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr b/tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr
index 2fe6a28ee..2fe6a28ee 100644
--- a/src/test/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr
+++ b/tests/ui/parser/do-not-suggest-semicolon-between-macro-without-exclamation-mark-and-array.stderr
diff --git a/src/test/ui/parser/doc-after-struct-field.rs b/tests/ui/parser/doc-after-struct-field.rs
index 03faa6733..03faa6733 100644
--- a/src/test/ui/parser/doc-after-struct-field.rs
+++ b/tests/ui/parser/doc-after-struct-field.rs
diff --git a/src/test/ui/parser/doc-after-struct-field.stderr b/tests/ui/parser/doc-after-struct-field.stderr
index ae177f1a2..ae177f1a2 100644
--- a/src/test/ui/parser/doc-after-struct-field.stderr
+++ b/tests/ui/parser/doc-after-struct-field.stderr
diff --git a/src/test/ui/parser/doc-before-attr.rs b/tests/ui/parser/doc-before-attr.rs
index c4125a09f..c4125a09f 100644
--- a/src/test/ui/parser/doc-before-attr.rs
+++ b/tests/ui/parser/doc-before-attr.rs
diff --git a/src/test/ui/parser/doc-before-attr.stderr b/tests/ui/parser/doc-before-attr.stderr
index 14fd01af2..14fd01af2 100644
--- a/src/test/ui/parser/doc-before-attr.stderr
+++ b/tests/ui/parser/doc-before-attr.stderr
diff --git a/src/test/ui/parser/doc-before-eof.rs b/tests/ui/parser/doc-before-eof.rs
index b31836e95..b31836e95 100644
--- a/src/test/ui/parser/doc-before-eof.rs
+++ b/tests/ui/parser/doc-before-eof.rs
diff --git a/src/test/ui/parser/doc-before-eof.stderr b/tests/ui/parser/doc-before-eof.stderr
index 827566267..827566267 100644
--- a/src/test/ui/parser/doc-before-eof.stderr
+++ b/tests/ui/parser/doc-before-eof.stderr
diff --git a/src/test/ui/parser/doc-before-extern-rbrace.rs b/tests/ui/parser/doc-before-extern-rbrace.rs
index 515c90ed4..515c90ed4 100644
--- a/src/test/ui/parser/doc-before-extern-rbrace.rs
+++ b/tests/ui/parser/doc-before-extern-rbrace.rs
diff --git a/src/test/ui/parser/doc-before-extern-rbrace.stderr b/tests/ui/parser/doc-before-extern-rbrace.stderr
index 8fa12ec26..8fa12ec26 100644
--- a/src/test/ui/parser/doc-before-extern-rbrace.stderr
+++ b/tests/ui/parser/doc-before-extern-rbrace.stderr
diff --git a/src/test/ui/parser/doc-before-fn-rbrace.rs b/tests/ui/parser/doc-before-fn-rbrace.rs
index c85021648..c85021648 100644
--- a/src/test/ui/parser/doc-before-fn-rbrace.rs
+++ b/tests/ui/parser/doc-before-fn-rbrace.rs
diff --git a/src/test/ui/parser/doc-before-fn-rbrace.stderr b/tests/ui/parser/doc-before-fn-rbrace.stderr
index 6ea68e42b..6ea68e42b 100644
--- a/src/test/ui/parser/doc-before-fn-rbrace.stderr
+++ b/tests/ui/parser/doc-before-fn-rbrace.stderr
diff --git a/src/test/ui/parser/doc-before-identifier.rs b/tests/ui/parser/doc-before-identifier.rs
index 76263ad92..76263ad92 100644
--- a/src/test/ui/parser/doc-before-identifier.rs
+++ b/tests/ui/parser/doc-before-identifier.rs
diff --git a/src/test/ui/parser/doc-before-identifier.stderr b/tests/ui/parser/doc-before-identifier.stderr
index 940d293b6..940d293b6 100644
--- a/src/test/ui/parser/doc-before-identifier.stderr
+++ b/tests/ui/parser/doc-before-identifier.stderr
diff --git a/src/test/ui/parser/doc-before-mod-rbrace.rs b/tests/ui/parser/doc-before-mod-rbrace.rs
index c65a0a931..c65a0a931 100644
--- a/src/test/ui/parser/doc-before-mod-rbrace.rs
+++ b/tests/ui/parser/doc-before-mod-rbrace.rs
diff --git a/src/test/ui/parser/doc-before-mod-rbrace.stderr b/tests/ui/parser/doc-before-mod-rbrace.stderr
index d5749c66c..d5749c66c 100644
--- a/src/test/ui/parser/doc-before-mod-rbrace.stderr
+++ b/tests/ui/parser/doc-before-mod-rbrace.stderr
diff --git a/src/test/ui/parser/doc-before-rbrace.rs b/tests/ui/parser/doc-before-rbrace.rs
index 570306f2c..570306f2c 100644
--- a/src/test/ui/parser/doc-before-rbrace.rs
+++ b/tests/ui/parser/doc-before-rbrace.rs
diff --git a/src/test/ui/parser/doc-before-rbrace.stderr b/tests/ui/parser/doc-before-rbrace.stderr
index 4d4741dfe..4d4741dfe 100644
--- a/src/test/ui/parser/doc-before-rbrace.stderr
+++ b/tests/ui/parser/doc-before-rbrace.stderr
diff --git a/src/test/ui/parser/doc-before-semi.rs b/tests/ui/parser/doc-before-semi.rs
index 444b5874e..444b5874e 100644
--- a/src/test/ui/parser/doc-before-semi.rs
+++ b/tests/ui/parser/doc-before-semi.rs
diff --git a/src/test/ui/parser/doc-before-semi.stderr b/tests/ui/parser/doc-before-semi.stderr
index a879e13ff..a879e13ff 100644
--- a/src/test/ui/parser/doc-before-semi.stderr
+++ b/tests/ui/parser/doc-before-semi.stderr
diff --git a/src/test/ui/parser/doc-before-struct-rbrace-1.rs b/tests/ui/parser/doc-before-struct-rbrace-1.rs
index 0c8d90c3b..0c8d90c3b 100644
--- a/src/test/ui/parser/doc-before-struct-rbrace-1.rs
+++ b/tests/ui/parser/doc-before-struct-rbrace-1.rs
diff --git a/src/test/ui/parser/doc-before-struct-rbrace-1.stderr b/tests/ui/parser/doc-before-struct-rbrace-1.stderr
index 94934f734..94934f734 100644
--- a/src/test/ui/parser/doc-before-struct-rbrace-1.stderr
+++ b/tests/ui/parser/doc-before-struct-rbrace-1.stderr
diff --git a/src/test/ui/parser/doc-before-struct-rbrace-2.rs b/tests/ui/parser/doc-before-struct-rbrace-2.rs
index 2b2aadf79..2b2aadf79 100644
--- a/src/test/ui/parser/doc-before-struct-rbrace-2.rs
+++ b/tests/ui/parser/doc-before-struct-rbrace-2.rs
diff --git a/src/test/ui/parser/doc-before-struct-rbrace-2.stderr b/tests/ui/parser/doc-before-struct-rbrace-2.stderr
index 6b5c8c1f8..6b5c8c1f8 100644
--- a/src/test/ui/parser/doc-before-struct-rbrace-2.stderr
+++ b/tests/ui/parser/doc-before-struct-rbrace-2.stderr
diff --git a/src/test/ui/parser/doc-comment-in-if-statement.rs b/tests/ui/parser/doc-comment-in-if-statement.rs
index 343eac1b8..343eac1b8 100644
--- a/src/test/ui/parser/doc-comment-in-if-statement.rs
+++ b/tests/ui/parser/doc-comment-in-if-statement.rs
diff --git a/src/test/ui/parser/doc-comment-in-if-statement.stderr b/tests/ui/parser/doc-comment-in-if-statement.stderr
index fc0bc5073..fc0bc5073 100644
--- a/src/test/ui/parser/doc-comment-in-if-statement.stderr
+++ b/tests/ui/parser/doc-comment-in-if-statement.stderr
diff --git a/src/test/ui/parser/doc-comment-in-stmt.rs b/tests/ui/parser/doc-comment-in-stmt.rs
index b02df1321..b02df1321 100644
--- a/src/test/ui/parser/doc-comment-in-stmt.rs
+++ b/tests/ui/parser/doc-comment-in-stmt.rs
diff --git a/src/test/ui/parser/doc-comment-in-stmt.stderr b/tests/ui/parser/doc-comment-in-stmt.stderr
index febfb600c..febfb600c 100644
--- a/src/test/ui/parser/doc-comment-in-stmt.stderr
+++ b/tests/ui/parser/doc-comment-in-stmt.stderr
diff --git a/src/test/ui/parser/doc-inside-trait-item.rs b/tests/ui/parser/doc-inside-trait-item.rs
index 87b501bd2..87b501bd2 100644
--- a/src/test/ui/parser/doc-inside-trait-item.rs
+++ b/tests/ui/parser/doc-inside-trait-item.rs
diff --git a/src/test/ui/parser/doc-inside-trait-item.stderr b/tests/ui/parser/doc-inside-trait-item.stderr
index 900124adc..900124adc 100644
--- a/src/test/ui/parser/doc-inside-trait-item.stderr
+++ b/tests/ui/parser/doc-inside-trait-item.stderr
diff --git a/src/test/ui/parser/dotdotdot-expr.rs b/tests/ui/parser/dotdotdot-expr.rs
index d842fb6e0..d842fb6e0 100644
--- a/src/test/ui/parser/dotdotdot-expr.rs
+++ b/tests/ui/parser/dotdotdot-expr.rs
diff --git a/src/test/ui/parser/dotdotdot-expr.stderr b/tests/ui/parser/dotdotdot-expr.stderr
index e7203f24d..e7203f24d 100644
--- a/src/test/ui/parser/dotdotdot-expr.stderr
+++ b/tests/ui/parser/dotdotdot-expr.stderr
diff --git a/src/test/ui/parser/double-pointer.rs b/tests/ui/parser/double-pointer.rs
index 54d34db4a..54d34db4a 100644
--- a/src/test/ui/parser/double-pointer.rs
+++ b/tests/ui/parser/double-pointer.rs
diff --git a/src/test/ui/parser/double-pointer.stderr b/tests/ui/parser/double-pointer.stderr
index 28037f932..28037f932 100644
--- a/src/test/ui/parser/double-pointer.stderr
+++ b/tests/ui/parser/double-pointer.stderr
diff --git a/src/test/ui/parser/duplicate-visibility.rs b/tests/ui/parser/duplicate-visibility.rs
index 54955944c..54955944c 100644
--- a/src/test/ui/parser/duplicate-visibility.rs
+++ b/tests/ui/parser/duplicate-visibility.rs
diff --git a/src/test/ui/parser/duplicate-visibility.stderr b/tests/ui/parser/duplicate-visibility.stderr
index 8ecebf01f..8ecebf01f 100644
--- a/src/test/ui/parser/duplicate-visibility.stderr
+++ b/tests/ui/parser/duplicate-visibility.stderr
diff --git a/src/test/ui/parser/duplicate-where-clauses.rs b/tests/ui/parser/duplicate-where-clauses.rs
index 9eb2ffb06..9eb2ffb06 100644
--- a/src/test/ui/parser/duplicate-where-clauses.rs
+++ b/tests/ui/parser/duplicate-where-clauses.rs
diff --git a/src/test/ui/parser/duplicate-where-clauses.stderr b/tests/ui/parser/duplicate-where-clauses.stderr
index 8250d4f1e..8250d4f1e 100644
--- a/src/test/ui/parser/duplicate-where-clauses.stderr
+++ b/tests/ui/parser/duplicate-where-clauses.stderr
diff --git a/src/test/ui/parser/dyn-trait-compatibility.rs b/tests/ui/parser/dyn-trait-compatibility.rs
index d2b02cc2a..d2b02cc2a 100644
--- a/src/test/ui/parser/dyn-trait-compatibility.rs
+++ b/tests/ui/parser/dyn-trait-compatibility.rs
diff --git a/src/test/ui/parser/dyn-trait-compatibility.stderr b/tests/ui/parser/dyn-trait-compatibility.stderr
index 9218ae9d5..0cae01bd1 100644
--- a/src/test/ui/parser/dyn-trait-compatibility.stderr
+++ b/tests/ui/parser/dyn-trait-compatibility.stderr
@@ -26,17 +26,13 @@ error[E0412]: cannot find type `dyn` in this scope
   --> $DIR/dyn-trait-compatibility.rs:5:15
    |
 LL | type A2 = dyn<dyn, dyn>;
-   |        -      ^^^ not found in this scope
-   |        |
-   |        help: you might be missing a type parameter: `<dyn>`
+   |               ^^^ not found in this scope
 
 error[E0412]: cannot find type `dyn` in this scope
   --> $DIR/dyn-trait-compatibility.rs:5:20
    |
 LL | type A2 = dyn<dyn, dyn>;
-   |        -           ^^^ not found in this scope
-   |        |
-   |        help: you might be missing a type parameter: `<dyn>`
+   |                    ^^^ not found in this scope
 
 error[E0412]: cannot find type `dyn` in this scope
   --> $DIR/dyn-trait-compatibility.rs:9:11
@@ -48,9 +44,7 @@ error[E0412]: cannot find type `dyn` in this scope
   --> $DIR/dyn-trait-compatibility.rs:9:16
    |
 LL | type A3 = dyn<<dyn as dyn>::dyn>;
-   |        -       ^^^ not found in this scope
-   |        |
-   |        help: you might be missing a type parameter: `<dyn>`
+   |                ^^^ not found in this scope
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/parser/else-no-if.rs b/tests/ui/parser/else-no-if.rs
index f0b40ecde..f0b40ecde 100644
--- a/src/test/ui/parser/else-no-if.rs
+++ b/tests/ui/parser/else-no-if.rs
diff --git a/src/test/ui/parser/else-no-if.stderr b/tests/ui/parser/else-no-if.stderr
index b9c1a7527..b9c1a7527 100644
--- a/src/test/ui/parser/else-no-if.stderr
+++ b/tests/ui/parser/else-no-if.stderr
diff --git a/src/test/ui/parser/emoji-identifiers.rs b/tests/ui/parser/emoji-identifiers.rs
index b50c046bc..b50c046bc 100644
--- a/src/test/ui/parser/emoji-identifiers.rs
+++ b/tests/ui/parser/emoji-identifiers.rs
diff --git a/src/test/ui/parser/emoji-identifiers.stderr b/tests/ui/parser/emoji-identifiers.stderr
index e645b68ba..e645b68ba 100644
--- a/src/test/ui/parser/emoji-identifiers.stderr
+++ b/tests/ui/parser/emoji-identifiers.stderr
diff --git a/src/test/ui/parser/empty-impl-semicolon.rs b/tests/ui/parser/empty-impl-semicolon.rs
index 2485f5b85..2485f5b85 100644
--- a/src/test/ui/parser/empty-impl-semicolon.rs
+++ b/tests/ui/parser/empty-impl-semicolon.rs
diff --git a/src/test/ui/parser/empty-impl-semicolon.stderr b/tests/ui/parser/empty-impl-semicolon.stderr
index 6ed309eba..6ed309eba 100644
--- a/src/test/ui/parser/empty-impl-semicolon.stderr
+++ b/tests/ui/parser/empty-impl-semicolon.stderr
diff --git a/src/test/ui/parser/expr-as-stmt-2.rs b/tests/ui/parser/expr-as-stmt-2.rs
index 3a18bdc3b..3a18bdc3b 100644
--- a/src/test/ui/parser/expr-as-stmt-2.rs
+++ b/tests/ui/parser/expr-as-stmt-2.rs
diff --git a/src/test/ui/parser/expr-as-stmt-2.stderr b/tests/ui/parser/expr-as-stmt-2.stderr
index 2b6314c38..2b6314c38 100644
--- a/src/test/ui/parser/expr-as-stmt-2.stderr
+++ b/tests/ui/parser/expr-as-stmt-2.stderr
diff --git a/src/test/ui/parser/expr-as-stmt.fixed b/tests/ui/parser/expr-as-stmt.fixed
index b06f62794..b06f62794 100644
--- a/src/test/ui/parser/expr-as-stmt.fixed
+++ b/tests/ui/parser/expr-as-stmt.fixed
diff --git a/src/test/ui/parser/expr-as-stmt.rs b/tests/ui/parser/expr-as-stmt.rs
index b39d2b886..b39d2b886 100644
--- a/src/test/ui/parser/expr-as-stmt.rs
+++ b/tests/ui/parser/expr-as-stmt.rs
diff --git a/src/test/ui/parser/expr-as-stmt.stderr b/tests/ui/parser/expr-as-stmt.stderr
index 18c8b0b7c..18c8b0b7c 100644
--- a/src/test/ui/parser/expr-as-stmt.stderr
+++ b/tests/ui/parser/expr-as-stmt.stderr
diff --git a/src/test/ui/parser/extern-abi-from-mac-literal-frag.rs b/tests/ui/parser/extern-abi-from-mac-literal-frag.rs
index 8f5d7f4f7..8f5d7f4f7 100644
--- a/src/test/ui/parser/extern-abi-from-mac-literal-frag.rs
+++ b/tests/ui/parser/extern-abi-from-mac-literal-frag.rs
diff --git a/src/test/ui/parser/extern-abi-raw-strings.rs b/tests/ui/parser/extern-abi-raw-strings.rs
index fad855a21..fad855a21 100644
--- a/src/test/ui/parser/extern-abi-raw-strings.rs
+++ b/tests/ui/parser/extern-abi-raw-strings.rs
diff --git a/src/test/ui/parser/extern-abi-string-escaping.rs b/tests/ui/parser/extern-abi-string-escaping.rs
index 87bd31aab..87bd31aab 100644
--- a/src/test/ui/parser/extern-abi-string-escaping.rs
+++ b/tests/ui/parser/extern-abi-string-escaping.rs
diff --git a/src/test/ui/parser/extern-abi-syntactic.rs b/tests/ui/parser/extern-abi-syntactic.rs
index 7d2bbfe8a..7d2bbfe8a 100644
--- a/src/test/ui/parser/extern-abi-syntactic.rs
+++ b/tests/ui/parser/extern-abi-syntactic.rs
diff --git a/src/test/ui/parser/extern-crate-async.rs b/tests/ui/parser/extern-crate-async.rs
index 6a54ac7f4..6a54ac7f4 100644
--- a/src/test/ui/parser/extern-crate-async.rs
+++ b/tests/ui/parser/extern-crate-async.rs
diff --git a/src/test/ui/parser/extern-crate-unexpected-token.rs b/tests/ui/parser/extern-crate-unexpected-token.rs
index 7687f5e64..7687f5e64 100644
--- a/src/test/ui/parser/extern-crate-unexpected-token.rs
+++ b/tests/ui/parser/extern-crate-unexpected-token.rs
diff --git a/src/test/ui/parser/extern-crate-unexpected-token.stderr b/tests/ui/parser/extern-crate-unexpected-token.stderr
index e9d287ac0..e9d287ac0 100644
--- a/src/test/ui/parser/extern-crate-unexpected-token.stderr
+++ b/tests/ui/parser/extern-crate-unexpected-token.stderr
diff --git a/src/test/ui/parser/extern-expected-fn-or-brace.rs b/tests/ui/parser/extern-expected-fn-or-brace.rs
index 1dcea1744..1dcea1744 100644
--- a/src/test/ui/parser/extern-expected-fn-or-brace.rs
+++ b/tests/ui/parser/extern-expected-fn-or-brace.rs
diff --git a/src/test/ui/parser/extern-expected-fn-or-brace.stderr b/tests/ui/parser/extern-expected-fn-or-brace.stderr
index 258a2c268..258a2c268 100644
--- a/src/test/ui/parser/extern-expected-fn-or-brace.stderr
+++ b/tests/ui/parser/extern-expected-fn-or-brace.stderr
diff --git a/src/test/ui/parser/extern-foreign-crate.rs b/tests/ui/parser/extern-foreign-crate.rs
index a5da77dc7..a5da77dc7 100644
--- a/src/test/ui/parser/extern-foreign-crate.rs
+++ b/tests/ui/parser/extern-foreign-crate.rs
diff --git a/src/test/ui/parser/extern-foreign-crate.stderr b/tests/ui/parser/extern-foreign-crate.stderr
index eb75c0fc9..eb75c0fc9 100644
--- a/src/test/ui/parser/extern-foreign-crate.stderr
+++ b/tests/ui/parser/extern-foreign-crate.stderr
diff --git a/src/test/ui/parser/extern-no-fn.rs b/tests/ui/parser/extern-no-fn.rs
index 73568609c..73568609c 100644
--- a/src/test/ui/parser/extern-no-fn.rs
+++ b/tests/ui/parser/extern-no-fn.rs
diff --git a/src/test/ui/parser/extern-no-fn.stderr b/tests/ui/parser/extern-no-fn.stderr
index d9183d564..d9183d564 100644
--- a/src/test/ui/parser/extern-no-fn.stderr
+++ b/tests/ui/parser/extern-no-fn.stderr
diff --git a/src/test/ui/parser/float-field-interpolated.rs b/tests/ui/parser/float-field-interpolated.rs
index a30532035..a30532035 100644
--- a/src/test/ui/parser/float-field-interpolated.rs
+++ b/tests/ui/parser/float-field-interpolated.rs
diff --git a/src/test/ui/parser/float-field-interpolated.stderr b/tests/ui/parser/float-field-interpolated.stderr
index 664adb358..664adb358 100644
--- a/src/test/ui/parser/float-field-interpolated.stderr
+++ b/tests/ui/parser/float-field-interpolated.stderr
diff --git a/src/test/ui/parser/float-field.rs b/tests/ui/parser/float-field.rs
index eaa7465dc..eaa7465dc 100644
--- a/src/test/ui/parser/float-field.rs
+++ b/tests/ui/parser/float-field.rs
diff --git a/src/test/ui/parser/float-field.stderr b/tests/ui/parser/float-field.stderr
index 7090efc50..7090efc50 100644
--- a/src/test/ui/parser/float-field.stderr
+++ b/tests/ui/parser/float-field.stderr
diff --git a/src/test/ui/parser/float-literals.rs b/tests/ui/parser/float-literals.rs
index 1e9319fd2..1e9319fd2 100644
--- a/src/test/ui/parser/float-literals.rs
+++ b/tests/ui/parser/float-literals.rs
diff --git a/src/test/ui/parser/fn-arg-doc-comment.rs b/tests/ui/parser/fn-arg-doc-comment.rs
index 21d753ad0..21d753ad0 100644
--- a/src/test/ui/parser/fn-arg-doc-comment.rs
+++ b/tests/ui/parser/fn-arg-doc-comment.rs
diff --git a/src/test/ui/parser/fn-arg-doc-comment.stderr b/tests/ui/parser/fn-arg-doc-comment.stderr
index c8d7e2efe..c8d7e2efe 100644
--- a/src/test/ui/parser/fn-arg-doc-comment.stderr
+++ b/tests/ui/parser/fn-arg-doc-comment.stderr
diff --git a/src/test/ui/parser/fn-body-eq-expr-semi.rs b/tests/ui/parser/fn-body-eq-expr-semi.rs
index 7127ba8da..7127ba8da 100644
--- a/src/test/ui/parser/fn-body-eq-expr-semi.rs
+++ b/tests/ui/parser/fn-body-eq-expr-semi.rs
diff --git a/src/test/ui/parser/fn-body-eq-expr-semi.stderr b/tests/ui/parser/fn-body-eq-expr-semi.stderr
index f1255d864..f1255d864 100644
--- a/src/test/ui/parser/fn-body-eq-expr-semi.stderr
+++ b/tests/ui/parser/fn-body-eq-expr-semi.stderr
diff --git a/src/test/ui/parser/fn-body-optional-semantic-fail.rs b/tests/ui/parser/fn-body-optional-semantic-fail.rs
index 12df48880..12df48880 100644
--- a/src/test/ui/parser/fn-body-optional-semantic-fail.rs
+++ b/tests/ui/parser/fn-body-optional-semantic-fail.rs
diff --git a/src/test/ui/parser/fn-body-optional-semantic-fail.stderr b/tests/ui/parser/fn-body-optional-semantic-fail.stderr
index 14bcd7c16..14bcd7c16 100644
--- a/src/test/ui/parser/fn-body-optional-semantic-fail.stderr
+++ b/tests/ui/parser/fn-body-optional-semantic-fail.stderr
diff --git a/src/test/ui/parser/fn-body-optional-syntactic-pass.rs b/tests/ui/parser/fn-body-optional-syntactic-pass.rs
index f9dbebf0b..f9dbebf0b 100644
--- a/src/test/ui/parser/fn-body-optional-syntactic-pass.rs
+++ b/tests/ui/parser/fn-body-optional-syntactic-pass.rs
diff --git a/src/test/ui/parser/fn-colon-return-type.rs b/tests/ui/parser/fn-colon-return-type.rs
index 0001ef57c..0001ef57c 100644
--- a/src/test/ui/parser/fn-colon-return-type.rs
+++ b/tests/ui/parser/fn-colon-return-type.rs
diff --git a/src/test/ui/parser/fn-colon-return-type.stderr b/tests/ui/parser/fn-colon-return-type.stderr
index 1de918782..1de918782 100644
--- a/src/test/ui/parser/fn-colon-return-type.stderr
+++ b/tests/ui/parser/fn-colon-return-type.stderr
diff --git a/src/test/ui/parser/fn-defined-using-def.rs b/tests/ui/parser/fn-defined-using-def.rs
index 21da34c47..21da34c47 100644
--- a/src/test/ui/parser/fn-defined-using-def.rs
+++ b/tests/ui/parser/fn-defined-using-def.rs
diff --git a/src/test/ui/parser/fn-defined-using-def.stderr b/tests/ui/parser/fn-defined-using-def.stderr
index f34329012..f34329012 100644
--- a/src/test/ui/parser/fn-defined-using-def.stderr
+++ b/tests/ui/parser/fn-defined-using-def.stderr
diff --git a/src/test/ui/parser/fn-defined-using-fun.rs b/tests/ui/parser/fn-defined-using-fun.rs
index 4f7460504..4f7460504 100644
--- a/src/test/ui/parser/fn-defined-using-fun.rs
+++ b/tests/ui/parser/fn-defined-using-fun.rs
diff --git a/src/test/ui/parser/fn-defined-using-fun.stderr b/tests/ui/parser/fn-defined-using-fun.stderr
index 2f6cfff35..2f6cfff35 100644
--- a/src/test/ui/parser/fn-defined-using-fun.stderr
+++ b/tests/ui/parser/fn-defined-using-fun.stderr
diff --git a/src/test/ui/parser/fn-defined-using-func.rs b/tests/ui/parser/fn-defined-using-func.rs
index 2dce96fdc..2dce96fdc 100644
--- a/src/test/ui/parser/fn-defined-using-func.rs
+++ b/tests/ui/parser/fn-defined-using-func.rs
diff --git a/src/test/ui/parser/fn-defined-using-func.stderr b/tests/ui/parser/fn-defined-using-func.stderr
index 355741e89..355741e89 100644
--- a/src/test/ui/parser/fn-defined-using-func.stderr
+++ b/tests/ui/parser/fn-defined-using-func.stderr
diff --git a/src/test/ui/parser/fn-defined-using-function.rs b/tests/ui/parser/fn-defined-using-function.rs
index fd8782728..fd8782728 100644
--- a/src/test/ui/parser/fn-defined-using-function.rs
+++ b/tests/ui/parser/fn-defined-using-function.rs
diff --git a/src/test/ui/parser/fn-defined-using-function.stderr b/tests/ui/parser/fn-defined-using-function.stderr
index 43c33a2cd..43c33a2cd 100644
--- a/src/test/ui/parser/fn-defined-using-function.stderr
+++ b/tests/ui/parser/fn-defined-using-function.stderr
diff --git a/src/test/ui/parser/fn-field-parse-error-ice.rs b/tests/ui/parser/fn-field-parse-error-ice.rs
index 188257ea5..188257ea5 100644
--- a/src/test/ui/parser/fn-field-parse-error-ice.rs
+++ b/tests/ui/parser/fn-field-parse-error-ice.rs
diff --git a/src/test/ui/parser/fn-field-parse-error-ice.stderr b/tests/ui/parser/fn-field-parse-error-ice.stderr
index 3bf68e8cc..3bf68e8cc 100644
--- a/src/test/ui/parser/fn-field-parse-error-ice.stderr
+++ b/tests/ui/parser/fn-field-parse-error-ice.stderr
diff --git a/src/test/ui/parser/fn-header-semantic-fail.rs b/tests/ui/parser/fn-header-semantic-fail.rs
index cf5d3dab4..cf5d3dab4 100644
--- a/src/test/ui/parser/fn-header-semantic-fail.rs
+++ b/tests/ui/parser/fn-header-semantic-fail.rs
diff --git a/src/test/ui/parser/fn-header-semantic-fail.stderr b/tests/ui/parser/fn-header-semantic-fail.stderr
index 038fdfb2d..038fdfb2d 100644
--- a/src/test/ui/parser/fn-header-semantic-fail.stderr
+++ b/tests/ui/parser/fn-header-semantic-fail.stderr
diff --git a/src/test/ui/parser/fn-header-syntactic-pass.rs b/tests/ui/parser/fn-header-syntactic-pass.rs
index 68f1f7901..68f1f7901 100644
--- a/src/test/ui/parser/fn-header-syntactic-pass.rs
+++ b/tests/ui/parser/fn-header-syntactic-pass.rs
diff --git a/src/test/ui/parser/fn-returns-fn-pointer.rs b/tests/ui/parser/fn-returns-fn-pointer.rs
index 15590e324..15590e324 100644
--- a/src/test/ui/parser/fn-returns-fn-pointer.rs
+++ b/tests/ui/parser/fn-returns-fn-pointer.rs
diff --git a/src/test/ui/parser/foreign-const-semantic-fail.rs b/tests/ui/parser/foreign-const-semantic-fail.rs
index c9940b74a..c9940b74a 100644
--- a/src/test/ui/parser/foreign-const-semantic-fail.rs
+++ b/tests/ui/parser/foreign-const-semantic-fail.rs
diff --git a/src/test/ui/parser/foreign-const-semantic-fail.stderr b/tests/ui/parser/foreign-const-semantic-fail.stderr
index 8dc66c0d0..8dc66c0d0 100644
--- a/src/test/ui/parser/foreign-const-semantic-fail.stderr
+++ b/tests/ui/parser/foreign-const-semantic-fail.stderr
diff --git a/src/test/ui/parser/foreign-const-syntactic-fail.rs b/tests/ui/parser/foreign-const-syntactic-fail.rs
index a6e77f846..a6e77f846 100644
--- a/src/test/ui/parser/foreign-const-syntactic-fail.rs
+++ b/tests/ui/parser/foreign-const-syntactic-fail.rs
diff --git a/src/test/ui/parser/foreign-const-syntactic-fail.stderr b/tests/ui/parser/foreign-const-syntactic-fail.stderr
index 9cf58fa95..9cf58fa95 100644
--- a/src/test/ui/parser/foreign-const-syntactic-fail.stderr
+++ b/tests/ui/parser/foreign-const-syntactic-fail.stderr
diff --git a/src/test/ui/parser/foreign-static-semantic-fail.rs b/tests/ui/parser/foreign-static-semantic-fail.rs
index 3d427ed0e..3d427ed0e 100644
--- a/src/test/ui/parser/foreign-static-semantic-fail.rs
+++ b/tests/ui/parser/foreign-static-semantic-fail.rs
diff --git a/src/test/ui/parser/foreign-static-semantic-fail.stderr b/tests/ui/parser/foreign-static-semantic-fail.stderr
index 105508cfe..105508cfe 100644
--- a/src/test/ui/parser/foreign-static-semantic-fail.stderr
+++ b/tests/ui/parser/foreign-static-semantic-fail.stderr
diff --git a/src/test/ui/parser/foreign-static-syntactic-pass.rs b/tests/ui/parser/foreign-static-syntactic-pass.rs
index 599496346..599496346 100644
--- a/src/test/ui/parser/foreign-static-syntactic-pass.rs
+++ b/tests/ui/parser/foreign-static-syntactic-pass.rs
diff --git a/src/test/ui/parser/foreign-ty-semantic-fail.rs b/tests/ui/parser/foreign-ty-semantic-fail.rs
index 96b15232b..96b15232b 100644
--- a/src/test/ui/parser/foreign-ty-semantic-fail.rs
+++ b/tests/ui/parser/foreign-ty-semantic-fail.rs
diff --git a/src/test/ui/parser/foreign-ty-semantic-fail.stderr b/tests/ui/parser/foreign-ty-semantic-fail.stderr
index 588e4966a..588e4966a 100644
--- a/src/test/ui/parser/foreign-ty-semantic-fail.stderr
+++ b/tests/ui/parser/foreign-ty-semantic-fail.stderr
diff --git a/src/test/ui/parser/foreign-ty-syntactic-pass.rs b/tests/ui/parser/foreign-ty-syntactic-pass.rs
index a746de1f1..a746de1f1 100644
--- a/src/test/ui/parser/foreign-ty-syntactic-pass.rs
+++ b/tests/ui/parser/foreign-ty-syntactic-pass.rs
diff --git a/src/test/ui/parser/if-block-unreachable-expr.rs b/tests/ui/parser/if-block-unreachable-expr.rs
index 4063a3370..4063a3370 100644
--- a/src/test/ui/parser/if-block-unreachable-expr.rs
+++ b/tests/ui/parser/if-block-unreachable-expr.rs
diff --git a/src/test/ui/parser/if-in-in.fixed b/tests/ui/parser/if-in-in.fixed
index 0bb88c559..0bb88c559 100644
--- a/src/test/ui/parser/if-in-in.fixed
+++ b/tests/ui/parser/if-in-in.fixed
diff --git a/src/test/ui/parser/if-in-in.rs b/tests/ui/parser/if-in-in.rs
index 6c0986fe1..6c0986fe1 100644
--- a/src/test/ui/parser/if-in-in.rs
+++ b/tests/ui/parser/if-in-in.rs
diff --git a/src/test/ui/parser/if-in-in.stderr b/tests/ui/parser/if-in-in.stderr
index 0e69bc4b2..0e69bc4b2 100644
--- a/src/test/ui/parser/if-in-in.stderr
+++ b/tests/ui/parser/if-in-in.stderr
diff --git a/src/test/ui/parser/impl-item-const-pass.rs b/tests/ui/parser/impl-item-const-pass.rs
index d11245613..d11245613 100644
--- a/src/test/ui/parser/impl-item-const-pass.rs
+++ b/tests/ui/parser/impl-item-const-pass.rs
diff --git a/src/test/ui/parser/impl-item-const-semantic-fail.rs b/tests/ui/parser/impl-item-const-semantic-fail.rs
index 5d4692f9f..5d4692f9f 100644
--- a/src/test/ui/parser/impl-item-const-semantic-fail.rs
+++ b/tests/ui/parser/impl-item-const-semantic-fail.rs
diff --git a/src/test/ui/parser/impl-item-const-semantic-fail.stderr b/tests/ui/parser/impl-item-const-semantic-fail.stderr
index ec3bee0ce..ec3bee0ce 100644
--- a/src/test/ui/parser/impl-item-const-semantic-fail.stderr
+++ b/tests/ui/parser/impl-item-const-semantic-fail.stderr
diff --git a/src/test/ui/parser/impl-item-fn-no-body-pass.rs b/tests/ui/parser/impl-item-fn-no-body-pass.rs
index 16b09d64e..16b09d64e 100644
--- a/src/test/ui/parser/impl-item-fn-no-body-pass.rs
+++ b/tests/ui/parser/impl-item-fn-no-body-pass.rs
diff --git a/src/test/ui/parser/impl-item-fn-no-body-semantic-fail.rs b/tests/ui/parser/impl-item-fn-no-body-semantic-fail.rs
index cb183db59..cb183db59 100644
--- a/src/test/ui/parser/impl-item-fn-no-body-semantic-fail.rs
+++ b/tests/ui/parser/impl-item-fn-no-body-semantic-fail.rs
diff --git a/src/test/ui/parser/impl-item-fn-no-body-semantic-fail.stderr b/tests/ui/parser/impl-item-fn-no-body-semantic-fail.stderr
index 1acb72736..1acb72736 100644
--- a/src/test/ui/parser/impl-item-fn-no-body-semantic-fail.stderr
+++ b/tests/ui/parser/impl-item-fn-no-body-semantic-fail.stderr
diff --git a/src/test/ui/parser/impl-item-type-no-body-pass.rs b/tests/ui/parser/impl-item-type-no-body-pass.rs
index 74a9c6ab7..74a9c6ab7 100644
--- a/src/test/ui/parser/impl-item-type-no-body-pass.rs
+++ b/tests/ui/parser/impl-item-type-no-body-pass.rs
diff --git a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.rs b/tests/ui/parser/impl-item-type-no-body-semantic-fail.rs
index 1291a021b..1291a021b 100644
--- a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.rs
+++ b/tests/ui/parser/impl-item-type-no-body-semantic-fail.rs
diff --git a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.stderr b/tests/ui/parser/impl-item-type-no-body-semantic-fail.stderr
index 3856754e0..3856754e0 100644
--- a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.stderr
+++ b/tests/ui/parser/impl-item-type-no-body-semantic-fail.stderr
diff --git a/src/test/ui/parser/impl-parsing.rs b/tests/ui/parser/impl-parsing.rs
index 80ce88855..80ce88855 100644
--- a/src/test/ui/parser/impl-parsing.rs
+++ b/tests/ui/parser/impl-parsing.rs
diff --git a/src/test/ui/parser/impl-parsing.stderr b/tests/ui/parser/impl-parsing.stderr
index 755addf14..755addf14 100644
--- a/src/test/ui/parser/impl-parsing.stderr
+++ b/tests/ui/parser/impl-parsing.stderr
diff --git a/src/test/ui/parser/impl-qpath.rs b/tests/ui/parser/impl-qpath.rs
index d1f0a0204..d1f0a0204 100644
--- a/src/test/ui/parser/impl-qpath.rs
+++ b/tests/ui/parser/impl-qpath.rs
diff --git a/src/test/ui/parser/import-from-path.rs b/tests/ui/parser/import-from-path.rs
index 3fce08259..3fce08259 100644
--- a/src/test/ui/parser/import-from-path.rs
+++ b/tests/ui/parser/import-from-path.rs
diff --git a/src/test/ui/parser/import-from-path.stderr b/tests/ui/parser/import-from-path.stderr
index 93bdf82d0..93bdf82d0 100644
--- a/src/test/ui/parser/import-from-path.stderr
+++ b/tests/ui/parser/import-from-path.stderr
diff --git a/src/test/ui/parser/import-from-rename.rs b/tests/ui/parser/import-from-rename.rs
index 27425a3c9..27425a3c9 100644
--- a/src/test/ui/parser/import-from-rename.rs
+++ b/tests/ui/parser/import-from-rename.rs
diff --git a/src/test/ui/parser/import-from-rename.stderr b/tests/ui/parser/import-from-rename.stderr
index d78f6de92..d78f6de92 100644
--- a/src/test/ui/parser/import-from-rename.stderr
+++ b/tests/ui/parser/import-from-rename.stderr
diff --git a/src/test/ui/parser/import-glob-path.rs b/tests/ui/parser/import-glob-path.rs
index de4c07aa7..de4c07aa7 100644
--- a/src/test/ui/parser/import-glob-path.rs
+++ b/tests/ui/parser/import-glob-path.rs
diff --git a/src/test/ui/parser/import-glob-path.stderr b/tests/ui/parser/import-glob-path.stderr
index a93ef255c..a93ef255c 100644
--- a/src/test/ui/parser/import-glob-path.stderr
+++ b/tests/ui/parser/import-glob-path.stderr
diff --git a/src/test/ui/parser/import-glob-rename.rs b/tests/ui/parser/import-glob-rename.rs
index b9b753dcd..b9b753dcd 100644
--- a/src/test/ui/parser/import-glob-rename.rs
+++ b/tests/ui/parser/import-glob-rename.rs
diff --git a/src/test/ui/parser/import-glob-rename.stderr b/tests/ui/parser/import-glob-rename.stderr
index e1a026b63..e1a026b63 100644
--- a/src/test/ui/parser/import-glob-rename.stderr
+++ b/tests/ui/parser/import-glob-rename.stderr
diff --git a/tests/ui/parser/increment-autofix-2.fixed b/tests/ui/parser/increment-autofix-2.fixed
new file mode 100644
index 000000000..580ebaf5d
--- /dev/null
+++ b/tests/ui/parser/increment-autofix-2.fixed
@@ -0,0 +1,63 @@
+// run-rustfix
+
+struct Foo {
+    bar: Bar,
+}
+
+struct Bar {
+    qux: i32,
+}
+
+pub fn post_regular() {
+    let mut i = 0;
+    i += 1; //~ ERROR Rust has no postfix increment operator
+    println!("{}", i);
+}
+
+pub fn post_while() {
+    let mut i = 0;
+    while { let tmp = i; i += 1; tmp } < 5 {
+        //~^ ERROR Rust has no postfix increment operator
+        println!("{}", i);
+    }
+}
+
+pub fn post_regular_tmp() {
+    let mut tmp = 0;
+    tmp += 1; //~ ERROR Rust has no postfix increment operator
+    println!("{}", tmp);
+}
+
+pub fn post_while_tmp() {
+    let mut tmp = 0;
+    while { let tmp_ = tmp; tmp += 1; tmp_ } < 5 {
+        //~^ ERROR Rust has no postfix increment operator
+        println!("{}", tmp);
+    }
+}
+
+pub fn post_field() {
+    let mut foo = Foo { bar: Bar { qux: 0 } };
+    foo.bar.qux += 1;
+    //~^ ERROR Rust has no postfix increment operator
+    println!("{}", foo.bar.qux);
+}
+
+pub fn post_field_tmp() {
+    struct S {
+        tmp: i32
+    }
+    let mut s = S { tmp: 0 };
+    s.tmp += 1;
+    //~^ ERROR Rust has no postfix increment operator
+    println!("{}", s.tmp);
+}
+
+pub fn pre_field() {
+    let mut foo = Foo { bar: Bar { qux: 0 } };
+    foo.bar.qux += 1;
+    //~^ ERROR Rust has no prefix increment operator
+    println!("{}", foo.bar.qux);
+}
+
+fn main() {}
diff --git a/tests/ui/parser/increment-autofix-2.rs b/tests/ui/parser/increment-autofix-2.rs
new file mode 100644
index 000000000..ebe5fa6ca
--- /dev/null
+++ b/tests/ui/parser/increment-autofix-2.rs
@@ -0,0 +1,63 @@
+// run-rustfix
+
+struct Foo {
+    bar: Bar,
+}
+
+struct Bar {
+    qux: i32,
+}
+
+pub fn post_regular() {
+    let mut i = 0;
+    i++; //~ ERROR Rust has no postfix increment operator
+    println!("{}", i);
+}
+
+pub fn post_while() {
+    let mut i = 0;
+    while i++ < 5 {
+        //~^ ERROR Rust has no postfix increment operator
+        println!("{}", i);
+    }
+}
+
+pub fn post_regular_tmp() {
+    let mut tmp = 0;
+    tmp++; //~ ERROR Rust has no postfix increment operator
+    println!("{}", tmp);
+}
+
+pub fn post_while_tmp() {
+    let mut tmp = 0;
+    while tmp++ < 5 {
+        //~^ ERROR Rust has no postfix increment operator
+        println!("{}", tmp);
+    }
+}
+
+pub fn post_field() {
+    let mut foo = Foo { bar: Bar { qux: 0 } };
+    foo.bar.qux++;
+    //~^ ERROR Rust has no postfix increment operator
+    println!("{}", foo.bar.qux);
+}
+
+pub fn post_field_tmp() {
+    struct S {
+        tmp: i32
+    }
+    let mut s = S { tmp: 0 };
+    s.tmp++;
+    //~^ ERROR Rust has no postfix increment operator
+    println!("{}", s.tmp);
+}
+
+pub fn pre_field() {
+    let mut foo = Foo { bar: Bar { qux: 0 } };
+    ++foo.bar.qux;
+    //~^ ERROR Rust has no prefix increment operator
+    println!("{}", foo.bar.qux);
+}
+
+fn main() {}
diff --git a/tests/ui/parser/increment-autofix-2.stderr b/tests/ui/parser/increment-autofix-2.stderr
new file mode 100644
index 000000000..11e985480
--- /dev/null
+++ b/tests/ui/parser/increment-autofix-2.stderr
@@ -0,0 +1,84 @@
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:13:6
+   |
+LL |     i++;
+   |      ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     i += 1;
+   |       ~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:19:12
+   |
+LL |     while i++ < 5 {
+   |     -----  ^^ not a valid postfix operator
+   |     |
+   |     while parsing the condition of this `while` expression
+   |
+help: use `+= 1` instead
+   |
+LL |     while { let tmp = i; i += 1; tmp } < 5 {
+   |           +++++++++++  ~~~~~~~~~~~~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:27:8
+   |
+LL |     tmp++;
+   |        ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     tmp += 1;
+   |         ~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:33:14
+   |
+LL |     while tmp++ < 5 {
+   |     -----    ^^ not a valid postfix operator
+   |     |
+   |     while parsing the condition of this `while` expression
+   |
+help: use `+= 1` instead
+   |
+LL |     while { let tmp_ = tmp; tmp += 1; tmp_ } < 5 {
+   |           ++++++++++++    ~~~~~~~~~~~~~~~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:41:16
+   |
+LL |     foo.bar.qux++;
+   |                ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     foo.bar.qux += 1;
+   |                 ~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/increment-autofix-2.rs:51:10
+   |
+LL |     s.tmp++;
+   |          ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     s.tmp += 1;
+   |           ~~~~
+
+error: Rust has no prefix increment operator
+  --> $DIR/increment-autofix-2.rs:58:5
+   |
+LL |     ++foo.bar.qux;
+   |     ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL -     ++foo.bar.qux;
+LL +     foo.bar.qux += 1;
+   |
+
+error: aborting due to 7 previous errors
+
diff --git a/src/test/ui/parser/increment-autofix.fixed b/tests/ui/parser/increment-autofix.fixed
index 7a426badf..7a426badf 100644
--- a/src/test/ui/parser/increment-autofix.fixed
+++ b/tests/ui/parser/increment-autofix.fixed
diff --git a/src/test/ui/parser/increment-autofix.rs b/tests/ui/parser/increment-autofix.rs
index d38603697..d38603697 100644
--- a/src/test/ui/parser/increment-autofix.rs
+++ b/tests/ui/parser/increment-autofix.rs
diff --git a/src/test/ui/parser/increment-autofix.stderr b/tests/ui/parser/increment-autofix.stderr
index 1dc69fd9f..1dc69fd9f 100644
--- a/src/test/ui/parser/increment-autofix.stderr
+++ b/tests/ui/parser/increment-autofix.stderr
diff --git a/src/test/ui/parser/inner-attr-after-doc-comment.rs b/tests/ui/parser/inner-attr-after-doc-comment.rs
index 36f4191f0..36f4191f0 100644
--- a/src/test/ui/parser/inner-attr-after-doc-comment.rs
+++ b/tests/ui/parser/inner-attr-after-doc-comment.rs
diff --git a/src/test/ui/parser/inner-attr-after-doc-comment.stderr b/tests/ui/parser/inner-attr-after-doc-comment.stderr
index 3ec3ad8e9..3ec3ad8e9 100644
--- a/src/test/ui/parser/inner-attr-after-doc-comment.stderr
+++ b/tests/ui/parser/inner-attr-after-doc-comment.stderr
diff --git a/src/test/ui/parser/inner-attr-in-trait-def.rs b/tests/ui/parser/inner-attr-in-trait-def.rs
index 8dba6b362..8dba6b362 100644
--- a/src/test/ui/parser/inner-attr-in-trait-def.rs
+++ b/tests/ui/parser/inner-attr-in-trait-def.rs
diff --git a/src/test/ui/parser/inner-attr.rs b/tests/ui/parser/inner-attr.rs
index 1b405e20e..1b405e20e 100644
--- a/src/test/ui/parser/inner-attr.rs
+++ b/tests/ui/parser/inner-attr.rs
diff --git a/src/test/ui/parser/inner-attr.stderr b/tests/ui/parser/inner-attr.stderr
index 331c254a5..331c254a5 100644
--- a/src/test/ui/parser/inner-attr.stderr
+++ b/tests/ui/parser/inner-attr.stderr
diff --git a/src/test/ui/parser/int-literal-too-large-span.rs b/tests/ui/parser/int-literal-too-large-span.rs
index 666ca9350..666ca9350 100644
--- a/src/test/ui/parser/int-literal-too-large-span.rs
+++ b/tests/ui/parser/int-literal-too-large-span.rs
diff --git a/src/test/ui/parser/int-literal-too-large-span.stderr b/tests/ui/parser/int-literal-too-large-span.stderr
index 7cae85fc9..49d6aa5ef 100644
--- a/src/test/ui/parser/int-literal-too-large-span.stderr
+++ b/tests/ui/parser/int-literal-too-large-span.stderr
@@ -3,6 +3,8 @@ error: integer literal is too large
    |
 LL |     9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `340282366920938463463374607431768211455`
 
 error: aborting due to previous error
 
diff --git a/tests/ui/parser/intersection-patterns-1.fixed b/tests/ui/parser/intersection-patterns-1.fixed
new file mode 100644
index 000000000..44773095b
--- /dev/null
+++ b/tests/ui/parser/intersection-patterns-1.fixed
@@ -0,0 +1,35 @@
+// This tests the parser recovery in `recover_intersection_pat`
+// and serves as a regression test for the diagnostics issue #65400.
+//
+// The general idea is that for `$pat_lhs @ $pat_rhs` where
+// `$pat_lhs` is not generated by `ref? mut? $ident` we want
+// to suggest either switching the order or note that intersection
+// patterns are not allowed.
+
+// run-rustfix
+
+#![allow(unused_variables)]
+
+fn main() {
+    let s: Option<u8> = None;
+
+    match s {
+        y @ Some(x) => {}
+        //~^ ERROR pattern on wrong side of `@`
+        //~| pattern on the left, should be on the right
+        //~| binding on the right, should be on the left
+        //~| HELP switch the order
+        //~| SUGGESTION y @ Some(x)
+        _ => {}
+    }
+
+    match 2 {
+        e @ 1..=5 => {}
+        //~^ ERROR pattern on wrong side of `@`
+        //~| pattern on the left, should be on the right
+        //~| binding on the right, should be on the left
+        //~| HELP switch the order
+        //~| SUGGESTION e @ 1..=5
+        _ => {}
+    }
+}
diff --git a/tests/ui/parser/intersection-patterns-1.rs b/tests/ui/parser/intersection-patterns-1.rs
new file mode 100644
index 000000000..1036b9daf
--- /dev/null
+++ b/tests/ui/parser/intersection-patterns-1.rs
@@ -0,0 +1,35 @@
+// This tests the parser recovery in `recover_intersection_pat`
+// and serves as a regression test for the diagnostics issue #65400.
+//
+// The general idea is that for `$pat_lhs @ $pat_rhs` where
+// `$pat_lhs` is not generated by `ref? mut? $ident` we want
+// to suggest either switching the order or note that intersection
+// patterns are not allowed.
+
+// run-rustfix
+
+#![allow(unused_variables)]
+
+fn main() {
+    let s: Option<u8> = None;
+
+    match s {
+        Some(x) @ y => {}
+        //~^ ERROR pattern on wrong side of `@`
+        //~| pattern on the left, should be on the right
+        //~| binding on the right, should be on the left
+        //~| HELP switch the order
+        //~| SUGGESTION y @ Some(x)
+        _ => {}
+    }
+
+    match 2 {
+        1 ..= 5 @ e => {}
+        //~^ ERROR pattern on wrong side of `@`
+        //~| pattern on the left, should be on the right
+        //~| binding on the right, should be on the left
+        //~| HELP switch the order
+        //~| SUGGESTION e @ 1..=5
+        _ => {}
+    }
+}
diff --git a/tests/ui/parser/intersection-patterns-1.stderr b/tests/ui/parser/intersection-patterns-1.stderr
new file mode 100644
index 000000000..dc968656c
--- /dev/null
+++ b/tests/ui/parser/intersection-patterns-1.stderr
@@ -0,0 +1,22 @@
+error: pattern on wrong side of `@`
+  --> $DIR/intersection-patterns-1.rs:17:9
+   |
+LL |         Some(x) @ y => {}
+   |         -------^^^-
+   |         |         |
+   |         |         binding on the right, should be on the left
+   |         pattern on the left, should be on the right
+   |         help: switch the order: `y @ Some(x)`
+
+error: pattern on wrong side of `@`
+  --> $DIR/intersection-patterns-1.rs:27:9
+   |
+LL |         1 ..= 5 @ e => {}
+   |         -------^^^-
+   |         |         |
+   |         |         binding on the right, should be on the left
+   |         pattern on the left, should be on the right
+   |         help: switch the order: `e @ 1..=5`
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/parser/intersection-patterns-2.rs b/tests/ui/parser/intersection-patterns-2.rs
new file mode 100644
index 000000000..408415e87
--- /dev/null
+++ b/tests/ui/parser/intersection-patterns-2.rs
@@ -0,0 +1,20 @@
+// This tests the parser recovery in `recover_intersection_pat`
+// and serves as a regression test for the diagnostics issue #65400.
+//
+// The general idea is that for `$pat_lhs @ $pat_rhs` where
+// `$pat_lhs` is not generated by `ref? mut? $ident` we want
+// to suggest either switching the order or note that intersection
+// patterns are not allowed.
+
+fn main() {
+    let s: Option<u8> = None;
+
+    match s {
+        Some(x) @ Some(y) => {}
+        //~^ ERROR left-hand side of `@` must be a binding
+        //~| interpreted as a pattern, not a binding
+        //~| also a pattern
+        //~| NOTE bindings are `x`, `mut x`, `ref x`, and `ref mut x`
+        _ => {}
+    }
+}
diff --git a/tests/ui/parser/intersection-patterns-2.stderr b/tests/ui/parser/intersection-patterns-2.stderr
new file mode 100644
index 000000000..f7e78814c
--- /dev/null
+++ b/tests/ui/parser/intersection-patterns-2.stderr
@@ -0,0 +1,13 @@
+error: left-hand side of `@` must be a binding
+  --> $DIR/intersection-patterns-2.rs:13:9
+   |
+LL |         Some(x) @ Some(y) => {}
+   |         -------^^^-------
+   |         |         |
+   |         |         also a pattern
+   |         interpreted as a pattern, not a binding
+   |
+   = note: bindings are `x`, `mut x`, `ref x`, and `ref mut x`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/inverted-parameters.rs b/tests/ui/parser/inverted-parameters.rs
index 5c4272504..5c4272504 100644
--- a/src/test/ui/parser/inverted-parameters.rs
+++ b/tests/ui/parser/inverted-parameters.rs
diff --git a/src/test/ui/parser/inverted-parameters.stderr b/tests/ui/parser/inverted-parameters.stderr
index 866227782..866227782 100644
--- a/src/test/ui/parser/inverted-parameters.stderr
+++ b/tests/ui/parser/inverted-parameters.stderr
diff --git a/src/test/ui/parser/issue-100197-mut-let.fixed b/tests/ui/parser/issue-100197-mut-let.fixed
index 5a8956222..5a8956222 100644
--- a/src/test/ui/parser/issue-100197-mut-let.fixed
+++ b/tests/ui/parser/issue-100197-mut-let.fixed
diff --git a/src/test/ui/parser/issue-100197-mut-let.rs b/tests/ui/parser/issue-100197-mut-let.rs
index 71103813a..71103813a 100644
--- a/src/test/ui/parser/issue-100197-mut-let.rs
+++ b/tests/ui/parser/issue-100197-mut-let.rs
diff --git a/src/test/ui/parser/issue-100197-mut-let.stderr b/tests/ui/parser/issue-100197-mut-let.stderr
index 86658e4f3..86658e4f3 100644
--- a/src/test/ui/parser/issue-100197-mut-let.stderr
+++ b/tests/ui/parser/issue-100197-mut-let.stderr
diff --git a/src/test/ui/parser/issue-101477-enum.fixed b/tests/ui/parser/issue-101477-enum.fixed
index 1dfeae22a..1dfeae22a 100644
--- a/src/test/ui/parser/issue-101477-enum.fixed
+++ b/tests/ui/parser/issue-101477-enum.fixed
diff --git a/src/test/ui/parser/issue-101477-enum.rs b/tests/ui/parser/issue-101477-enum.rs
index ea7051d69..ea7051d69 100644
--- a/src/test/ui/parser/issue-101477-enum.rs
+++ b/tests/ui/parser/issue-101477-enum.rs
diff --git a/src/test/ui/parser/issue-101477-enum.stderr b/tests/ui/parser/issue-101477-enum.stderr
index 1edca391e..1edca391e 100644
--- a/src/test/ui/parser/issue-101477-enum.stderr
+++ b/tests/ui/parser/issue-101477-enum.stderr
diff --git a/src/test/ui/parser/issue-101477-let.fixed b/tests/ui/parser/issue-101477-let.fixed
index 9989ad815..9989ad815 100644
--- a/src/test/ui/parser/issue-101477-let.fixed
+++ b/tests/ui/parser/issue-101477-let.fixed
diff --git a/src/test/ui/parser/issue-101477-let.rs b/tests/ui/parser/issue-101477-let.rs
index 8b0e8bee1..8b0e8bee1 100644
--- a/src/test/ui/parser/issue-101477-let.rs
+++ b/tests/ui/parser/issue-101477-let.rs
diff --git a/src/test/ui/parser/issue-101477-let.stderr b/tests/ui/parser/issue-101477-let.stderr
index 1b30d4b17..1b30d4b17 100644
--- a/src/test/ui/parser/issue-101477-let.stderr
+++ b/tests/ui/parser/issue-101477-let.stderr
diff --git a/src/test/ui/parser/issue-102806.rs b/tests/ui/parser/issue-102806.rs
index ba297bdc9..ba297bdc9 100644
--- a/src/test/ui/parser/issue-102806.rs
+++ b/tests/ui/parser/issue-102806.rs
diff --git a/src/test/ui/parser/issue-102806.stderr b/tests/ui/parser/issue-102806.stderr
index 6872b8bc0..6872b8bc0 100644
--- a/src/test/ui/parser/issue-102806.stderr
+++ b/tests/ui/parser/issue-102806.stderr
diff --git a/src/test/ui/parser/issue-103143.rs b/tests/ui/parser/issue-103143.rs
index a584274c4..a584274c4 100644
--- a/src/test/ui/parser/issue-103143.rs
+++ b/tests/ui/parser/issue-103143.rs
diff --git a/src/test/ui/parser/issue-103143.stderr b/tests/ui/parser/issue-103143.stderr
index 4035c69af..4035c69af 100644
--- a/src/test/ui/parser/issue-103143.stderr
+++ b/tests/ui/parser/issue-103143.stderr
diff --git a/src/test/ui/parser/issue-103381.fixed b/tests/ui/parser/issue-103381.fixed
index 6a9fb9910..6a9fb9910 100644
--- a/src/test/ui/parser/issue-103381.fixed
+++ b/tests/ui/parser/issue-103381.fixed
diff --git a/src/test/ui/parser/issue-103381.rs b/tests/ui/parser/issue-103381.rs
index bf79e1010..bf79e1010 100644
--- a/src/test/ui/parser/issue-103381.rs
+++ b/tests/ui/parser/issue-103381.rs
diff --git a/src/test/ui/parser/issue-103381.stderr b/tests/ui/parser/issue-103381.stderr
index 85fcc18e7..85fcc18e7 100644
--- a/src/test/ui/parser/issue-103381.stderr
+++ b/tests/ui/parser/issue-103381.stderr
diff --git a/src/test/ui/parser/issue-103425.rs b/tests/ui/parser/issue-103425.rs
index c2f8123ca..c2f8123ca 100644
--- a/src/test/ui/parser/issue-103425.rs
+++ b/tests/ui/parser/issue-103425.rs
diff --git a/src/test/ui/parser/issue-103425.stderr b/tests/ui/parser/issue-103425.stderr
index 0efe3e3ca..0efe3e3ca 100644
--- a/src/test/ui/parser/issue-103425.stderr
+++ b/tests/ui/parser/issue-103425.stderr
diff --git a/src/test/ui/parser/issue-103451.rs b/tests/ui/parser/issue-103451.rs
index 1fdb00148..1fdb00148 100644
--- a/src/test/ui/parser/issue-103451.rs
+++ b/tests/ui/parser/issue-103451.rs
diff --git a/src/test/ui/parser/issue-103451.stderr b/tests/ui/parser/issue-103451.stderr
index eb3c92fb4..eb3c92fb4 100644
--- a/src/test/ui/parser/issue-103451.stderr
+++ b/tests/ui/parser/issue-103451.stderr
diff --git a/src/test/ui/parser/issue-103748-ICE-wrong-braces.rs b/tests/ui/parser/issue-103748-ICE-wrong-braces.rs
index 8012cb652..8012cb652 100644
--- a/src/test/ui/parser/issue-103748-ICE-wrong-braces.rs
+++ b/tests/ui/parser/issue-103748-ICE-wrong-braces.rs
diff --git a/src/test/ui/parser/issue-103748-ICE-wrong-braces.stderr b/tests/ui/parser/issue-103748-ICE-wrong-braces.stderr
index b0d8b03ae..b0d8b03ae 100644
--- a/src/test/ui/parser/issue-103748-ICE-wrong-braces.stderr
+++ b/tests/ui/parser/issue-103748-ICE-wrong-braces.stderr
diff --git a/src/test/ui/parser/issue-103869.rs b/tests/ui/parser/issue-103869.rs
index 28c442bdd..28c442bdd 100644
--- a/src/test/ui/parser/issue-103869.rs
+++ b/tests/ui/parser/issue-103869.rs
diff --git a/src/test/ui/parser/issue-103869.stderr b/tests/ui/parser/issue-103869.stderr
index 0b8cd919a..0b8cd919a 100644
--- a/src/test/ui/parser/issue-103869.stderr
+++ b/tests/ui/parser/issue-103869.stderr
diff --git a/src/test/ui/parser/issue-104620.rs b/tests/ui/parser/issue-104620.rs
index f49476c44..f49476c44 100644
--- a/src/test/ui/parser/issue-104620.rs
+++ b/tests/ui/parser/issue-104620.rs
diff --git a/src/test/ui/parser/issue-104620.stderr b/tests/ui/parser/issue-104620.stderr
index d06a6b255..d06a6b255 100644
--- a/src/test/ui/parser/issue-104620.stderr
+++ b/tests/ui/parser/issue-104620.stderr
diff --git a/tests/ui/parser/issue-104867-inc-dec-2.rs b/tests/ui/parser/issue-104867-inc-dec-2.rs
new file mode 100644
index 000000000..a006421a9
--- /dev/null
+++ b/tests/ui/parser/issue-104867-inc-dec-2.rs
@@ -0,0 +1,52 @@
+fn test1() {
+    let mut i = 0;
+    let _ = i + ++i; //~ ERROR Rust has no prefix increment operator
+}
+
+fn test2() {
+    let mut i = 0;
+    let _ = ++i + i; //~ ERROR Rust has no prefix increment operator
+}
+
+fn test3() {
+    let mut i = 0;
+    let _ = ++i + ++i; //~ ERROR Rust has no prefix increment operator
+}
+
+fn test4() {
+    let mut i = 0;
+    let _ = i + i++; //~ ERROR Rust has no postfix increment operator
+    // won't suggest since we can not handle the precedences
+}
+
+fn test5() {
+    let mut i = 0;
+    let _ = i++ + i; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test6() {
+    let mut i = 0;
+    let _ = i++ + i++; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test7() {
+    let mut i = 0;
+    let _ = ++i + i++; //~ ERROR Rust has no prefix increment operator
+}
+
+fn test8() {
+    let mut i = 0;
+    let _ = i++ + ++i; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test9() {
+    let mut i = 0;
+    let _ = (1 + 2 + i)++; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test10() {
+    let mut i = 0;
+    let _ = (i++ + 1) + 2; //~ ERROR Rust has no postfix increment operator
+}
+
+fn main() { }
diff --git a/tests/ui/parser/issue-104867-inc-dec-2.stderr b/tests/ui/parser/issue-104867-inc-dec-2.stderr
new file mode 100644
index 000000000..4e2d05468
--- /dev/null
+++ b/tests/ui/parser/issue-104867-inc-dec-2.stderr
@@ -0,0 +1,107 @@
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:3:17
+   |
+LL |     let _ = i + ++i;
+   |                 ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = i + { i += 1; i };
+   |                 ~   +++++++++
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:8:13
+   |
+LL |     let _ = ++i + i;
+   |             ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { i += 1; i } + i;
+   |             ~   +++++++++
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:13:13
+   |
+LL |     let _ = ++i + ++i;
+   |             ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { i += 1; i } + ++i;
+   |             ~   +++++++++
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:18:18
+   |
+LL |     let _ = i + i++;
+   |                  ^^ not a valid postfix operator
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:24:14
+   |
+LL |     let _ = i++ + i;
+   |              ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { let tmp = i; i += 1; tmp } + i;
+   |             +++++++++++  ~~~~~~~~~~~~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:29:14
+   |
+LL |     let _ = i++ + i++;
+   |              ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { let tmp = i; i += 1; tmp } + i++;
+   |             +++++++++++  ~~~~~~~~~~~~~~~
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:34:13
+   |
+LL |     let _ = ++i + i++;
+   |             ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { i += 1; i } + i++;
+   |             ~   +++++++++
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:39:14
+   |
+LL |     let _ = i++ + ++i;
+   |              ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { let tmp = i; i += 1; tmp } + ++i;
+   |             +++++++++++  ~~~~~~~~~~~~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:44:24
+   |
+LL |     let _ = (1 + 2 + i)++;
+   |                        ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = { let tmp = (1 + 2 + i); (1 + 2 + i) += 1; tmp };
+   |             +++++++++++            ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec-2.rs:49:15
+   |
+LL |     let _ = (i++ + 1) + 2;
+   |               ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     let _ = ({ let tmp = i; i += 1; tmp } + 1) + 2;
+   |              +++++++++++  ~~~~~~~~~~~~~~~
+
+error: aborting due to 10 previous errors
+
diff --git a/tests/ui/parser/issue-104867-inc-dec.rs b/tests/ui/parser/issue-104867-inc-dec.rs
new file mode 100644
index 000000000..760c67b4b
--- /dev/null
+++ b/tests/ui/parser/issue-104867-inc-dec.rs
@@ -0,0 +1,45 @@
+struct S {
+    x: i32,
+}
+
+fn test1() {
+    let mut i = 0;
+    i++; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test2() {
+    let s = S { x: 0 };
+    s.x++; //~ ERROR Rust has no postfix increment operator
+}
+
+fn test3() {
+    let mut i = 0;
+    if i++ == 1 {} //~ ERROR Rust has no postfix increment operator
+}
+
+fn test4() {
+    let mut i = 0;
+    ++i; //~ ERROR Rust has no prefix increment operator
+}
+
+fn test5() {
+    let mut i = 0;
+    if ++i == 1 { } //~ ERROR Rust has no prefix increment operator
+}
+
+fn test6() {
+    let mut i = 0;
+    loop { break; }
+    i++; //~ ERROR Rust has no postfix increment operator
+    loop { break; }
+    ++i;
+}
+
+fn test7() {
+    let mut i = 0;
+    loop { break; }
+    ++i; //~ ERROR Rust has no prefix increment operator
+}
+
+
+fn main() {}
diff --git a/tests/ui/parser/issue-104867-inc-dec.stderr b/tests/ui/parser/issue-104867-inc-dec.stderr
new file mode 100644
index 000000000..78bfd3e82
--- /dev/null
+++ b/tests/ui/parser/issue-104867-inc-dec.stderr
@@ -0,0 +1,81 @@
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:7:6
+   |
+LL |     i++;
+   |      ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     i += 1;
+   |       ~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:12:8
+   |
+LL |     s.x++;
+   |        ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     s.x += 1;
+   |         ~~~~
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:17:9
+   |
+LL |     if i++ == 1 {}
+   |         ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     if { let tmp = i; i += 1; tmp } == 1 {}
+   |        +++++++++++  ~~~~~~~~~~~~~~~
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:22:5
+   |
+LL |     ++i;
+   |     ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL -     ++i;
+LL +     i += 1;
+   |
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:27:8
+   |
+LL |     if ++i == 1 { }
+   |        ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     if { i += 1; i } == 1 { }
+   |        ~   +++++++++
+
+error: Rust has no postfix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:33:6
+   |
+LL |     i++;
+   |      ^^ not a valid postfix operator
+   |
+help: use `+= 1` instead
+   |
+LL |     i += 1;
+   |       ~~~~
+
+error: Rust has no prefix increment operator
+  --> $DIR/issue-104867-inc-dec.rs:41:5
+   |
+LL |     ++i;
+   |     ^^ not a valid prefix operator
+   |
+help: use `+= 1` instead
+   |
+LL -     ++i;
+LL +     i += 1;
+   |
+
+error: aborting due to 7 previous errors
+
diff --git a/tests/ui/parser/issue-105366.fixed b/tests/ui/parser/issue-105366.fixed
new file mode 100644
index 000000000..ad26643c3
--- /dev/null
+++ b/tests/ui/parser/issue-105366.fixed
@@ -0,0 +1,12 @@
+// run-rustfix
+
+struct Foo;
+
+impl From<i32> for Foo {
+    //~^ ERROR you might have meant to write `impl` instead of `fn`
+    fn from(_a: i32) -> Self {
+        Foo
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/parser/issue-105366.rs b/tests/ui/parser/issue-105366.rs
new file mode 100644
index 000000000..311b6a60f
--- /dev/null
+++ b/tests/ui/parser/issue-105366.rs
@@ -0,0 +1,12 @@
+// run-rustfix
+
+struct Foo;
+
+fn From<i32> for Foo {
+    //~^ ERROR you might have meant to write `impl` instead of `fn`
+    fn from(_a: i32) -> Self {
+        Foo
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/parser/issue-105366.stderr b/tests/ui/parser/issue-105366.stderr
new file mode 100644
index 000000000..0a7408e2c
--- /dev/null
+++ b/tests/ui/parser/issue-105366.stderr
@@ -0,0 +1,13 @@
+error: you might have meant to write `impl` instead of `fn`
+  --> $DIR/issue-105366.rs:5:1
+   |
+LL | fn From<i32> for Foo {
+   | ^^
+   |
+help: replace `fn` with `impl` here
+   |
+LL | impl From<i32> for Foo {
+   | ~~~~
+
+error: aborting due to previous error
+
diff --git a/tests/ui/parser/issue-105634.rs b/tests/ui/parser/issue-105634.rs
new file mode 100644
index 000000000..579aa6e5b
--- /dev/null
+++ b/tests/ui/parser/issue-105634.rs
@@ -0,0 +1,8 @@
+// check-pass
+
+fn main() {
+    let _a = ..;
+    let _b = ..=10;
+    let _c = &..;
+    let _d = &..=10;
+}
diff --git a/src/test/ui/parser/issue-17718-parse-const.rs b/tests/ui/parser/issue-17718-parse-const.rs
index d5a5f445d..d5a5f445d 100644
--- a/src/test/ui/parser/issue-17718-parse-const.rs
+++ b/tests/ui/parser/issue-17718-parse-const.rs
diff --git a/src/test/ui/issues/issue-39616.rs b/tests/ui/parser/issue-39616.rs
index 46b5aa334..46b5aa334 100644
--- a/src/test/ui/issues/issue-39616.rs
+++ b/tests/ui/parser/issue-39616.rs
diff --git a/src/test/ui/issues/issue-39616.stderr b/tests/ui/parser/issue-39616.stderr
index 393d1f2e2..393d1f2e2 100644
--- a/src/test/ui/issues/issue-39616.stderr
+++ b/tests/ui/parser/issue-39616.stderr
diff --git a/src/test/ui/issues/issue-49257.rs b/tests/ui/parser/issue-49257.rs
index a7fa19d52..a7fa19d52 100644
--- a/src/test/ui/issues/issue-49257.rs
+++ b/tests/ui/parser/issue-49257.rs
diff --git a/src/test/ui/issues/issue-49257.stderr b/tests/ui/parser/issue-49257.stderr
index 846467f7f..846467f7f 100644
--- a/src/test/ui/issues/issue-49257.stderr
+++ b/tests/ui/parser/issue-49257.stderr
diff --git a/src/test/ui/parser/issue-61858.rs b/tests/ui/parser/issue-61858.rs
index 6c3b56586..6c3b56586 100644
--- a/src/test/ui/parser/issue-61858.rs
+++ b/tests/ui/parser/issue-61858.rs
diff --git a/src/test/ui/parser/issue-61858.stderr b/tests/ui/parser/issue-61858.stderr
index 03f51c6e3..03f51c6e3 100644
--- a/src/test/ui/parser/issue-61858.stderr
+++ b/tests/ui/parser/issue-61858.stderr
diff --git a/src/test/ui/parser/issue-68091-unicode-ident-after-if.rs b/tests/ui/parser/issue-68091-unicode-ident-after-if.rs
index 57d36feb3..57d36feb3 100644
--- a/src/test/ui/parser/issue-68091-unicode-ident-after-if.rs
+++ b/tests/ui/parser/issue-68091-unicode-ident-after-if.rs
diff --git a/src/test/ui/parser/issue-68091-unicode-ident-after-if.stderr b/tests/ui/parser/issue-68091-unicode-ident-after-if.stderr
index 6674b924e..6674b924e 100644
--- a/src/test/ui/parser/issue-68091-unicode-ident-after-if.stderr
+++ b/tests/ui/parser/issue-68091-unicode-ident-after-if.stderr
diff --git a/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs b/tests/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs
index 1a90b4724..1a90b4724 100644
--- a/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs
+++ b/tests/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.rs
diff --git a/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr b/tests/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr
index 0b9c364f1..0b9c364f1 100644
--- a/src/test/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr
+++ b/tests/ui/parser/issue-68092-unicode-ident-after-incomplete-expr.stderr
diff --git a/src/test/ui/parser/issue-81804.rs b/tests/ui/parser/issue-81804.rs
index 803bde11e..803bde11e 100644
--- a/src/test/ui/parser/issue-81804.rs
+++ b/tests/ui/parser/issue-81804.rs
diff --git a/src/test/ui/parser/issue-81804.stderr b/tests/ui/parser/issue-81804.stderr
index 19c4422c6..19c4422c6 100644
--- a/src/test/ui/parser/issue-81804.stderr
+++ b/tests/ui/parser/issue-81804.stderr
diff --git a/src/test/ui/parser/issue-81827.rs b/tests/ui/parser/issue-81827.rs
index 7ec581594..7ec581594 100644
--- a/src/test/ui/parser/issue-81827.rs
+++ b/tests/ui/parser/issue-81827.rs
diff --git a/src/test/ui/parser/issue-81827.stderr b/tests/ui/parser/issue-81827.stderr
index 069de3391..069de3391 100644
--- a/src/test/ui/parser/issue-81827.stderr
+++ b/tests/ui/parser/issue-81827.stderr
diff --git a/src/test/ui/parser/issue-87694-duplicated-pub.rs b/tests/ui/parser/issue-87694-duplicated-pub.rs
index e3ea61dc4..e3ea61dc4 100644
--- a/src/test/ui/parser/issue-87694-duplicated-pub.rs
+++ b/tests/ui/parser/issue-87694-duplicated-pub.rs
diff --git a/src/test/ui/parser/issue-87694-duplicated-pub.stderr b/tests/ui/parser/issue-87694-duplicated-pub.stderr
index 8d242bc9d..8d242bc9d 100644
--- a/src/test/ui/parser/issue-87694-duplicated-pub.stderr
+++ b/tests/ui/parser/issue-87694-duplicated-pub.stderr
diff --git a/src/test/ui/parser/issue-87694-misplaced-pub.rs b/tests/ui/parser/issue-87694-misplaced-pub.rs
index 3f824617c..3f824617c 100644
--- a/src/test/ui/parser/issue-87694-misplaced-pub.rs
+++ b/tests/ui/parser/issue-87694-misplaced-pub.rs
diff --git a/src/test/ui/parser/issue-87694-misplaced-pub.stderr b/tests/ui/parser/issue-87694-misplaced-pub.stderr
index 94c6a29ef..94c6a29ef 100644
--- a/src/test/ui/parser/issue-87694-misplaced-pub.stderr
+++ b/tests/ui/parser/issue-87694-misplaced-pub.stderr
diff --git a/src/test/ui/parser/issue-90728.rs b/tests/ui/parser/issue-90728.rs
index d6a898361..d6a898361 100644
--- a/src/test/ui/parser/issue-90728.rs
+++ b/tests/ui/parser/issue-90728.rs
diff --git a/src/test/ui/parser/issue-90728.stderr b/tests/ui/parser/issue-90728.stderr
index b55c46030..b55c46030 100644
--- a/src/test/ui/parser/issue-90728.stderr
+++ b/tests/ui/parser/issue-90728.stderr
diff --git a/src/test/ui/parser/issue-91421.rs b/tests/ui/parser/issue-91421.rs
index 8bba27f37..8bba27f37 100644
--- a/src/test/ui/parser/issue-91421.rs
+++ b/tests/ui/parser/issue-91421.rs
diff --git a/src/test/ui/parser/issue-91421.stderr b/tests/ui/parser/issue-91421.stderr
index 2d9652051..2d9652051 100644
--- a/src/test/ui/parser/issue-91421.stderr
+++ b/tests/ui/parser/issue-91421.stderr
diff --git a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.fixed b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.fixed
index 4b4a416b1..4b4a416b1 100644
--- a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.fixed
+++ b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.fixed
diff --git a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.rs b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.rs
index 9cc886641..9cc886641 100644
--- a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.rs
+++ b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.rs
diff --git a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.stderr b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.stderr
index edc640bf5..edc640bf5 100644
--- a/src/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.stderr
+++ b/tests/ui/parser/issue-99625-enum-struct-mutually-exclusive.stderr
diff --git a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.fixed b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.fixed
index 64ab6f62b..64ab6f62b 100644
--- a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.fixed
+++ b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.fixed
diff --git a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.rs b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.rs
index 50520971f..50520971f 100644
--- a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.rs
+++ b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.rs
diff --git a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.stderr b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.stderr
index 72377fc37..72377fc37 100644
--- a/src/test/ui/parser/issue-99910-const-let-mutually-exclusive.stderr
+++ b/tests/ui/parser/issue-99910-const-let-mutually-exclusive.stderr
diff --git a/src/test/ui/parser/issues/auxiliary/issue-21146-inc.rs b/tests/ui/parser/issues/auxiliary/issue-21146-inc.rs
index 32a3b9dcc..32a3b9dcc 100644
--- a/src/test/ui/parser/issues/auxiliary/issue-21146-inc.rs
+++ b/tests/ui/parser/issues/auxiliary/issue-21146-inc.rs
diff --git a/src/test/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs b/tests/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
index e5604b816..e5604b816 100644
--- a/src/test/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
+++ b/tests/ui/parser/issues/auxiliary/issue-89971-outer-attr-following-inner-attr-ice.rs
diff --git a/src/test/ui/parser/issues/auxiliary/issue-94340-inc.rs b/tests/ui/parser/issues/auxiliary/issue-94340-inc.rs
index 9429e5143..9429e5143 100644
--- a/src/test/ui/parser/issues/auxiliary/issue-94340-inc.rs
+++ b/tests/ui/parser/issues/auxiliary/issue-94340-inc.rs
diff --git a/src/test/ui/parser/issues/issue-101540.rs b/tests/ui/parser/issues/issue-101540.rs
index 328ec6f90..328ec6f90 100644
--- a/src/test/ui/parser/issues/issue-101540.rs
+++ b/tests/ui/parser/issues/issue-101540.rs
diff --git a/src/test/ui/parser/issues/issue-101540.stderr b/tests/ui/parser/issues/issue-101540.stderr
index 8af887050..8af887050 100644
--- a/src/test/ui/parser/issues/issue-101540.stderr
+++ b/tests/ui/parser/issues/issue-101540.stderr
diff --git a/src/test/ui/parser/issues/issue-102182-impl-trait-recover.rs b/tests/ui/parser/issues/issue-102182-impl-trait-recover.rs
index 4bfc676d6..4bfc676d6 100644
--- a/src/test/ui/parser/issues/issue-102182-impl-trait-recover.rs
+++ b/tests/ui/parser/issues/issue-102182-impl-trait-recover.rs
diff --git a/src/test/ui/parser/issues/issue-102182-impl-trait-recover.stderr b/tests/ui/parser/issues/issue-102182-impl-trait-recover.stderr
index 52b6ae5df..52b6ae5df 100644
--- a/src/test/ui/parser/issues/issue-102182-impl-trait-recover.stderr
+++ b/tests/ui/parser/issues/issue-102182-impl-trait-recover.stderr
diff --git a/src/test/ui/parser/issues/issue-10392-2.fixed b/tests/ui/parser/issues/issue-10392-2.fixed
index 3386fac17..3386fac17 100644
--- a/src/test/ui/parser/issues/issue-10392-2.fixed
+++ b/tests/ui/parser/issues/issue-10392-2.fixed
diff --git a/src/test/ui/parser/issues/issue-10392-2.rs b/tests/ui/parser/issues/issue-10392-2.rs
index 30628ae31..30628ae31 100644
--- a/src/test/ui/parser/issues/issue-10392-2.rs
+++ b/tests/ui/parser/issues/issue-10392-2.rs
diff --git a/src/test/ui/parser/issues/issue-10392-2.stderr b/tests/ui/parser/issues/issue-10392-2.stderr
index 4154ecfeb..4154ecfeb 100644
--- a/src/test/ui/parser/issues/issue-10392-2.stderr
+++ b/tests/ui/parser/issues/issue-10392-2.stderr
diff --git a/src/test/ui/parser/issues/issue-10392.rs b/tests/ui/parser/issues/issue-10392.rs
index 5b0c2fc2b..5b0c2fc2b 100644
--- a/src/test/ui/parser/issues/issue-10392.rs
+++ b/tests/ui/parser/issues/issue-10392.rs
diff --git a/src/test/ui/parser/issues/issue-10392.stderr b/tests/ui/parser/issues/issue-10392.stderr
index 438ea67d3..438ea67d3 100644
--- a/src/test/ui/parser/issues/issue-10392.stderr
+++ b/tests/ui/parser/issues/issue-10392.stderr
diff --git a/src/test/ui/parser/issues/issue-104088.rs b/tests/ui/parser/issues/issue-104088.rs
index 5f794fe2d..5f794fe2d 100644
--- a/src/test/ui/parser/issues/issue-104088.rs
+++ b/tests/ui/parser/issues/issue-104088.rs
diff --git a/src/test/ui/parser/issues/issue-104088.stderr b/tests/ui/parser/issues/issue-104088.stderr
index ff4b4bdb6..ff4b4bdb6 100644
--- a/src/test/ui/parser/issues/issue-104088.stderr
+++ b/tests/ui/parser/issues/issue-104088.stderr
diff --git a/src/test/ui/parser/issues/issue-10636-1.rs b/tests/ui/parser/issues/issue-10636-1.rs
index 77c6072d6..77c6072d6 100644
--- a/src/test/ui/parser/issues/issue-10636-1.rs
+++ b/tests/ui/parser/issues/issue-10636-1.rs
diff --git a/src/test/ui/parser/issues/issue-10636-1.stderr b/tests/ui/parser/issues/issue-10636-1.stderr
index 1e6294ebe..1e6294ebe 100644
--- a/src/test/ui/parser/issues/issue-10636-1.stderr
+++ b/tests/ui/parser/issues/issue-10636-1.stderr
diff --git a/src/test/ui/parser/issues/issue-10636-2.rs b/tests/ui/parser/issues/issue-10636-2.rs
index 6fb63639d..6fb63639d 100644
--- a/src/test/ui/parser/issues/issue-10636-2.rs
+++ b/tests/ui/parser/issues/issue-10636-2.rs
diff --git a/src/test/ui/parser/issues/issue-10636-2.stderr b/tests/ui/parser/issues/issue-10636-2.stderr
index d4f2da9e3..d4f2da9e3 100644
--- a/src/test/ui/parser/issues/issue-10636-2.stderr
+++ b/tests/ui/parser/issues/issue-10636-2.stderr
diff --git a/src/test/ui/parser/issues/issue-13483.rs b/tests/ui/parser/issues/issue-13483.rs
index 4e32fcab3..4e32fcab3 100644
--- a/src/test/ui/parser/issues/issue-13483.rs
+++ b/tests/ui/parser/issues/issue-13483.rs
diff --git a/src/test/ui/parser/issues/issue-13483.stderr b/tests/ui/parser/issues/issue-13483.stderr
index f5534090f..f5534090f 100644
--- a/src/test/ui/parser/issues/issue-13483.stderr
+++ b/tests/ui/parser/issues/issue-13483.stderr
diff --git a/src/test/ui/parser/issues/issue-14303-fncall.full.stderr b/tests/ui/parser/issues/issue-14303-fncall.full.stderr
index 0c152516a..0c152516a 100644
--- a/src/test/ui/parser/issues/issue-14303-fncall.full.stderr
+++ b/tests/ui/parser/issues/issue-14303-fncall.full.stderr
diff --git a/src/test/ui/parser/issues/issue-14303-fncall.generic_arg.stderr b/tests/ui/parser/issues/issue-14303-fncall.generic_arg.stderr
index 571815776..571815776 100644
--- a/src/test/ui/parser/issues/issue-14303-fncall.generic_arg.stderr
+++ b/tests/ui/parser/issues/issue-14303-fncall.generic_arg.stderr
diff --git a/src/test/ui/parser/issues/issue-14303-fncall.rs b/tests/ui/parser/issues/issue-14303-fncall.rs
index afc4959f1..afc4959f1 100644
--- a/src/test/ui/parser/issues/issue-14303-fncall.rs
+++ b/tests/ui/parser/issues/issue-14303-fncall.rs
diff --git a/src/test/ui/parser/issues/issue-14303.rs b/tests/ui/parser/issues/issue-14303.rs
index 82850d77a..82850d77a 100644
--- a/src/test/ui/parser/issues/issue-14303.rs
+++ b/tests/ui/parser/issues/issue-14303.rs
diff --git a/src/test/ui/parser/issues/issue-14303.stderr b/tests/ui/parser/issues/issue-14303.stderr
index f121107c0..f121107c0 100644
--- a/src/test/ui/parser/issues/issue-14303.stderr
+++ b/tests/ui/parser/issues/issue-14303.stderr
diff --git a/src/test/ui/parser/issues/issue-15914.rs b/tests/ui/parser/issues/issue-15914.rs
index 4a5606af6..4a5606af6 100644
--- a/src/test/ui/parser/issues/issue-15914.rs
+++ b/tests/ui/parser/issues/issue-15914.rs
diff --git a/src/test/ui/parser/issues/issue-15914.stderr b/tests/ui/parser/issues/issue-15914.stderr
index ea26453f8..ea26453f8 100644
--- a/src/test/ui/parser/issues/issue-15914.stderr
+++ b/tests/ui/parser/issues/issue-15914.stderr
diff --git a/src/test/ui/parser/issues/issue-15980.rs b/tests/ui/parser/issues/issue-15980.rs
index 87faa7d5f..87faa7d5f 100644
--- a/src/test/ui/parser/issues/issue-15980.rs
+++ b/tests/ui/parser/issues/issue-15980.rs
diff --git a/src/test/ui/parser/issues/issue-15980.stderr b/tests/ui/parser/issues/issue-15980.stderr
index c59c81119..c59c81119 100644
--- a/src/test/ui/parser/issues/issue-15980.stderr
+++ b/tests/ui/parser/issues/issue-15980.stderr
diff --git a/src/test/ui/parser/issues/issue-1655.rs b/tests/ui/parser/issues/issue-1655.rs
index e9fc6f153..e9fc6f153 100644
--- a/src/test/ui/parser/issues/issue-1655.rs
+++ b/tests/ui/parser/issues/issue-1655.rs
diff --git a/src/test/ui/parser/issues/issue-1655.stderr b/tests/ui/parser/issues/issue-1655.stderr
index 0c390a0ec..0c390a0ec 100644
--- a/src/test/ui/parser/issues/issue-1655.stderr
+++ b/tests/ui/parser/issues/issue-1655.stderr
diff --git a/src/test/ui/parser/issues/issue-17718-const-mut.rs b/tests/ui/parser/issues/issue-17718-const-mut.rs
index 795a8c763..795a8c763 100644
--- a/src/test/ui/parser/issues/issue-17718-const-mut.rs
+++ b/tests/ui/parser/issues/issue-17718-const-mut.rs
diff --git a/src/test/ui/parser/issues/issue-17718-const-mut.stderr b/tests/ui/parser/issues/issue-17718-const-mut.stderr
index 8251ce999..8251ce999 100644
--- a/src/test/ui/parser/issues/issue-17718-const-mut.stderr
+++ b/tests/ui/parser/issues/issue-17718-const-mut.stderr
diff --git a/src/test/ui/parser/issues/issue-17904-2.rs b/tests/ui/parser/issues/issue-17904-2.rs
index 186a955c3..186a955c3 100644
--- a/src/test/ui/parser/issues/issue-17904-2.rs
+++ b/tests/ui/parser/issues/issue-17904-2.rs
diff --git a/src/test/ui/parser/issues/issue-17904-2.stderr b/tests/ui/parser/issues/issue-17904-2.stderr
index 9c7fdf6cc..9c7fdf6cc 100644
--- a/src/test/ui/parser/issues/issue-17904-2.stderr
+++ b/tests/ui/parser/issues/issue-17904-2.stderr
diff --git a/tests/ui/parser/issues/issue-17904.rs b/tests/ui/parser/issues/issue-17904.rs
new file mode 100644
index 000000000..020fb41c2
--- /dev/null
+++ b/tests/ui/parser/issues/issue-17904.rs
@@ -0,0 +1,8 @@
+// compile-flags: -Zparse-only
+
+struct Baz<U> where U: Eq(U); //This is parsed as the new Fn* style parenthesis syntax.
+struct Baz<U> where U: Eq(U) -> R; // Notice this parses as well.
+struct Baz<U>(U) where U: Eq; // This rightfully signals no error as well.
+struct Foo<T> where T: Copy, (T); //~ ERROR where clauses are not allowed before tuple struct bodies
+
+fn main() {}
diff --git a/tests/ui/parser/issues/issue-17904.stderr b/tests/ui/parser/issues/issue-17904.stderr
new file mode 100644
index 000000000..aa343975d
--- /dev/null
+++ b/tests/ui/parser/issues/issue-17904.stderr
@@ -0,0 +1,17 @@
+error: where clauses are not allowed before tuple struct bodies
+  --> $DIR/issue-17904.rs:6:15
+   |
+LL | struct Foo<T> where T: Copy, (T);
+   |        ---    ^^^^^^^^^^^^^^ --- the struct body
+   |        |      |
+   |        |      unexpected where clause
+   |        while parsing this tuple struct
+   |
+help: move the body before the where clause
+   |
+LL - struct Foo<T> where T: Copy, (T);
+LL + struct Foo<T>(T) where T: Copy;
+   |
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/issues/issue-1802-1.rs b/tests/ui/parser/issues/issue-1802-1.rs
index 3c34b0d8f..3c34b0d8f 100644
--- a/src/test/ui/parser/issues/issue-1802-1.rs
+++ b/tests/ui/parser/issues/issue-1802-1.rs
diff --git a/src/test/ui/parser/issues/issue-1802-1.stderr b/tests/ui/parser/issues/issue-1802-1.stderr
index 954cc0bee..954cc0bee 100644
--- a/src/test/ui/parser/issues/issue-1802-1.stderr
+++ b/tests/ui/parser/issues/issue-1802-1.stderr
diff --git a/src/test/ui/parser/issues/issue-1802-2.rs b/tests/ui/parser/issues/issue-1802-2.rs
index 3c34b0d8f..3c34b0d8f 100644
--- a/src/test/ui/parser/issues/issue-1802-2.rs
+++ b/tests/ui/parser/issues/issue-1802-2.rs
diff --git a/src/test/ui/parser/issues/issue-1802-2.stderr b/tests/ui/parser/issues/issue-1802-2.stderr
index 49043d07b..49043d07b 100644
--- a/src/test/ui/parser/issues/issue-1802-2.stderr
+++ b/tests/ui/parser/issues/issue-1802-2.stderr
diff --git a/src/test/ui/parser/issues/issue-19096.rs b/tests/ui/parser/issues/issue-19096.rs
index c5bfd10ee..c5bfd10ee 100644
--- a/src/test/ui/parser/issues/issue-19096.rs
+++ b/tests/ui/parser/issues/issue-19096.rs
diff --git a/src/test/ui/parser/issues/issue-19096.stderr b/tests/ui/parser/issues/issue-19096.stderr
index 4df7f878b..4df7f878b 100644
--- a/src/test/ui/parser/issues/issue-19096.stderr
+++ b/tests/ui/parser/issues/issue-19096.stderr
diff --git a/src/test/ui/parser/issues/issue-19398.rs b/tests/ui/parser/issues/issue-19398.rs
index 46eb320a1..46eb320a1 100644
--- a/src/test/ui/parser/issues/issue-19398.rs
+++ b/tests/ui/parser/issues/issue-19398.rs
diff --git a/src/test/ui/parser/issues/issue-19398.stderr b/tests/ui/parser/issues/issue-19398.stderr
index 1da00960a..1da00960a 100644
--- a/src/test/ui/parser/issues/issue-19398.stderr
+++ b/tests/ui/parser/issues/issue-19398.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-1.rs b/tests/ui/parser/issues/issue-20616-1.rs
index 49e9cb310..49e9cb310 100644
--- a/src/test/ui/parser/issues/issue-20616-1.rs
+++ b/tests/ui/parser/issues/issue-20616-1.rs
diff --git a/src/test/ui/parser/issues/issue-20616-1.stderr b/tests/ui/parser/issues/issue-20616-1.stderr
index 816046237..816046237 100644
--- a/src/test/ui/parser/issues/issue-20616-1.stderr
+++ b/tests/ui/parser/issues/issue-20616-1.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-2.rs b/tests/ui/parser/issues/issue-20616-2.rs
index 2f2c6903a..2f2c6903a 100644
--- a/src/test/ui/parser/issues/issue-20616-2.rs
+++ b/tests/ui/parser/issues/issue-20616-2.rs
diff --git a/src/test/ui/parser/issues/issue-20616-2.stderr b/tests/ui/parser/issues/issue-20616-2.stderr
index 42059685c..42059685c 100644
--- a/src/test/ui/parser/issues/issue-20616-2.stderr
+++ b/tests/ui/parser/issues/issue-20616-2.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-3.rs b/tests/ui/parser/issues/issue-20616-3.rs
index b2371051c..b2371051c 100644
--- a/src/test/ui/parser/issues/issue-20616-3.rs
+++ b/tests/ui/parser/issues/issue-20616-3.rs
diff --git a/src/test/ui/parser/issues/issue-20616-3.stderr b/tests/ui/parser/issues/issue-20616-3.stderr
index dbff116e5..dbff116e5 100644
--- a/src/test/ui/parser/issues/issue-20616-3.stderr
+++ b/tests/ui/parser/issues/issue-20616-3.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-4.rs b/tests/ui/parser/issues/issue-20616-4.rs
index a71f47ca4..a71f47ca4 100644
--- a/src/test/ui/parser/issues/issue-20616-4.rs
+++ b/tests/ui/parser/issues/issue-20616-4.rs
diff --git a/src/test/ui/parser/issues/issue-20616-4.stderr b/tests/ui/parser/issues/issue-20616-4.stderr
index 48a06e00b..48a06e00b 100644
--- a/src/test/ui/parser/issues/issue-20616-4.stderr
+++ b/tests/ui/parser/issues/issue-20616-4.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-5.rs b/tests/ui/parser/issues/issue-20616-5.rs
index b96d09d59..b96d09d59 100644
--- a/src/test/ui/parser/issues/issue-20616-5.rs
+++ b/tests/ui/parser/issues/issue-20616-5.rs
diff --git a/src/test/ui/parser/issues/issue-20616-5.stderr b/tests/ui/parser/issues/issue-20616-5.stderr
index 84bee2ad1..84bee2ad1 100644
--- a/src/test/ui/parser/issues/issue-20616-5.stderr
+++ b/tests/ui/parser/issues/issue-20616-5.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-6.rs b/tests/ui/parser/issues/issue-20616-6.rs
index a2c45ecec..a2c45ecec 100644
--- a/src/test/ui/parser/issues/issue-20616-6.rs
+++ b/tests/ui/parser/issues/issue-20616-6.rs
diff --git a/src/test/ui/parser/issues/issue-20616-6.stderr b/tests/ui/parser/issues/issue-20616-6.stderr
index 67de41b97..67de41b97 100644
--- a/src/test/ui/parser/issues/issue-20616-6.stderr
+++ b/tests/ui/parser/issues/issue-20616-6.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-7.rs b/tests/ui/parser/issues/issue-20616-7.rs
index 67209c02a..67209c02a 100644
--- a/src/test/ui/parser/issues/issue-20616-7.rs
+++ b/tests/ui/parser/issues/issue-20616-7.rs
diff --git a/src/test/ui/parser/issues/issue-20616-7.stderr b/tests/ui/parser/issues/issue-20616-7.stderr
index 3b8e07fa0..3b8e07fa0 100644
--- a/src/test/ui/parser/issues/issue-20616-7.stderr
+++ b/tests/ui/parser/issues/issue-20616-7.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-8.rs b/tests/ui/parser/issues/issue-20616-8.rs
index 3ceb58d12..3ceb58d12 100644
--- a/src/test/ui/parser/issues/issue-20616-8.rs
+++ b/tests/ui/parser/issues/issue-20616-8.rs
diff --git a/src/test/ui/parser/issues/issue-20616-8.stderr b/tests/ui/parser/issues/issue-20616-8.stderr
index e9f37e50f..e9f37e50f 100644
--- a/src/test/ui/parser/issues/issue-20616-8.stderr
+++ b/tests/ui/parser/issues/issue-20616-8.stderr
diff --git a/src/test/ui/parser/issues/issue-20616-9.rs b/tests/ui/parser/issues/issue-20616-9.rs
index 7f8428448..7f8428448 100644
--- a/src/test/ui/parser/issues/issue-20616-9.rs
+++ b/tests/ui/parser/issues/issue-20616-9.rs
diff --git a/src/test/ui/parser/issues/issue-20616-9.stderr b/tests/ui/parser/issues/issue-20616-9.stderr
index dc309d1bc..dc309d1bc 100644
--- a/src/test/ui/parser/issues/issue-20616-9.stderr
+++ b/tests/ui/parser/issues/issue-20616-9.stderr
diff --git a/src/test/ui/parser/issues/issue-20711-2.rs b/tests/ui/parser/issues/issue-20711-2.rs
index 168c7e761..168c7e761 100644
--- a/src/test/ui/parser/issues/issue-20711-2.rs
+++ b/tests/ui/parser/issues/issue-20711-2.rs
diff --git a/src/test/ui/parser/issues/issue-20711-2.stderr b/tests/ui/parser/issues/issue-20711-2.stderr
index 12b18bbc5..12b18bbc5 100644
--- a/src/test/ui/parser/issues/issue-20711-2.stderr
+++ b/tests/ui/parser/issues/issue-20711-2.stderr
diff --git a/src/test/ui/parser/issues/issue-20711.rs b/tests/ui/parser/issues/issue-20711.rs
index 020bb79d6..020bb79d6 100644
--- a/src/test/ui/parser/issues/issue-20711.rs
+++ b/tests/ui/parser/issues/issue-20711.rs
diff --git a/src/test/ui/parser/issues/issue-20711.stderr b/tests/ui/parser/issues/issue-20711.stderr
index 4af4b22be..4af4b22be 100644
--- a/src/test/ui/parser/issues/issue-20711.stderr
+++ b/tests/ui/parser/issues/issue-20711.stderr
diff --git a/src/test/ui/parser/issues/issue-21146.rs b/tests/ui/parser/issues/issue-21146.rs
index 19eaffc3e..19eaffc3e 100644
--- a/src/test/ui/parser/issues/issue-21146.rs
+++ b/tests/ui/parser/issues/issue-21146.rs
diff --git a/src/test/ui/parser/issues/issue-21146.stderr b/tests/ui/parser/issues/issue-21146.stderr
index c71fda3d6..c71fda3d6 100644
--- a/src/test/ui/parser/issues/issue-21146.stderr
+++ b/tests/ui/parser/issues/issue-21146.stderr
diff --git a/src/test/ui/parser/issues/issue-21153.rs b/tests/ui/parser/issues/issue-21153.rs
index bf5fdb1f3..bf5fdb1f3 100644
--- a/src/test/ui/parser/issues/issue-21153.rs
+++ b/tests/ui/parser/issues/issue-21153.rs
diff --git a/src/test/ui/parser/issues/issue-21153.stderr b/tests/ui/parser/issues/issue-21153.stderr
index cbfa9ded3..cbfa9ded3 100644
--- a/src/test/ui/parser/issues/issue-21153.stderr
+++ b/tests/ui/parser/issues/issue-21153.stderr
diff --git a/src/test/ui/parser/issues/issue-21475.rs b/tests/ui/parser/issues/issue-21475.rs
index b028fcae0..b028fcae0 100644
--- a/src/test/ui/parser/issues/issue-21475.rs
+++ b/tests/ui/parser/issues/issue-21475.rs
diff --git a/src/test/ui/parser/issues/issue-22647.rs b/tests/ui/parser/issues/issue-22647.rs
index a68614106..a68614106 100644
--- a/src/test/ui/parser/issues/issue-22647.rs
+++ b/tests/ui/parser/issues/issue-22647.rs
diff --git a/src/test/ui/parser/issues/issue-22647.stderr b/tests/ui/parser/issues/issue-22647.stderr
index 89b454d19..89b454d19 100644
--- a/src/test/ui/parser/issues/issue-22647.stderr
+++ b/tests/ui/parser/issues/issue-22647.stderr
diff --git a/src/test/ui/parser/issues/issue-22712.rs b/tests/ui/parser/issues/issue-22712.rs
index 774de9c7e..774de9c7e 100644
--- a/src/test/ui/parser/issues/issue-22712.rs
+++ b/tests/ui/parser/issues/issue-22712.rs
diff --git a/src/test/ui/parser/issues/issue-22712.stderr b/tests/ui/parser/issues/issue-22712.stderr
index 30fabac65..30fabac65 100644
--- a/src/test/ui/parser/issues/issue-22712.stderr
+++ b/tests/ui/parser/issues/issue-22712.stderr
diff --git a/src/test/ui/parser/issues/issue-2354-1.rs b/tests/ui/parser/issues/issue-2354-1.rs
index 996cf1bcb..996cf1bcb 100644
--- a/src/test/ui/parser/issues/issue-2354-1.rs
+++ b/tests/ui/parser/issues/issue-2354-1.rs
diff --git a/src/test/ui/parser/issues/issue-2354-1.stderr b/tests/ui/parser/issues/issue-2354-1.stderr
index 7ea0f2a98..7ea0f2a98 100644
--- a/src/test/ui/parser/issues/issue-2354-1.stderr
+++ b/tests/ui/parser/issues/issue-2354-1.stderr
diff --git a/src/test/ui/parser/issues/issue-2354.rs b/tests/ui/parser/issues/issue-2354.rs
index c422040cb..c422040cb 100644
--- a/src/test/ui/parser/issues/issue-2354.rs
+++ b/tests/ui/parser/issues/issue-2354.rs
diff --git a/src/test/ui/parser/issues/issue-2354.stderr b/tests/ui/parser/issues/issue-2354.stderr
index b89ed3958..b89ed3958 100644
--- a/src/test/ui/parser/issues/issue-2354.stderr
+++ b/tests/ui/parser/issues/issue-2354.stderr
diff --git a/src/test/ui/parser/issues/issue-23620-invalid-escapes.rs b/tests/ui/parser/issues/issue-23620-invalid-escapes.rs
index c1355f0d6..c1355f0d6 100644
--- a/src/test/ui/parser/issues/issue-23620-invalid-escapes.rs
+++ b/tests/ui/parser/issues/issue-23620-invalid-escapes.rs
diff --git a/src/test/ui/parser/issues/issue-23620-invalid-escapes.stderr b/tests/ui/parser/issues/issue-23620-invalid-escapes.stderr
index 88d97c795..88d97c795 100644
--- a/src/test/ui/parser/issues/issue-23620-invalid-escapes.stderr
+++ b/tests/ui/parser/issues/issue-23620-invalid-escapes.stderr
diff --git a/src/test/ui/parser/issues/issue-24197.rs b/tests/ui/parser/issues/issue-24197.rs
index aaf513746..aaf513746 100644
--- a/src/test/ui/parser/issues/issue-24197.rs
+++ b/tests/ui/parser/issues/issue-24197.rs
diff --git a/src/test/ui/parser/issues/issue-24197.stderr b/tests/ui/parser/issues/issue-24197.stderr
index fd7015ccd..fd7015ccd 100644
--- a/src/test/ui/parser/issues/issue-24197.stderr
+++ b/tests/ui/parser/issues/issue-24197.stderr
diff --git a/src/test/ui/parser/issues/issue-24375.rs b/tests/ui/parser/issues/issue-24375.rs
index 1d128d33e..1d128d33e 100644
--- a/src/test/ui/parser/issues/issue-24375.rs
+++ b/tests/ui/parser/issues/issue-24375.rs
diff --git a/src/test/ui/parser/issues/issue-24375.stderr b/tests/ui/parser/issues/issue-24375.stderr
index 7aed88768..7aed88768 100644
--- a/src/test/ui/parser/issues/issue-24375.stderr
+++ b/tests/ui/parser/issues/issue-24375.stderr
diff --git a/src/test/ui/parser/issues/issue-24780.rs b/tests/ui/parser/issues/issue-24780.rs
index 017521f57..017521f57 100644
--- a/src/test/ui/parser/issues/issue-24780.rs
+++ b/tests/ui/parser/issues/issue-24780.rs
diff --git a/src/test/ui/parser/issues/issue-24780.stderr b/tests/ui/parser/issues/issue-24780.stderr
index d9470191b..d9470191b 100644
--- a/src/test/ui/parser/issues/issue-24780.stderr
+++ b/tests/ui/parser/issues/issue-24780.stderr
diff --git a/src/test/ui/parser/issues/issue-27255.rs b/tests/ui/parser/issues/issue-27255.rs
index d619688e1..d619688e1 100644
--- a/src/test/ui/parser/issues/issue-27255.rs
+++ b/tests/ui/parser/issues/issue-27255.rs
diff --git a/src/test/ui/parser/issues/issue-27255.stderr b/tests/ui/parser/issues/issue-27255.stderr
index 391a23556..391a23556 100644
--- a/src/test/ui/parser/issues/issue-27255.stderr
+++ b/tests/ui/parser/issues/issue-27255.stderr
diff --git a/src/test/ui/parser/issues/issue-30318.fixed b/tests/ui/parser/issues/issue-30318.fixed
index 71fc82172..71fc82172 100644
--- a/src/test/ui/parser/issues/issue-30318.fixed
+++ b/tests/ui/parser/issues/issue-30318.fixed
diff --git a/src/test/ui/parser/issues/issue-30318.rs b/tests/ui/parser/issues/issue-30318.rs
index 465dca2ff..465dca2ff 100644
--- a/src/test/ui/parser/issues/issue-30318.rs
+++ b/tests/ui/parser/issues/issue-30318.rs
diff --git a/src/test/ui/parser/issues/issue-30318.stderr b/tests/ui/parser/issues/issue-30318.stderr
index c441a92ab..c441a92ab 100644
--- a/src/test/ui/parser/issues/issue-30318.stderr
+++ b/tests/ui/parser/issues/issue-30318.stderr
diff --git a/src/test/ui/parser/issues/issue-3036.fixed b/tests/ui/parser/issues/issue-3036.fixed
index e5d5622e6..e5d5622e6 100644
--- a/src/test/ui/parser/issues/issue-3036.fixed
+++ b/tests/ui/parser/issues/issue-3036.fixed
diff --git a/src/test/ui/parser/issues/issue-3036.rs b/tests/ui/parser/issues/issue-3036.rs
index 2f76fb99b..2f76fb99b 100644
--- a/src/test/ui/parser/issues/issue-3036.rs
+++ b/tests/ui/parser/issues/issue-3036.rs
diff --git a/src/test/ui/parser/issues/issue-3036.stderr b/tests/ui/parser/issues/issue-3036.stderr
index e02223931..e02223931 100644
--- a/src/test/ui/parser/issues/issue-3036.stderr
+++ b/tests/ui/parser/issues/issue-3036.stderr
diff --git a/src/test/ui/parser/issues/issue-31804.rs b/tests/ui/parser/issues/issue-31804.rs
index d056b77cf..d056b77cf 100644
--- a/src/test/ui/parser/issues/issue-31804.rs
+++ b/tests/ui/parser/issues/issue-31804.rs
diff --git a/src/test/ui/parser/issues/issue-31804.stderr b/tests/ui/parser/issues/issue-31804.stderr
index 76e68b0b3..76e68b0b3 100644
--- a/src/test/ui/parser/issues/issue-31804.stderr
+++ b/tests/ui/parser/issues/issue-31804.stderr
diff --git a/src/test/ui/parser/issues/issue-32214.rs b/tests/ui/parser/issues/issue-32214.rs
index 1379eeb58..1379eeb58 100644
--- a/src/test/ui/parser/issues/issue-32214.rs
+++ b/tests/ui/parser/issues/issue-32214.rs
diff --git a/src/test/ui/parser/issues/issue-32214.stderr b/tests/ui/parser/issues/issue-32214.stderr
index d0a9b5299..d0a9b5299 100644
--- a/src/test/ui/parser/issues/issue-32214.stderr
+++ b/tests/ui/parser/issues/issue-32214.stderr
diff --git a/src/test/ui/parser/issues/issue-32446.rs b/tests/ui/parser/issues/issue-32446.rs
index 53e519a72..53e519a72 100644
--- a/src/test/ui/parser/issues/issue-32446.rs
+++ b/tests/ui/parser/issues/issue-32446.rs
diff --git a/src/test/ui/parser/issues/issue-32446.stderr b/tests/ui/parser/issues/issue-32446.stderr
index 7515369aa..7515369aa 100644
--- a/src/test/ui/parser/issues/issue-32446.stderr
+++ b/tests/ui/parser/issues/issue-32446.stderr
diff --git a/src/test/ui/parser/issues/issue-32501.rs b/tests/ui/parser/issues/issue-32501.rs
index 500242030..500242030 100644
--- a/src/test/ui/parser/issues/issue-32501.rs
+++ b/tests/ui/parser/issues/issue-32501.rs
diff --git a/src/test/ui/parser/issues/issue-32501.stderr b/tests/ui/parser/issues/issue-32501.stderr
index d53302449..d53302449 100644
--- a/src/test/ui/parser/issues/issue-32501.stderr
+++ b/tests/ui/parser/issues/issue-32501.stderr
diff --git a/src/test/ui/parser/issues/issue-32505.rs b/tests/ui/parser/issues/issue-32505.rs
index f31c00e5c..f31c00e5c 100644
--- a/src/test/ui/parser/issues/issue-32505.rs
+++ b/tests/ui/parser/issues/issue-32505.rs
diff --git a/src/test/ui/parser/issues/issue-32505.stderr b/tests/ui/parser/issues/issue-32505.stderr
index cdd779a93..cdd779a93 100644
--- a/src/test/ui/parser/issues/issue-32505.stderr
+++ b/tests/ui/parser/issues/issue-32505.stderr
diff --git a/src/test/ui/parser/issues/issue-33262.rs b/tests/ui/parser/issues/issue-33262.rs
index 3a612f95c..3a612f95c 100644
--- a/src/test/ui/parser/issues/issue-33262.rs
+++ b/tests/ui/parser/issues/issue-33262.rs
diff --git a/src/test/ui/parser/issues/issue-33262.stderr b/tests/ui/parser/issues/issue-33262.stderr
index 2aff32839..2aff32839 100644
--- a/src/test/ui/parser/issues/issue-33262.stderr
+++ b/tests/ui/parser/issues/issue-33262.stderr
diff --git a/src/test/ui/parser/issues/issue-33413.rs b/tests/ui/parser/issues/issue-33413.rs
index 7291732ce..7291732ce 100644
--- a/src/test/ui/parser/issues/issue-33413.rs
+++ b/tests/ui/parser/issues/issue-33413.rs
diff --git a/src/test/ui/parser/issues/issue-33413.stderr b/tests/ui/parser/issues/issue-33413.stderr
index b7250f3b0..b7250f3b0 100644
--- a/src/test/ui/parser/issues/issue-33413.stderr
+++ b/tests/ui/parser/issues/issue-33413.stderr
diff --git a/src/test/ui/parser/issues/issue-33418.fixed b/tests/ui/parser/issues/issue-33418.fixed
index ed885ae14..ed885ae14 100644
--- a/src/test/ui/parser/issues/issue-33418.fixed
+++ b/tests/ui/parser/issues/issue-33418.fixed
diff --git a/src/test/ui/parser/issues/issue-33418.rs b/tests/ui/parser/issues/issue-33418.rs
index 9934284ab..9934284ab 100644
--- a/src/test/ui/parser/issues/issue-33418.rs
+++ b/tests/ui/parser/issues/issue-33418.rs
diff --git a/src/test/ui/parser/issues/issue-33418.stderr b/tests/ui/parser/issues/issue-33418.stderr
index 9a8733e89..9a8733e89 100644
--- a/src/test/ui/parser/issues/issue-33418.stderr
+++ b/tests/ui/parser/issues/issue-33418.stderr
diff --git a/src/test/ui/parser/issues/issue-33455.rs b/tests/ui/parser/issues/issue-33455.rs
index 6dff63f5c..6dff63f5c 100644
--- a/src/test/ui/parser/issues/issue-33455.rs
+++ b/tests/ui/parser/issues/issue-33455.rs
diff --git a/src/test/ui/parser/issues/issue-33455.stderr b/tests/ui/parser/issues/issue-33455.stderr
index c535ef23b..c535ef23b 100644
--- a/src/test/ui/parser/issues/issue-33455.stderr
+++ b/tests/ui/parser/issues/issue-33455.stderr
diff --git a/src/test/ui/parser/issues/issue-34222-1.rs b/tests/ui/parser/issues/issue-34222-1.rs
index d36dddc97..d36dddc97 100644
--- a/src/test/ui/parser/issues/issue-34222-1.rs
+++ b/tests/ui/parser/issues/issue-34222-1.rs
diff --git a/src/test/ui/parser/issues/issue-34222-1.stderr b/tests/ui/parser/issues/issue-34222-1.stderr
index b451484ba..b451484ba 100644
--- a/src/test/ui/parser/issues/issue-34222-1.stderr
+++ b/tests/ui/parser/issues/issue-34222-1.stderr
diff --git a/src/test/ui/parser/issues/issue-34255-1.rs b/tests/ui/parser/issues/issue-34255-1.rs
index c70cd8b50..c70cd8b50 100644
--- a/src/test/ui/parser/issues/issue-34255-1.rs
+++ b/tests/ui/parser/issues/issue-34255-1.rs
diff --git a/src/test/ui/parser/issues/issue-34255-1.stderr b/tests/ui/parser/issues/issue-34255-1.stderr
index 0e2b0d62e..0e2b0d62e 100644
--- a/src/test/ui/parser/issues/issue-34255-1.stderr
+++ b/tests/ui/parser/issues/issue-34255-1.stderr
diff --git a/src/test/ui/parser/issues/issue-35813-postfix-after-cast.rs b/tests/ui/parser/issues/issue-35813-postfix-after-cast.rs
index 7bd4b3a16..7bd4b3a16 100644
--- a/src/test/ui/parser/issues/issue-35813-postfix-after-cast.rs
+++ b/tests/ui/parser/issues/issue-35813-postfix-after-cast.rs
diff --git a/src/test/ui/parser/issues/issue-35813-postfix-after-cast.stderr b/tests/ui/parser/issues/issue-35813-postfix-after-cast.stderr
index 0c328bde2..0c328bde2 100644
--- a/src/test/ui/parser/issues/issue-35813-postfix-after-cast.stderr
+++ b/tests/ui/parser/issues/issue-35813-postfix-after-cast.stderr
diff --git a/src/test/ui/parser/issues/issue-41155.rs b/tests/ui/parser/issues/issue-41155.rs
index 5a7488e6f..5a7488e6f 100644
--- a/src/test/ui/parser/issues/issue-41155.rs
+++ b/tests/ui/parser/issues/issue-41155.rs
diff --git a/src/test/ui/parser/issues/issue-41155.stderr b/tests/ui/parser/issues/issue-41155.stderr
index 8491afae2..8491afae2 100644
--- a/src/test/ui/parser/issues/issue-41155.stderr
+++ b/tests/ui/parser/issues/issue-41155.stderr
diff --git a/src/test/ui/parser/issues/issue-43196.rs b/tests/ui/parser/issues/issue-43196.rs
index 0eefa01ce..0eefa01ce 100644
--- a/src/test/ui/parser/issues/issue-43196.rs
+++ b/tests/ui/parser/issues/issue-43196.rs
diff --git a/src/test/ui/parser/issues/issue-43196.stderr b/tests/ui/parser/issues/issue-43196.stderr
index 4f7ed5cc6..4f7ed5cc6 100644
--- a/src/test/ui/parser/issues/issue-43196.stderr
+++ b/tests/ui/parser/issues/issue-43196.stderr
diff --git a/src/test/ui/parser/issues/issue-43692.rs b/tests/ui/parser/issues/issue-43692.rs
index baf8bafb8..baf8bafb8 100644
--- a/src/test/ui/parser/issues/issue-43692.rs
+++ b/tests/ui/parser/issues/issue-43692.rs
diff --git a/src/test/ui/parser/issues/issue-43692.stderr b/tests/ui/parser/issues/issue-43692.stderr
index baf998035..baf998035 100644
--- a/src/test/ui/parser/issues/issue-43692.stderr
+++ b/tests/ui/parser/issues/issue-43692.stderr
diff --git a/src/test/ui/parser/issues/issue-44021.rs b/tests/ui/parser/issues/issue-44021.rs
index 0b9558cc9..0b9558cc9 100644
--- a/src/test/ui/parser/issues/issue-44021.rs
+++ b/tests/ui/parser/issues/issue-44021.rs
diff --git a/src/test/ui/parser/issues/issue-44021.stderr b/tests/ui/parser/issues/issue-44021.stderr
index b888cd989..b888cd989 100644
--- a/src/test/ui/parser/issues/issue-44021.stderr
+++ b/tests/ui/parser/issues/issue-44021.stderr
diff --git a/src/test/ui/parser/issues/issue-44406.rs b/tests/ui/parser/issues/issue-44406.rs
index a5b7e83a0..a5b7e83a0 100644
--- a/src/test/ui/parser/issues/issue-44406.rs
+++ b/tests/ui/parser/issues/issue-44406.rs
diff --git a/src/test/ui/parser/issues/issue-44406.stderr b/tests/ui/parser/issues/issue-44406.stderr
index 1f0c1ea4c..1f0c1ea4c 100644
--- a/src/test/ui/parser/issues/issue-44406.stderr
+++ b/tests/ui/parser/issues/issue-44406.stderr
diff --git a/src/test/ui/parser/issues/issue-45296.rs b/tests/ui/parser/issues/issue-45296.rs
index d3a97e89f..d3a97e89f 100644
--- a/src/test/ui/parser/issues/issue-45296.rs
+++ b/tests/ui/parser/issues/issue-45296.rs
diff --git a/src/test/ui/parser/issues/issue-45296.stderr b/tests/ui/parser/issues/issue-45296.stderr
index 081a72054..081a72054 100644
--- a/src/test/ui/parser/issues/issue-45296.stderr
+++ b/tests/ui/parser/issues/issue-45296.stderr
diff --git a/src/test/ui/parser/issues/issue-46186.fixed b/tests/ui/parser/issues/issue-46186.fixed
index 2cb5a4996..2cb5a4996 100644
--- a/src/test/ui/parser/issues/issue-46186.fixed
+++ b/tests/ui/parser/issues/issue-46186.fixed
diff --git a/src/test/ui/parser/issues/issue-46186.rs b/tests/ui/parser/issues/issue-46186.rs
index 84cad38c5..84cad38c5 100644
--- a/src/test/ui/parser/issues/issue-46186.rs
+++ b/tests/ui/parser/issues/issue-46186.rs
diff --git a/src/test/ui/parser/issues/issue-46186.stderr b/tests/ui/parser/issues/issue-46186.stderr
index 0766c8a33..0766c8a33 100644
--- a/src/test/ui/parser/issues/issue-46186.stderr
+++ b/tests/ui/parser/issues/issue-46186.stderr
diff --git a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
index 48a679b2d..48a679b2d 100644
--- a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
+++ b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
diff --git a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
index fdef8ff6d..fdef8ff6d 100644
--- a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
+++ b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
diff --git a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items.rs b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items.rs
index 8592f8a72..8592f8a72 100644
--- a/src/test/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items.rs
+++ b/tests/ui/parser/issues/issue-48137-macros-cannot-interpolate-impl-items.rs
diff --git a/src/test/ui/parser/issues/issue-48508-aux.rs b/tests/ui/parser/issues/issue-48508-aux.rs
index ebdc70a04..ebdc70a04 100644
--- a/src/test/ui/parser/issues/issue-48508-aux.rs
+++ b/tests/ui/parser/issues/issue-48508-aux.rs
diff --git a/src/test/ui/parser/issues/issue-48508.rs b/tests/ui/parser/issues/issue-48508.rs
index 37d04c5d6..37d04c5d6 100644
--- a/src/test/ui/parser/issues/issue-48508.rs
+++ b/tests/ui/parser/issues/issue-48508.rs
diff --git a/src/test/ui/parser/issues/issue-48636.fixed b/tests/ui/parser/issues/issue-48636.fixed
index 87c19a32d..87c19a32d 100644
--- a/src/test/ui/parser/issues/issue-48636.fixed
+++ b/tests/ui/parser/issues/issue-48636.fixed
diff --git a/src/test/ui/parser/issues/issue-48636.rs b/tests/ui/parser/issues/issue-48636.rs
index 8610dc2f7..8610dc2f7 100644
--- a/src/test/ui/parser/issues/issue-48636.rs
+++ b/tests/ui/parser/issues/issue-48636.rs
diff --git a/src/test/ui/parser/issues/issue-48636.stderr b/tests/ui/parser/issues/issue-48636.stderr
index 6177870d1..6177870d1 100644
--- a/src/test/ui/parser/issues/issue-48636.stderr
+++ b/tests/ui/parser/issues/issue-48636.stderr
diff --git a/src/test/ui/parser/issues/issue-49040.rs b/tests/ui/parser/issues/issue-49040.rs
index b7a541dd6..b7a541dd6 100644
--- a/src/test/ui/parser/issues/issue-49040.rs
+++ b/tests/ui/parser/issues/issue-49040.rs
diff --git a/src/test/ui/parser/issues/issue-49040.stderr b/tests/ui/parser/issues/issue-49040.stderr
index 8af7838c7..8af7838c7 100644
--- a/src/test/ui/parser/issues/issue-49040.stderr
+++ b/tests/ui/parser/issues/issue-49040.stderr
diff --git a/src/test/ui/parser/issues/issue-51602.rs b/tests/ui/parser/issues/issue-51602.rs
index 0e96ca914..0e96ca914 100644
--- a/src/test/ui/parser/issues/issue-51602.rs
+++ b/tests/ui/parser/issues/issue-51602.rs
diff --git a/src/test/ui/parser/issues/issue-51602.stderr b/tests/ui/parser/issues/issue-51602.stderr
index 4a5653fdb..4a5653fdb 100644
--- a/src/test/ui/parser/issues/issue-51602.stderr
+++ b/tests/ui/parser/issues/issue-51602.stderr
diff --git a/src/test/ui/parser/issues/issue-52496.rs b/tests/ui/parser/issues/issue-52496.rs
index 05461f8b8..05461f8b8 100644
--- a/src/test/ui/parser/issues/issue-52496.rs
+++ b/tests/ui/parser/issues/issue-52496.rs
diff --git a/src/test/ui/parser/issues/issue-52496.stderr b/tests/ui/parser/issues/issue-52496.stderr
index 77335c64c..77335c64c 100644
--- a/src/test/ui/parser/issues/issue-52496.stderr
+++ b/tests/ui/parser/issues/issue-52496.stderr
diff --git a/src/test/ui/parser/issues/issue-54521-1.rs b/tests/ui/parser/issues/issue-54521-1.rs
index 8a682ef0a..8a682ef0a 100644
--- a/src/test/ui/parser/issues/issue-54521-1.rs
+++ b/tests/ui/parser/issues/issue-54521-1.rs
diff --git a/src/test/ui/parser/issues/issue-54521-2.fixed b/tests/ui/parser/issues/issue-54521-2.fixed
index a91c4fe43..a91c4fe43 100644
--- a/src/test/ui/parser/issues/issue-54521-2.fixed
+++ b/tests/ui/parser/issues/issue-54521-2.fixed
diff --git a/src/test/ui/parser/issues/issue-54521-2.rs b/tests/ui/parser/issues/issue-54521-2.rs
index 3639aac87..3639aac87 100644
--- a/src/test/ui/parser/issues/issue-54521-2.rs
+++ b/tests/ui/parser/issues/issue-54521-2.rs
diff --git a/src/test/ui/parser/issues/issue-54521-2.stderr b/tests/ui/parser/issues/issue-54521-2.stderr
index 9556b83b7..9556b83b7 100644
--- a/src/test/ui/parser/issues/issue-54521-2.stderr
+++ b/tests/ui/parser/issues/issue-54521-2.stderr
diff --git a/src/test/ui/parser/issues/issue-54521-3.fixed b/tests/ui/parser/issues/issue-54521-3.fixed
index 84ab6866c..84ab6866c 100644
--- a/src/test/ui/parser/issues/issue-54521-3.fixed
+++ b/tests/ui/parser/issues/issue-54521-3.fixed
diff --git a/src/test/ui/parser/issues/issue-54521-3.rs b/tests/ui/parser/issues/issue-54521-3.rs
index f1d685041..f1d685041 100644
--- a/src/test/ui/parser/issues/issue-54521-3.rs
+++ b/tests/ui/parser/issues/issue-54521-3.rs
diff --git a/src/test/ui/parser/issues/issue-54521-3.stderr b/tests/ui/parser/issues/issue-54521-3.stderr
index 0f23dd621..0f23dd621 100644
--- a/src/test/ui/parser/issues/issue-54521-3.stderr
+++ b/tests/ui/parser/issues/issue-54521-3.stderr
diff --git a/src/test/ui/parser/issues/issue-5544-a.rs b/tests/ui/parser/issues/issue-5544-a.rs
index 3c239c73b..3c239c73b 100644
--- a/src/test/ui/parser/issues/issue-5544-a.rs
+++ b/tests/ui/parser/issues/issue-5544-a.rs
diff --git a/src/test/ui/parser/issues/issue-5544-a.stderr b/tests/ui/parser/issues/issue-5544-a.stderr
index de579c3c1..6e68c7585 100644
--- a/src/test/ui/parser/issues/issue-5544-a.stderr
+++ b/tests/ui/parser/issues/issue-5544-a.stderr
@@ -3,6 +3,8 @@ error: integer literal is too large
    |
 LL |     let __isize = 340282366920938463463374607431768211456; // 2^128
    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `340282366920938463463374607431768211455`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-5544-b.rs b/tests/ui/parser/issues/issue-5544-b.rs
index 93f2ff271..93f2ff271 100644
--- a/src/test/ui/parser/issues/issue-5544-b.rs
+++ b/tests/ui/parser/issues/issue-5544-b.rs
diff --git a/src/test/ui/parser/issues/issue-5544-b.stderr b/tests/ui/parser/issues/issue-5544-b.stderr
index 7df212ded..5d0e76d5d 100644
--- a/src/test/ui/parser/issues/issue-5544-b.stderr
+++ b/tests/ui/parser/issues/issue-5544-b.stderr
@@ -3,6 +3,8 @@ error: integer literal is too large
    |
 LL |     let __isize = 0xffff_ffff_ffff_ffff_ffff_ffff_ffff_ffff_ff;
    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `0xffffffffffffffffffffffffffffffff`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-56031.rs b/tests/ui/parser/issues/issue-56031.rs
index b68f56814..b68f56814 100644
--- a/src/test/ui/parser/issues/issue-56031.rs
+++ b/tests/ui/parser/issues/issue-56031.rs
diff --git a/src/test/ui/parser/issues/issue-56031.stderr b/tests/ui/parser/issues/issue-56031.stderr
index 2fa05dd2d..2fa05dd2d 100644
--- a/src/test/ui/parser/issues/issue-56031.stderr
+++ b/tests/ui/parser/issues/issue-56031.stderr
diff --git a/src/test/ui/parser/issues/issue-57198.rs b/tests/ui/parser/issues/issue-57198.rs
index 714a46cbc..714a46cbc 100644
--- a/src/test/ui/parser/issues/issue-57198.rs
+++ b/tests/ui/parser/issues/issue-57198.rs
diff --git a/src/test/ui/parser/issues/issue-57198.stderr b/tests/ui/parser/issues/issue-57198.stderr
index dd70b4022..dd70b4022 100644
--- a/src/test/ui/parser/issues/issue-57198.stderr
+++ b/tests/ui/parser/issues/issue-57198.stderr
diff --git a/src/test/ui/parser/issues/issue-57684.fixed b/tests/ui/parser/issues/issue-57684.fixed
index 4a432206d..4a432206d 100644
--- a/src/test/ui/parser/issues/issue-57684.fixed
+++ b/tests/ui/parser/issues/issue-57684.fixed
diff --git a/src/test/ui/parser/issues/issue-57684.rs b/tests/ui/parser/issues/issue-57684.rs
index 7a62785e3..7a62785e3 100644
--- a/src/test/ui/parser/issues/issue-57684.rs
+++ b/tests/ui/parser/issues/issue-57684.rs
diff --git a/src/test/ui/parser/issues/issue-57684.stderr b/tests/ui/parser/issues/issue-57684.stderr
index 514bbffde..514bbffde 100644
--- a/src/test/ui/parser/issues/issue-57684.stderr
+++ b/tests/ui/parser/issues/issue-57684.stderr
diff --git a/src/test/ui/parser/issues/issue-57819.fixed b/tests/ui/parser/issues/issue-57819.fixed
index 3fab21db2..3fab21db2 100644
--- a/src/test/ui/parser/issues/issue-57819.fixed
+++ b/tests/ui/parser/issues/issue-57819.fixed
diff --git a/src/test/ui/parser/issues/issue-57819.rs b/tests/ui/parser/issues/issue-57819.rs
index 5cafbf439..5cafbf439 100644
--- a/src/test/ui/parser/issues/issue-57819.rs
+++ b/tests/ui/parser/issues/issue-57819.rs
diff --git a/src/test/ui/parser/issues/issue-57819.stderr b/tests/ui/parser/issues/issue-57819.stderr
index 493e9835b..493e9835b 100644
--- a/src/test/ui/parser/issues/issue-57819.stderr
+++ b/tests/ui/parser/issues/issue-57819.stderr
diff --git a/src/test/ui/parser/issues/issue-5806.rs b/tests/ui/parser/issues/issue-5806.rs
index b694642a9..b694642a9 100644
--- a/src/test/ui/parser/issues/issue-5806.rs
+++ b/tests/ui/parser/issues/issue-5806.rs
diff --git a/src/test/ui/parser/issues/issue-5806.stderr b/tests/ui/parser/issues/issue-5806.stderr
index bdb5c91ff..bdb5c91ff 100644
--- a/src/test/ui/parser/issues/issue-5806.stderr
+++ b/tests/ui/parser/issues/issue-5806.stderr
diff --git a/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.rs b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.rs
index 25699f9fe..25699f9fe 100644
--- a/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.rs
+++ b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.rs
diff --git a/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr
index 8a44ee761..8a44ee761 100644
--- a/src/test/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr
+++ b/tests/ui/parser/issues/issue-58094-missing-right-square-bracket.stderr
diff --git a/src/test/ui/parser/issues/issue-58856-1.rs b/tests/ui/parser/issues/issue-58856-1.rs
index ea80eb871..ea80eb871 100644
--- a/src/test/ui/parser/issues/issue-58856-1.rs
+++ b/tests/ui/parser/issues/issue-58856-1.rs
diff --git a/src/test/ui/parser/issues/issue-58856-1.stderr b/tests/ui/parser/issues/issue-58856-1.stderr
index 96151f3fe..96151f3fe 100644
--- a/src/test/ui/parser/issues/issue-58856-1.stderr
+++ b/tests/ui/parser/issues/issue-58856-1.stderr
diff --git a/src/test/ui/parser/issues/issue-58856-2.rs b/tests/ui/parser/issues/issue-58856-2.rs
index 9356d57b0..9356d57b0 100644
--- a/src/test/ui/parser/issues/issue-58856-2.rs
+++ b/tests/ui/parser/issues/issue-58856-2.rs
diff --git a/src/test/ui/parser/issues/issue-58856-2.stderr b/tests/ui/parser/issues/issue-58856-2.stderr
index 627dd3890..627dd3890 100644
--- a/src/test/ui/parser/issues/issue-58856-2.stderr
+++ b/tests/ui/parser/issues/issue-58856-2.stderr
diff --git a/src/test/ui/parser/issues/issue-59418.rs b/tests/ui/parser/issues/issue-59418.rs
index 0fa191d4a..0fa191d4a 100644
--- a/src/test/ui/parser/issues/issue-59418.rs
+++ b/tests/ui/parser/issues/issue-59418.rs
diff --git a/src/test/ui/parser/issues/issue-59418.stderr b/tests/ui/parser/issues/issue-59418.stderr
index 347051e9f..347051e9f 100644
--- a/src/test/ui/parser/issues/issue-59418.stderr
+++ b/tests/ui/parser/issues/issue-59418.stderr
diff --git a/src/test/ui/parser/issues/issue-60075.rs b/tests/ui/parser/issues/issue-60075.rs
index e89d78ee8..e89d78ee8 100644
--- a/src/test/ui/parser/issues/issue-60075.rs
+++ b/tests/ui/parser/issues/issue-60075.rs
diff --git a/src/test/ui/parser/issues/issue-60075.stderr b/tests/ui/parser/issues/issue-60075.stderr
index 210ef700c..210ef700c 100644
--- a/src/test/ui/parser/issues/issue-60075.stderr
+++ b/tests/ui/parser/issues/issue-60075.stderr
diff --git a/src/test/ui/parser/issues/issue-62524.rs b/tests/ui/parser/issues/issue-62524.rs
index 5259dfe2e..5259dfe2e 100644
--- a/src/test/ui/parser/issues/issue-62524.rs
+++ b/tests/ui/parser/issues/issue-62524.rs
diff --git a/src/test/ui/parser/issues/issue-62524.stderr b/tests/ui/parser/issues/issue-62524.stderr
index 55eed0402..55eed0402 100644
--- a/src/test/ui/parser/issues/issue-62524.stderr
+++ b/tests/ui/parser/issues/issue-62524.stderr
diff --git a/src/test/ui/parser/issues/issue-62546.rs b/tests/ui/parser/issues/issue-62546.rs
index f06b65058..f06b65058 100644
--- a/src/test/ui/parser/issues/issue-62546.rs
+++ b/tests/ui/parser/issues/issue-62546.rs
diff --git a/src/test/ui/parser/issues/issue-62546.stderr b/tests/ui/parser/issues/issue-62546.stderr
index 32c61391e..32c61391e 100644
--- a/src/test/ui/parser/issues/issue-62546.stderr
+++ b/tests/ui/parser/issues/issue-62546.stderr
diff --git a/src/test/ui/parser/issues/issue-62554.rs b/tests/ui/parser/issues/issue-62554.rs
index cfd02183c..cfd02183c 100644
--- a/src/test/ui/parser/issues/issue-62554.rs
+++ b/tests/ui/parser/issues/issue-62554.rs
diff --git a/src/test/ui/parser/issues/issue-62554.stderr b/tests/ui/parser/issues/issue-62554.stderr
index 9e62572e3..9e62572e3 100644
--- a/src/test/ui/parser/issues/issue-62554.stderr
+++ b/tests/ui/parser/issues/issue-62554.stderr
diff --git a/src/test/ui/parser/issues/issue-62660.rs b/tests/ui/parser/issues/issue-62660.rs
index 33c8a9fa3..33c8a9fa3 100644
--- a/src/test/ui/parser/issues/issue-62660.rs
+++ b/tests/ui/parser/issues/issue-62660.rs
diff --git a/src/test/ui/parser/issues/issue-62660.stderr b/tests/ui/parser/issues/issue-62660.stderr
index 14c0bdcb1..14c0bdcb1 100644
--- a/src/test/ui/parser/issues/issue-62660.stderr
+++ b/tests/ui/parser/issues/issue-62660.stderr
diff --git a/src/test/ui/parser/issues/issue-62881.rs b/tests/ui/parser/issues/issue-62881.rs
index b9204595f..b9204595f 100644
--- a/src/test/ui/parser/issues/issue-62881.rs
+++ b/tests/ui/parser/issues/issue-62881.rs
diff --git a/src/test/ui/parser/issues/issue-62881.stderr b/tests/ui/parser/issues/issue-62881.stderr
index 87be69baa..87be69baa 100644
--- a/src/test/ui/parser/issues/issue-62881.stderr
+++ b/tests/ui/parser/issues/issue-62881.stderr
diff --git a/src/test/ui/parser/issues/issue-62894.rs b/tests/ui/parser/issues/issue-62894.rs
index b9c0bf834..b9c0bf834 100644
--- a/src/test/ui/parser/issues/issue-62894.rs
+++ b/tests/ui/parser/issues/issue-62894.rs
diff --git a/src/test/ui/parser/issues/issue-62894.stderr b/tests/ui/parser/issues/issue-62894.stderr
index ae8992691..07a203bf4 100644
--- a/src/test/ui/parser/issues/issue-62894.stderr
+++ b/tests/ui/parser/issues/issue-62894.stderr
@@ -42,11 +42,9 @@ LL | fn f() { assert_eq!(f(), (), assert_eq!(assert_eq!
 LL |
 LL | fn main() {}
    | ^^ unexpected token
+  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-   |
-LL |     ($left:expr, $right:expr $(,)?) => {
-   |      ---------- while parsing argument for this `expr` macro fragment
+   = note: while parsing argument for this `expr` macro fragment
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/parser/issues/issue-62895.rs b/tests/ui/parser/issues/issue-62895.rs
index 53f17405d..53f17405d 100644
--- a/src/test/ui/parser/issues/issue-62895.rs
+++ b/tests/ui/parser/issues/issue-62895.rs
diff --git a/src/test/ui/parser/issues/issue-62895.stderr b/tests/ui/parser/issues/issue-62895.stderr
index 2e7e500f4..2e7e500f4 100644
--- a/src/test/ui/parser/issues/issue-62895.stderr
+++ b/tests/ui/parser/issues/issue-62895.stderr
diff --git a/src/test/ui/parser/issues/issue-62913.rs b/tests/ui/parser/issues/issue-62913.rs
index 0db06f636..0db06f636 100644
--- a/src/test/ui/parser/issues/issue-62913.rs
+++ b/tests/ui/parser/issues/issue-62913.rs
diff --git a/src/test/ui/parser/issues/issue-62913.stderr b/tests/ui/parser/issues/issue-62913.stderr
index 6f385e8dc..6f385e8dc 100644
--- a/src/test/ui/parser/issues/issue-62913.stderr
+++ b/tests/ui/parser/issues/issue-62913.stderr
diff --git a/src/test/ui/parser/issues/issue-62973.rs b/tests/ui/parser/issues/issue-62973.rs
index 1c5d0c6f8..1c5d0c6f8 100644
--- a/src/test/ui/parser/issues/issue-62973.rs
+++ b/tests/ui/parser/issues/issue-62973.rs
diff --git a/src/test/ui/parser/issues/issue-62973.stderr b/tests/ui/parser/issues/issue-62973.stderr
index 4737bc718..4737bc718 100644
--- a/src/test/ui/parser/issues/issue-62973.stderr
+++ b/tests/ui/parser/issues/issue-62973.stderr
diff --git a/src/test/ui/parser/issues/issue-63115-range-pat-interpolated.rs b/tests/ui/parser/issues/issue-63115-range-pat-interpolated.rs
index b6e5091b6..b6e5091b6 100644
--- a/src/test/ui/parser/issues/issue-63115-range-pat-interpolated.rs
+++ b/tests/ui/parser/issues/issue-63115-range-pat-interpolated.rs
diff --git a/src/test/ui/parser/issues/issue-63116.rs b/tests/ui/parser/issues/issue-63116.rs
index 430bc1d71..430bc1d71 100644
--- a/src/test/ui/parser/issues/issue-63116.rs
+++ b/tests/ui/parser/issues/issue-63116.rs
diff --git a/src/test/ui/parser/issues/issue-63116.stderr b/tests/ui/parser/issues/issue-63116.stderr
index cfdd99d14..cfdd99d14 100644
--- a/src/test/ui/parser/issues/issue-63116.stderr
+++ b/tests/ui/parser/issues/issue-63116.stderr
diff --git a/src/test/ui/parser/issues/issue-63135.rs b/tests/ui/parser/issues/issue-63135.rs
index a5a8de854..a5a8de854 100644
--- a/src/test/ui/parser/issues/issue-63135.rs
+++ b/tests/ui/parser/issues/issue-63135.rs
diff --git a/src/test/ui/parser/issues/issue-63135.stderr b/tests/ui/parser/issues/issue-63135.stderr
index 80e9ac5be..80e9ac5be 100644
--- a/src/test/ui/parser/issues/issue-63135.stderr
+++ b/tests/ui/parser/issues/issue-63135.stderr
diff --git a/src/test/ui/parser/issues/issue-64732.rs b/tests/ui/parser/issues/issue-64732.rs
index 2db51ea60..2db51ea60 100644
--- a/src/test/ui/parser/issues/issue-64732.rs
+++ b/tests/ui/parser/issues/issue-64732.rs
diff --git a/src/test/ui/parser/issues/issue-64732.stderr b/tests/ui/parser/issues/issue-64732.stderr
index 804625493..804625493 100644
--- a/src/test/ui/parser/issues/issue-64732.stderr
+++ b/tests/ui/parser/issues/issue-64732.stderr
diff --git a/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-enum.rs b/tests/ui/parser/issues/issue-65041-empty-vis-matcher-in-enum.rs
index ef89e31d8..ef89e31d8 100644
--- a/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-enum.rs
+++ b/tests/ui/parser/issues/issue-65041-empty-vis-matcher-in-enum.rs
diff --git a/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-trait.rs b/tests/ui/parser/issues/issue-65041-empty-vis-matcher-in-trait.rs
index b08767b21..b08767b21 100644
--- a/src/test/ui/parser/issues/issue-65041-empty-vis-matcher-in-trait.rs
+++ b/tests/ui/parser/issues/issue-65041-empty-vis-matcher-in-trait.rs
diff --git a/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.rs b/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.rs
index 30f3781bf..30f3781bf 100644
--- a/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.rs
+++ b/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.rs
diff --git a/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr b/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr
index 8c032e588..8c032e588 100644
--- a/src/test/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr
+++ b/tests/ui/parser/issues/issue-65122-mac-invoc-in-mut-patterns.stderr
diff --git a/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.rs b/tests/ui/parser/issues/issue-65257-invalid-var-decl-recovery.rs
index c1826f8ca..c1826f8ca 100644
--- a/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.rs
+++ b/tests/ui/parser/issues/issue-65257-invalid-var-decl-recovery.rs
diff --git a/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.stderr b/tests/ui/parser/issues/issue-65257-invalid-var-decl-recovery.stderr
index 0a88dd2c4..0a88dd2c4 100644
--- a/src/test/ui/parser/issues/issue-65257-invalid-var-decl-recovery.stderr
+++ b/tests/ui/parser/issues/issue-65257-invalid-var-decl-recovery.stderr
diff --git a/src/test/ui/parser/issues/issue-65846-rollback-gating-failing-matcher.rs b/tests/ui/parser/issues/issue-65846-rollback-gating-failing-matcher.rs
index 76c07bbfd..76c07bbfd 100644
--- a/src/test/ui/parser/issues/issue-65846-rollback-gating-failing-matcher.rs
+++ b/tests/ui/parser/issues/issue-65846-rollback-gating-failing-matcher.rs
diff --git a/src/test/ui/parser/issues/issue-6610.rs b/tests/ui/parser/issues/issue-6610.rs
index 9ed5a6122..9ed5a6122 100644
--- a/src/test/ui/parser/issues/issue-6610.rs
+++ b/tests/ui/parser/issues/issue-6610.rs
diff --git a/src/test/ui/parser/issues/issue-6610.stderr b/tests/ui/parser/issues/issue-6610.stderr
index 4a3bc7525..4a3bc7525 100644
--- a/src/test/ui/parser/issues/issue-6610.stderr
+++ b/tests/ui/parser/issues/issue-6610.stderr
diff --git a/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.rs b/tests/ui/parser/issues/issue-66357-unexpected-unreachable.rs
index aed428bfc..aed428bfc 100644
--- a/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.rs
+++ b/tests/ui/parser/issues/issue-66357-unexpected-unreachable.rs
diff --git a/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.stderr b/tests/ui/parser/issues/issue-66357-unexpected-unreachable.stderr
index 6cbab855c..6cbab855c 100644
--- a/src/test/ui/parser/issues/issue-66357-unexpected-unreachable.stderr
+++ b/tests/ui/parser/issues/issue-66357-unexpected-unreachable.stderr
diff --git a/src/test/ui/parser/issues/issue-66473.rs b/tests/ui/parser/issues/issue-66473.rs
index 9db4521bb..9db4521bb 100644
--- a/src/test/ui/parser/issues/issue-66473.rs
+++ b/tests/ui/parser/issues/issue-66473.rs
diff --git a/tests/ui/parser/issues/issue-66473.stderr b/tests/ui/parser/issues/issue-66473.stderr
new file mode 100644
index 000000000..0e8b0a5da
--- /dev/null
+++ b/tests/ui/parser/issues/issue-66473.stderr
diff --git a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.fixed b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.fixed
index 95019b278..95019b278 100644
--- a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.fixed
+++ b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.fixed
diff --git a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.rs b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.rs
index 82f54f8fa..82f54f8fa 100644
--- a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.rs
+++ b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.rs
diff --git a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.stderr b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.stderr
index a4a422948..a4a422948 100644
--- a/src/test/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.stderr
+++ b/tests/ui/parser/issues/issue-67146-negative-outlives-bound-syntactic-fail.stderr
diff --git a/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.rs b/tests/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.rs
index 87222ef4b..87222ef4b 100644
--- a/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.rs
+++ b/tests/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.rs
diff --git a/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.stderr b/tests/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.stderr
index a00f37ed6..a00f37ed6 100644
--- a/src/test/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.stderr
+++ b/tests/ui/parser/issues/issue-67377-invalid-syntax-in-enum-discriminant.stderr
diff --git a/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.rs b/tests/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.rs
index 3c49a5a97..3c49a5a97 100644
--- a/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.rs
+++ b/tests/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.rs
diff --git a/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.stderr b/tests/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.stderr
index adabb6859..adabb6859 100644
--- a/src/test/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.stderr
+++ b/tests/ui/parser/issues/issue-68000-unicode-ident-after-missing-comma.stderr
diff --git a/src/test/ui/parser/issues/issue-68629.rs b/tests/ui/parser/issues/issue-68629.rs
index 672a31f12..672a31f12 100644
--- a/src/test/ui/parser/issues/issue-68629.rs
+++ b/tests/ui/parser/issues/issue-68629.rs
diff --git a/src/test/ui/parser/issues/issue-68629.stderr b/tests/ui/parser/issues/issue-68629.stderr
index b2c7dddc8..43a903e6c 100644
--- a/src/test/ui/parser/issues/issue-68629.stderr
+++ b/tests/ui/parser/issues/issue-68629.stderr
diff --git a/src/test/ui/parser/issues/issue-68730.rs b/tests/ui/parser/issues/issue-68730.rs
index 20e18b4bc..20e18b4bc 100644
--- a/src/test/ui/parser/issues/issue-68730.rs
+++ b/tests/ui/parser/issues/issue-68730.rs
diff --git a/src/test/ui/parser/issues/issue-68730.stderr b/tests/ui/parser/issues/issue-68730.stderr
index 6585a19d9..5bca5bbeb 100644
--- a/src/test/ui/parser/issues/issue-68730.stderr
+++ b/tests/ui/parser/issues/issue-68730.stderr
diff --git a/src/test/ui/parser/issues/issue-68788-in-trait-item-propagation.rs b/tests/ui/parser/issues/issue-68788-in-trait-item-propagation.rs
index 7c3dd1d5a..7c3dd1d5a 100644
--- a/src/test/ui/parser/issues/issue-68788-in-trait-item-propagation.rs
+++ b/tests/ui/parser/issues/issue-68788-in-trait-item-propagation.rs
diff --git a/src/test/ui/parser/issues/issue-68890-2.rs b/tests/ui/parser/issues/issue-68890-2.rs
index 29c123521..29c123521 100644
--- a/src/test/ui/parser/issues/issue-68890-2.rs
+++ b/tests/ui/parser/issues/issue-68890-2.rs
diff --git a/src/test/ui/parser/issues/issue-68890-2.stderr b/tests/ui/parser/issues/issue-68890-2.stderr
index d9fb7beeb..d9fb7beeb 100644
--- a/src/test/ui/parser/issues/issue-68890-2.stderr
+++ b/tests/ui/parser/issues/issue-68890-2.stderr
diff --git a/src/test/ui/parser/issues/issue-68890.rs b/tests/ui/parser/issues/issue-68890.rs
index bab4ed7f8..bab4ed7f8 100644
--- a/src/test/ui/parser/issues/issue-68890.rs
+++ b/tests/ui/parser/issues/issue-68890.rs
diff --git a/src/test/ui/parser/issues/issue-68890.stderr b/tests/ui/parser/issues/issue-68890.stderr
index 2a3bf6b41..2a3bf6b41 100644
--- a/src/test/ui/parser/issues/issue-68890.stderr
+++ b/tests/ui/parser/issues/issue-68890.stderr
diff --git a/src/test/ui/parser/issues/issue-70050-ntliteral-accepts-negated-lit.rs b/tests/ui/parser/issues/issue-70050-ntliteral-accepts-negated-lit.rs
index aca9d9eb0..aca9d9eb0 100644
--- a/src/test/ui/parser/issues/issue-70050-ntliteral-accepts-negated-lit.rs
+++ b/tests/ui/parser/issues/issue-70050-ntliteral-accepts-negated-lit.rs
diff --git a/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.rs b/tests/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.rs
index ca8abd78c..ca8abd78c 100644
--- a/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.rs
+++ b/tests/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.rs
diff --git a/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.stderr b/tests/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.stderr
index 4961e8fc0..4961e8fc0 100644
--- a/src/test/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.stderr
+++ b/tests/ui/parser/issues/issue-70388-recover-dotdotdot-rest-pat.stderr
diff --git a/src/test/ui/parser/issues/issue-70388-without-witness.fixed b/tests/ui/parser/issues/issue-70388-without-witness.fixed
index 8d981405e..8d981405e 100644
--- a/src/test/ui/parser/issues/issue-70388-without-witness.fixed
+++ b/tests/ui/parser/issues/issue-70388-without-witness.fixed
diff --git a/src/test/ui/parser/issues/issue-70388-without-witness.rs b/tests/ui/parser/issues/issue-70388-without-witness.rs
index bf3607308..bf3607308 100644
--- a/src/test/ui/parser/issues/issue-70388-without-witness.rs
+++ b/tests/ui/parser/issues/issue-70388-without-witness.rs
diff --git a/src/test/ui/parser/issues/issue-70388-without-witness.stderr b/tests/ui/parser/issues/issue-70388-without-witness.stderr
index b750ad4c6..b750ad4c6 100644
--- a/src/test/ui/parser/issues/issue-70388-without-witness.stderr
+++ b/tests/ui/parser/issues/issue-70388-without-witness.stderr
diff --git a/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.rs b/tests/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.rs
index aeccd0d9f..aeccd0d9f 100644
--- a/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.rs
+++ b/tests/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.rs
diff --git a/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.stderr b/tests/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.stderr
index 421f14540..421f14540 100644
--- a/src/test/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.stderr
+++ b/tests/ui/parser/issues/issue-70549-resolve-after-recovered-self-ctor.stderr
diff --git a/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.rs b/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.rs
index 9b6dd7db4..9b6dd7db4 100644
--- a/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.rs
+++ b/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.rs
diff --git a/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr b/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr
index f03c92e1b..f03c92e1b 100644
--- a/src/test/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr
+++ b/tests/ui/parser/issues/issue-70552-ascription-in-parens-after-call.stderr
diff --git a/src/test/ui/parser/issues/issue-70583-block-is-empty-1.rs b/tests/ui/parser/issues/issue-70583-block-is-empty-1.rs
index f560f68f6..f560f68f6 100644
--- a/src/test/ui/parser/issues/issue-70583-block-is-empty-1.rs
+++ b/tests/ui/parser/issues/issue-70583-block-is-empty-1.rs
diff --git a/src/test/ui/parser/issues/issue-70583-block-is-empty-1.stderr b/tests/ui/parser/issues/issue-70583-block-is-empty-1.stderr
index 39bf113ef..39bf113ef 100644
--- a/src/test/ui/parser/issues/issue-70583-block-is-empty-1.stderr
+++ b/tests/ui/parser/issues/issue-70583-block-is-empty-1.stderr
diff --git a/src/test/ui/parser/issues/issue-70583-block-is-empty-2.rs b/tests/ui/parser/issues/issue-70583-block-is-empty-2.rs
index 80f53338a..80f53338a 100644
--- a/src/test/ui/parser/issues/issue-70583-block-is-empty-2.rs
+++ b/tests/ui/parser/issues/issue-70583-block-is-empty-2.rs
diff --git a/src/test/ui/parser/issues/issue-70583-block-is-empty-2.stderr b/tests/ui/parser/issues/issue-70583-block-is-empty-2.stderr
index 5d37b2164..5d37b2164 100644
--- a/src/test/ui/parser/issues/issue-70583-block-is-empty-2.stderr
+++ b/tests/ui/parser/issues/issue-70583-block-is-empty-2.stderr
diff --git a/src/test/ui/parser/issues/issue-7222.rs b/tests/ui/parser/issues/issue-7222.rs
index 649073166..649073166 100644
--- a/src/test/ui/parser/issues/issue-7222.rs
+++ b/tests/ui/parser/issues/issue-7222.rs
diff --git a/src/test/ui/parser/issues/issue-72253.rs b/tests/ui/parser/issues/issue-72253.rs
index 1446a796f..1446a796f 100644
--- a/src/test/ui/parser/issues/issue-72253.rs
+++ b/tests/ui/parser/issues/issue-72253.rs
diff --git a/src/test/ui/parser/issues/issue-72253.stderr b/tests/ui/parser/issues/issue-72253.stderr
index 477fa09f4..477fa09f4 100644
--- a/src/test/ui/parser/issues/issue-72253.stderr
+++ b/tests/ui/parser/issues/issue-72253.stderr
diff --git a/src/test/ui/parser/issues/issue-72373.rs b/tests/ui/parser/issues/issue-72373.rs
index 4da6061c2..4da6061c2 100644
--- a/src/test/ui/parser/issues/issue-72373.rs
+++ b/tests/ui/parser/issues/issue-72373.rs
diff --git a/src/test/ui/parser/issues/issue-72373.stderr b/tests/ui/parser/issues/issue-72373.stderr
index 0bb99a01e..0bb99a01e 100644
--- a/src/test/ui/parser/issues/issue-72373.stderr
+++ b/tests/ui/parser/issues/issue-72373.stderr
diff --git a/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.rs b/tests/ui/parser/issues/issue-73568-lifetime-after-mut.rs
index 5f731f8db..5f731f8db 100644
--- a/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.rs
+++ b/tests/ui/parser/issues/issue-73568-lifetime-after-mut.rs
diff --git a/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.stderr b/tests/ui/parser/issues/issue-73568-lifetime-after-mut.stderr
index 799bc16bd..799bc16bd 100644
--- a/src/test/ui/parser/issues/issue-73568-lifetime-after-mut.stderr
+++ b/tests/ui/parser/issues/issue-73568-lifetime-after-mut.stderr
diff --git a/src/test/ui/parser/issues/issue-75599.rs b/tests/ui/parser/issues/issue-75599.rs
index 0857676e4..0857676e4 100644
--- a/src/test/ui/parser/issues/issue-75599.rs
+++ b/tests/ui/parser/issues/issue-75599.rs
diff --git a/src/test/ui/parser/issues/issue-76437-async.rs b/tests/ui/parser/issues/issue-76437-async.rs
index 84ee3dd21..84ee3dd21 100644
--- a/src/test/ui/parser/issues/issue-76437-async.rs
+++ b/tests/ui/parser/issues/issue-76437-async.rs
diff --git a/src/test/ui/parser/issues/issue-76437-async.stderr b/tests/ui/parser/issues/issue-76437-async.stderr
index 2c9c2a8cf..2c9c2a8cf 100644
--- a/src/test/ui/parser/issues/issue-76437-async.stderr
+++ b/tests/ui/parser/issues/issue-76437-async.stderr
diff --git a/src/test/ui/parser/issues/issue-76437-const-async-unsafe.rs b/tests/ui/parser/issues/issue-76437-const-async-unsafe.rs
index f1e06e4ad..f1e06e4ad 100644
--- a/src/test/ui/parser/issues/issue-76437-const-async-unsafe.rs
+++ b/tests/ui/parser/issues/issue-76437-const-async-unsafe.rs
diff --git a/src/test/ui/parser/issues/issue-76437-const-async-unsafe.stderr b/tests/ui/parser/issues/issue-76437-const-async-unsafe.stderr
index 2e91beda1..2e91beda1 100644
--- a/src/test/ui/parser/issues/issue-76437-const-async-unsafe.stderr
+++ b/tests/ui/parser/issues/issue-76437-const-async-unsafe.stderr
diff --git a/src/test/ui/parser/issues/issue-76437-const-async.rs b/tests/ui/parser/issues/issue-76437-const-async.rs
index 3c789fdcd..3c789fdcd 100644
--- a/src/test/ui/parser/issues/issue-76437-const-async.rs
+++ b/tests/ui/parser/issues/issue-76437-const-async.rs
diff --git a/src/test/ui/parser/issues/issue-76437-const-async.stderr b/tests/ui/parser/issues/issue-76437-const-async.stderr
index 21b96c14d..21b96c14d 100644
--- a/src/test/ui/parser/issues/issue-76437-const-async.stderr
+++ b/tests/ui/parser/issues/issue-76437-const-async.stderr
diff --git a/src/test/ui/parser/issues/issue-76437-const.rs b/tests/ui/parser/issues/issue-76437-const.rs
index d3815a523..d3815a523 100644
--- a/src/test/ui/parser/issues/issue-76437-const.rs
+++ b/tests/ui/parser/issues/issue-76437-const.rs
diff --git a/src/test/ui/parser/issues/issue-76437-const.stderr b/tests/ui/parser/issues/issue-76437-const.stderr
index cf80d9a90..cf80d9a90 100644
--- a/src/test/ui/parser/issues/issue-76437-const.stderr
+++ b/tests/ui/parser/issues/issue-76437-const.stderr
diff --git a/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.rs b/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.rs
index daa1d1207..daa1d1207 100644
--- a/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.rs
+++ b/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.rs
diff --git a/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr b/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr
index fa8f13721..fa8f13721 100644
--- a/src/test/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr
+++ b/tests/ui/parser/issues/issue-76437-pub-crate-unsafe.stderr
diff --git a/src/test/ui/parser/issues/issue-76437-unsafe.rs b/tests/ui/parser/issues/issue-76437-unsafe.rs
index 785a79a79..785a79a79 100644
--- a/src/test/ui/parser/issues/issue-76437-unsafe.rs
+++ b/tests/ui/parser/issues/issue-76437-unsafe.rs
diff --git a/src/test/ui/parser/issues/issue-76437-unsafe.stderr b/tests/ui/parser/issues/issue-76437-unsafe.stderr
index c63292ef8..c63292ef8 100644
--- a/src/test/ui/parser/issues/issue-76437-unsafe.stderr
+++ b/tests/ui/parser/issues/issue-76437-unsafe.stderr
diff --git a/src/test/ui/parser/issues/issue-76597.fixed b/tests/ui/parser/issues/issue-76597.fixed
index 2d7a30b83..2d7a30b83 100644
--- a/src/test/ui/parser/issues/issue-76597.fixed
+++ b/tests/ui/parser/issues/issue-76597.fixed
diff --git a/src/test/ui/parser/issues/issue-76597.rs b/tests/ui/parser/issues/issue-76597.rs
index 521b9c64b..521b9c64b 100644
--- a/src/test/ui/parser/issues/issue-76597.rs
+++ b/tests/ui/parser/issues/issue-76597.rs
diff --git a/src/test/ui/parser/issues/issue-76597.stderr b/tests/ui/parser/issues/issue-76597.stderr
index 50b23329f..50b23329f 100644
--- a/src/test/ui/parser/issues/issue-76597.stderr
+++ b/tests/ui/parser/issues/issue-76597.stderr
diff --git a/src/test/ui/parser/issues/issue-7970b.rs b/tests/ui/parser/issues/issue-7970b.rs
index 1c4abce39..1c4abce39 100644
--- a/src/test/ui/parser/issues/issue-7970b.rs
+++ b/tests/ui/parser/issues/issue-7970b.rs
diff --git a/src/test/ui/parser/issues/issue-7970b.stderr b/tests/ui/parser/issues/issue-7970b.stderr
index a62226a8a..a62226a8a 100644
--- a/src/test/ui/parser/issues/issue-7970b.stderr
+++ b/tests/ui/parser/issues/issue-7970b.stderr
diff --git a/src/test/ui/parser/issues/issue-81806.rs b/tests/ui/parser/issues/issue-81806.rs
index ca86788df..ca86788df 100644
--- a/src/test/ui/parser/issues/issue-81806.rs
+++ b/tests/ui/parser/issues/issue-81806.rs
diff --git a/src/test/ui/parser/issues/issue-81806.stderr b/tests/ui/parser/issues/issue-81806.stderr
index 40873388d..40873388d 100644
--- a/src/test/ui/parser/issues/issue-81806.stderr
+++ b/tests/ui/parser/issues/issue-81806.stderr
diff --git a/src/test/ui/parser/issues/issue-83639.rs b/tests/ui/parser/issues/issue-83639.rs
index 6ddbedfa0..6ddbedfa0 100644
--- a/src/test/ui/parser/issues/issue-83639.rs
+++ b/tests/ui/parser/issues/issue-83639.rs
diff --git a/src/test/ui/parser/issues/issue-83639.stderr b/tests/ui/parser/issues/issue-83639.stderr
index 4c10df191..4c10df191 100644
--- a/src/test/ui/parser/issues/issue-83639.stderr
+++ b/tests/ui/parser/issues/issue-83639.stderr
diff --git a/src/test/ui/parser/issues/issue-84104.rs b/tests/ui/parser/issues/issue-84104.rs
index 998949b94..998949b94 100644
--- a/src/test/ui/parser/issues/issue-84104.rs
+++ b/tests/ui/parser/issues/issue-84104.rs
diff --git a/src/test/ui/parser/issues/issue-84104.stderr b/tests/ui/parser/issues/issue-84104.stderr
index aff31f2c9..aff31f2c9 100644
--- a/src/test/ui/parser/issues/issue-84104.stderr
+++ b/tests/ui/parser/issues/issue-84104.stderr
diff --git a/src/test/ui/parser/issues/issue-84117.rs b/tests/ui/parser/issues/issue-84117.rs
index c9ebf1335..c9ebf1335 100644
--- a/src/test/ui/parser/issues/issue-84117.rs
+++ b/tests/ui/parser/issues/issue-84117.rs
diff --git a/src/test/ui/parser/issues/issue-84117.stderr b/tests/ui/parser/issues/issue-84117.stderr
index 237bc11bd..237bc11bd 100644
--- a/src/test/ui/parser/issues/issue-84117.stderr
+++ b/tests/ui/parser/issues/issue-84117.stderr
diff --git a/src/test/ui/parser/issues/issue-84148-1.rs b/tests/ui/parser/issues/issue-84148-1.rs
index 9fa8086c2..9fa8086c2 100644
--- a/src/test/ui/parser/issues/issue-84148-1.rs
+++ b/tests/ui/parser/issues/issue-84148-1.rs
diff --git a/src/test/ui/parser/issues/issue-84148-1.stderr b/tests/ui/parser/issues/issue-84148-1.stderr
index 9261067c2..9261067c2 100644
--- a/src/test/ui/parser/issues/issue-84148-1.stderr
+++ b/tests/ui/parser/issues/issue-84148-1.stderr
diff --git a/src/test/ui/parser/issues/issue-84148-2.rs b/tests/ui/parser/issues/issue-84148-2.rs
index 2f6a7facf..2f6a7facf 100644
--- a/src/test/ui/parser/issues/issue-84148-2.rs
+++ b/tests/ui/parser/issues/issue-84148-2.rs
diff --git a/src/test/ui/parser/issues/issue-84148-2.stderr b/tests/ui/parser/issues/issue-84148-2.stderr
index 71d543f9b..71d543f9b 100644
--- a/src/test/ui/parser/issues/issue-84148-2.stderr
+++ b/tests/ui/parser/issues/issue-84148-2.stderr
diff --git a/src/test/ui/parser/issues/issue-8537.rs b/tests/ui/parser/issues/issue-8537.rs
index 9d0cbce6c..9d0cbce6c 100644
--- a/src/test/ui/parser/issues/issue-8537.rs
+++ b/tests/ui/parser/issues/issue-8537.rs
diff --git a/src/test/ui/parser/issues/issue-8537.stderr b/tests/ui/parser/issues/issue-8537.stderr
index 523cc9dc5..523cc9dc5 100644
--- a/src/test/ui/parser/issues/issue-8537.stderr
+++ b/tests/ui/parser/issues/issue-8537.stderr
diff --git a/src/test/ui/parser/issues/issue-86895.rs b/tests/ui/parser/issues/issue-86895.rs
index 4cd098431..4cd098431 100644
--- a/src/test/ui/parser/issues/issue-86895.rs
+++ b/tests/ui/parser/issues/issue-86895.rs
diff --git a/src/test/ui/parser/issues/issue-86895.stderr b/tests/ui/parser/issues/issue-86895.stderr
index 575d857c0..575d857c0 100644
--- a/src/test/ui/parser/issues/issue-86895.stderr
+++ b/tests/ui/parser/issues/issue-86895.stderr
diff --git a/src/test/ui/parser/issues/issue-87086-colon-path-sep.rs b/tests/ui/parser/issues/issue-87086-colon-path-sep.rs
index 0b7b67496..0b7b67496 100644
--- a/src/test/ui/parser/issues/issue-87086-colon-path-sep.rs
+++ b/tests/ui/parser/issues/issue-87086-colon-path-sep.rs
diff --git a/src/test/ui/parser/issues/issue-87086-colon-path-sep.stderr b/tests/ui/parser/issues/issue-87086-colon-path-sep.stderr
index 2050a16be..2050a16be 100644
--- a/src/test/ui/parser/issues/issue-87086-colon-path-sep.stderr
+++ b/tests/ui/parser/issues/issue-87086-colon-path-sep.stderr
diff --git a/src/test/ui/parser/issues/issue-87197-missing-semicolon.fixed b/tests/ui/parser/issues/issue-87197-missing-semicolon.fixed
index 53f071db7..53f071db7 100644
--- a/src/test/ui/parser/issues/issue-87197-missing-semicolon.fixed
+++ b/tests/ui/parser/issues/issue-87197-missing-semicolon.fixed
diff --git a/src/test/ui/parser/issues/issue-87197-missing-semicolon.rs b/tests/ui/parser/issues/issue-87197-missing-semicolon.rs
index db0edf452..db0edf452 100644
--- a/src/test/ui/parser/issues/issue-87197-missing-semicolon.rs
+++ b/tests/ui/parser/issues/issue-87197-missing-semicolon.rs
diff --git a/src/test/ui/parser/issues/issue-87197-missing-semicolon.stderr b/tests/ui/parser/issues/issue-87197-missing-semicolon.stderr
index 57772de1e..57772de1e 100644
--- a/src/test/ui/parser/issues/issue-87197-missing-semicolon.stderr
+++ b/tests/ui/parser/issues/issue-87197-missing-semicolon.stderr
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs b/tests/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs
index df0cd5439..df0cd5439 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr
index 977c6ebfe..977c6ebfe 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs b/tests/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs
index bbebc99e9..bbebc99e9 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr
index f455caba1..f455caba1 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs
index 4ff4cf5c8..4ff4cf5c8 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr
index e9eb14bf0..e9eb14bf0 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs
index 2f5fbc513..2f5fbc513 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr
index 0d2bc3472..0d2bc3472 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs
index df2412e3e..df2412e3e 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr
index 4224713cc..4224713cc 100644
--- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr
+++ b/tests/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr
diff --git a/src/test/ui/parser/issues/issue-87635.rs b/tests/ui/parser/issues/issue-87635.rs
index f70a87fb0..f70a87fb0 100644
--- a/src/test/ui/parser/issues/issue-87635.rs
+++ b/tests/ui/parser/issues/issue-87635.rs
diff --git a/src/test/ui/parser/issues/issue-87635.stderr b/tests/ui/parser/issues/issue-87635.stderr
index 1d459f1b9..1d459f1b9 100644
--- a/src/test/ui/parser/issues/issue-87635.stderr
+++ b/tests/ui/parser/issues/issue-87635.stderr
diff --git a/src/test/ui/parser/issues/issue-87812-path.rs b/tests/ui/parser/issues/issue-87812-path.rs
index b88780876..b88780876 100644
--- a/src/test/ui/parser/issues/issue-87812-path.rs
+++ b/tests/ui/parser/issues/issue-87812-path.rs
diff --git a/src/test/ui/parser/issues/issue-87812-path.stderr b/tests/ui/parser/issues/issue-87812-path.stderr
index f8ee05175..f8ee05175 100644
--- a/src/test/ui/parser/issues/issue-87812-path.stderr
+++ b/tests/ui/parser/issues/issue-87812-path.stderr
diff --git a/src/test/ui/parser/issues/issue-87812.rs b/tests/ui/parser/issues/issue-87812.rs
index 0ba87b995..0ba87b995 100644
--- a/src/test/ui/parser/issues/issue-87812.rs
+++ b/tests/ui/parser/issues/issue-87812.rs
diff --git a/src/test/ui/parser/issues/issue-87812.stderr b/tests/ui/parser/issues/issue-87812.stderr
index d61ee23a5..d61ee23a5 100644
--- a/src/test/ui/parser/issues/issue-87812.stderr
+++ b/tests/ui/parser/issues/issue-87812.stderr
diff --git a/src/test/ui/parser/issues/issue-88276-unary-plus.fixed b/tests/ui/parser/issues/issue-88276-unary-plus.fixed
index 25b7c340f..25b7c340f 100644
--- a/src/test/ui/parser/issues/issue-88276-unary-plus.fixed
+++ b/tests/ui/parser/issues/issue-88276-unary-plus.fixed
diff --git a/src/test/ui/parser/issues/issue-88276-unary-plus.rs b/tests/ui/parser/issues/issue-88276-unary-plus.rs
index 11b2e9d60..11b2e9d60 100644
--- a/src/test/ui/parser/issues/issue-88276-unary-plus.rs
+++ b/tests/ui/parser/issues/issue-88276-unary-plus.rs
diff --git a/src/test/ui/parser/issues/issue-88276-unary-plus.stderr b/tests/ui/parser/issues/issue-88276-unary-plus.stderr
index 363e08201..363e08201 100644
--- a/src/test/ui/parser/issues/issue-88276-unary-plus.stderr
+++ b/tests/ui/parser/issues/issue-88276-unary-plus.stderr
diff --git a/src/test/ui/parser/issues/issue-88583-union-as-ident.rs b/tests/ui/parser/issues/issue-88583-union-as-ident.rs
index b3d66d46b..b3d66d46b 100644
--- a/src/test/ui/parser/issues/issue-88583-union-as-ident.rs
+++ b/tests/ui/parser/issues/issue-88583-union-as-ident.rs
diff --git a/src/test/ui/parser/issues/issue-88770.rs b/tests/ui/parser/issues/issue-88770.rs
index bb69951c7..bb69951c7 100644
--- a/src/test/ui/parser/issues/issue-88770.rs
+++ b/tests/ui/parser/issues/issue-88770.rs
diff --git a/src/test/ui/parser/issues/issue-88770.stderr b/tests/ui/parser/issues/issue-88770.stderr
index 4e3a21613..4e3a21613 100644
--- a/src/test/ui/parser/issues/issue-88770.stderr
+++ b/tests/ui/parser/issues/issue-88770.stderr
diff --git a/src/test/ui/parser/issues/issue-88818.rs b/tests/ui/parser/issues/issue-88818.rs
index b9233ca83..b9233ca83 100644
--- a/src/test/ui/parser/issues/issue-88818.rs
+++ b/tests/ui/parser/issues/issue-88818.rs
diff --git a/src/test/ui/parser/issues/issue-88818.stderr b/tests/ui/parser/issues/issue-88818.stderr
index 6e624c5a2..6e624c5a2 100644
--- a/src/test/ui/parser/issues/issue-88818.stderr
+++ b/tests/ui/parser/issues/issue-88818.stderr
diff --git a/src/test/ui/parser/issues/issue-89388.rs b/tests/ui/parser/issues/issue-89388.rs
index 9153c071e..9153c071e 100644
--- a/src/test/ui/parser/issues/issue-89388.rs
+++ b/tests/ui/parser/issues/issue-89388.rs
diff --git a/src/test/ui/parser/issues/issue-89388.stderr b/tests/ui/parser/issues/issue-89388.stderr
index cf28bef0f..cf28bef0f 100644
--- a/src/test/ui/parser/issues/issue-89388.stderr
+++ b/tests/ui/parser/issues/issue-89388.stderr
diff --git a/src/test/ui/parser/issues/issue-89396.fixed b/tests/ui/parser/issues/issue-89396.fixed
index 823ad8cd1..823ad8cd1 100644
--- a/src/test/ui/parser/issues/issue-89396.fixed
+++ b/tests/ui/parser/issues/issue-89396.fixed
diff --git a/src/test/ui/parser/issues/issue-89396.rs b/tests/ui/parser/issues/issue-89396.rs
index f1d9efa52..f1d9efa52 100644
--- a/src/test/ui/parser/issues/issue-89396.rs
+++ b/tests/ui/parser/issues/issue-89396.rs
diff --git a/src/test/ui/parser/issues/issue-89396.stderr b/tests/ui/parser/issues/issue-89396.stderr
index 504420574..504420574 100644
--- a/src/test/ui/parser/issues/issue-89396.stderr
+++ b/tests/ui/parser/issues/issue-89396.stderr
diff --git a/src/test/ui/parser/issues/issue-89574.rs b/tests/ui/parser/issues/issue-89574.rs
index 0a477f1aa..0a477f1aa 100644
--- a/src/test/ui/parser/issues/issue-89574.rs
+++ b/tests/ui/parser/issues/issue-89574.rs
diff --git a/src/test/ui/parser/issues/issue-89574.stderr b/tests/ui/parser/issues/issue-89574.stderr
index fb1312c78..fb1312c78 100644
--- a/src/test/ui/parser/issues/issue-89574.stderr
+++ b/tests/ui/parser/issues/issue-89574.stderr
diff --git a/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
index fe67d9822..fe67d9822 100644
--- a/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
+++ b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.rs
diff --git a/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr
index a5ee24445..a5ee24445 100644
--- a/src/test/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr
+++ b/tests/ui/parser/issues/issue-89971-outer-attr-following-inner-attr-ice.stderr
diff --git a/src/test/ui/parser/issues/issue-90993.rs b/tests/ui/parser/issues/issue-90993.rs
index 40e6fc748..40e6fc748 100644
--- a/src/test/ui/parser/issues/issue-90993.rs
+++ b/tests/ui/parser/issues/issue-90993.rs
diff --git a/src/test/ui/parser/issues/issue-90993.stderr b/tests/ui/parser/issues/issue-90993.stderr
index ab6bce410..ab6bce410 100644
--- a/src/test/ui/parser/issues/issue-90993.stderr
+++ b/tests/ui/parser/issues/issue-90993.stderr
diff --git a/src/test/ui/parser/issues/issue-91461.rs b/tests/ui/parser/issues/issue-91461.rs
index 3e3c411c4..3e3c411c4 100644
--- a/src/test/ui/parser/issues/issue-91461.rs
+++ b/tests/ui/parser/issues/issue-91461.rs
diff --git a/src/test/ui/parser/issues/issue-91461.stderr b/tests/ui/parser/issues/issue-91461.stderr
index 94fcf1721..94fcf1721 100644
--- a/src/test/ui/parser/issues/issue-91461.stderr
+++ b/tests/ui/parser/issues/issue-91461.stderr
diff --git a/src/test/ui/parser/issues/issue-93282.rs b/tests/ui/parser/issues/issue-93282.rs
index 274245f1a..274245f1a 100644
--- a/src/test/ui/parser/issues/issue-93282.rs
+++ b/tests/ui/parser/issues/issue-93282.rs
diff --git a/src/test/ui/parser/issues/issue-93282.stderr b/tests/ui/parser/issues/issue-93282.stderr
index c6140bb82..c6140bb82 100644
--- a/src/test/ui/parser/issues/issue-93282.stderr
+++ b/tests/ui/parser/issues/issue-93282.stderr
diff --git a/src/test/ui/parser/issues/issue-93867.rs b/tests/ui/parser/issues/issue-93867.rs
index 507447923..507447923 100644
--- a/src/test/ui/parser/issues/issue-93867.rs
+++ b/tests/ui/parser/issues/issue-93867.rs
diff --git a/src/test/ui/parser/issues/issue-93867.stderr b/tests/ui/parser/issues/issue-93867.stderr
index ee0cb4efd..ee0cb4efd 100644
--- a/src/test/ui/parser/issues/issue-93867.stderr
+++ b/tests/ui/parser/issues/issue-93867.stderr
diff --git a/src/test/ui/parser/issues/issue-94340.rs b/tests/ui/parser/issues/issue-94340.rs
index d0fb84a68..d0fb84a68 100644
--- a/src/test/ui/parser/issues/issue-94340.rs
+++ b/tests/ui/parser/issues/issue-94340.rs
diff --git a/src/test/ui/parser/issues/issue-94340.stderr b/tests/ui/parser/issues/issue-94340.stderr
index 9fd7c38a8..9fd7c38a8 100644
--- a/src/test/ui/parser/issues/issue-94340.stderr
+++ b/tests/ui/parser/issues/issue-94340.stderr
diff --git a/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs b/tests/ui/parser/item-free-const-no-body-semantic-fail.rs
index 613b3c985..613b3c985 100644
--- a/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs
+++ b/tests/ui/parser/item-free-const-no-body-semantic-fail.rs
diff --git a/src/test/ui/parser/item-free-const-no-body-semantic-fail.stderr b/tests/ui/parser/item-free-const-no-body-semantic-fail.stderr
index 5365b0a1f..5365b0a1f 100644
--- a/src/test/ui/parser/item-free-const-no-body-semantic-fail.stderr
+++ b/tests/ui/parser/item-free-const-no-body-semantic-fail.stderr
diff --git a/src/test/ui/parser/item-free-const-no-body-syntactic-pass.rs b/tests/ui/parser/item-free-const-no-body-syntactic-pass.rs
index acfdd3c36..acfdd3c36 100644
--- a/src/test/ui/parser/item-free-const-no-body-syntactic-pass.rs
+++ b/tests/ui/parser/item-free-const-no-body-syntactic-pass.rs
diff --git a/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs b/tests/ui/parser/item-free-static-no-body-semantic-fail.rs
index 780479e3d..780479e3d 100644
--- a/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs
+++ b/tests/ui/parser/item-free-static-no-body-semantic-fail.rs
diff --git a/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr b/tests/ui/parser/item-free-static-no-body-semantic-fail.stderr
index 1b61e4305..1b61e4305 100644
--- a/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr
+++ b/tests/ui/parser/item-free-static-no-body-semantic-fail.stderr
diff --git a/src/test/ui/parser/item-free-static-no-body-syntactic-pass.rs b/tests/ui/parser/item-free-static-no-body-syntactic-pass.rs
index db0039204..db0039204 100644
--- a/src/test/ui/parser/item-free-static-no-body-syntactic-pass.rs
+++ b/tests/ui/parser/item-free-static-no-body-syntactic-pass.rs
diff --git a/src/test/ui/parser/item-free-type-bounds-semantic-fail.rs b/tests/ui/parser/item-free-type-bounds-semantic-fail.rs
index 9db4111fb..9db4111fb 100644
--- a/src/test/ui/parser/item-free-type-bounds-semantic-fail.rs
+++ b/tests/ui/parser/item-free-type-bounds-semantic-fail.rs
diff --git a/src/test/ui/parser/item-free-type-bounds-semantic-fail.stderr b/tests/ui/parser/item-free-type-bounds-semantic-fail.stderr
index 1b0865128..1b0865128 100644
--- a/src/test/ui/parser/item-free-type-bounds-semantic-fail.stderr
+++ b/tests/ui/parser/item-free-type-bounds-semantic-fail.stderr
diff --git a/src/test/ui/parser/item-free-type-bounds-syntactic-pass.rs b/tests/ui/parser/item-free-type-bounds-syntactic-pass.rs
index 58fc926d0..58fc926d0 100644
--- a/src/test/ui/parser/item-free-type-bounds-syntactic-pass.rs
+++ b/tests/ui/parser/item-free-type-bounds-syntactic-pass.rs
diff --git a/src/test/ui/parser/item-kw-case-mismatch.fixed b/tests/ui/parser/item-kw-case-mismatch.fixed
index 1794268f2..1794268f2 100644
--- a/src/test/ui/parser/item-kw-case-mismatch.fixed
+++ b/tests/ui/parser/item-kw-case-mismatch.fixed
diff --git a/src/test/ui/parser/item-kw-case-mismatch.rs b/tests/ui/parser/item-kw-case-mismatch.rs
index ac8390efd..ac8390efd 100644
--- a/src/test/ui/parser/item-kw-case-mismatch.rs
+++ b/tests/ui/parser/item-kw-case-mismatch.rs
diff --git a/src/test/ui/parser/item-kw-case-mismatch.stderr b/tests/ui/parser/item-kw-case-mismatch.stderr
index e66dae825..e66dae825 100644
--- a/src/test/ui/parser/item-kw-case-mismatch.stderr
+++ b/tests/ui/parser/item-kw-case-mismatch.stderr
diff --git a/src/test/ui/parser/item-needs-block.rs b/tests/ui/parser/item-needs-block.rs
index 4edac588e..4edac588e 100644
--- a/src/test/ui/parser/item-needs-block.rs
+++ b/tests/ui/parser/item-needs-block.rs
diff --git a/src/test/ui/parser/item-needs-block.stderr b/tests/ui/parser/item-needs-block.stderr
index 3cabd0c73..3cabd0c73 100644
--- a/src/test/ui/parser/item-needs-block.stderr
+++ b/tests/ui/parser/item-needs-block.stderr
diff --git a/src/test/ui/parser/keyword-abstract.rs b/tests/ui/parser/keyword-abstract.rs
index 570206575..570206575 100644
--- a/src/test/ui/parser/keyword-abstract.rs
+++ b/tests/ui/parser/keyword-abstract.rs
diff --git a/src/test/ui/parser/keyword-abstract.stderr b/tests/ui/parser/keyword-abstract.stderr
index b7d1ce7cd..b7d1ce7cd 100644
--- a/src/test/ui/parser/keyword-abstract.stderr
+++ b/tests/ui/parser/keyword-abstract.stderr
diff --git a/src/test/ui/parser/keyword-as-as-identifier.rs b/tests/ui/parser/keyword-as-as-identifier.rs
index cd47c8a39..cd47c8a39 100644
--- a/src/test/ui/parser/keyword-as-as-identifier.rs
+++ b/tests/ui/parser/keyword-as-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-as-as-identifier.stderr b/tests/ui/parser/keyword-as-as-identifier.stderr
index 3c5ad950d..3c5ad950d 100644
--- a/src/test/ui/parser/keyword-as-as-identifier.stderr
+++ b/tests/ui/parser/keyword-as-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-box-as-identifier.rs b/tests/ui/parser/keyword-box-as-identifier.rs
index 2cf49b66b..2cf49b66b 100644
--- a/src/test/ui/parser/keyword-box-as-identifier.rs
+++ b/tests/ui/parser/keyword-box-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-box-as-identifier.stderr b/tests/ui/parser/keyword-box-as-identifier.stderr
index eaa1f8003..eaa1f8003 100644
--- a/src/test/ui/parser/keyword-box-as-identifier.stderr
+++ b/tests/ui/parser/keyword-box-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-break-as-identifier.rs b/tests/ui/parser/keyword-break-as-identifier.rs
index 04b25a7aa..04b25a7aa 100644
--- a/src/test/ui/parser/keyword-break-as-identifier.rs
+++ b/tests/ui/parser/keyword-break-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-break-as-identifier.stderr b/tests/ui/parser/keyword-break-as-identifier.stderr
index a4535eb40..a4535eb40 100644
--- a/src/test/ui/parser/keyword-break-as-identifier.stderr
+++ b/tests/ui/parser/keyword-break-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-const-as-identifier.rs b/tests/ui/parser/keyword-const-as-identifier.rs
index 6a2d926bf..6a2d926bf 100644
--- a/src/test/ui/parser/keyword-const-as-identifier.rs
+++ b/tests/ui/parser/keyword-const-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-const-as-identifier.stderr b/tests/ui/parser/keyword-const-as-identifier.stderr
index 31922f150..31922f150 100644
--- a/src/test/ui/parser/keyword-const-as-identifier.stderr
+++ b/tests/ui/parser/keyword-const-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-continue-as-identifier.rs b/tests/ui/parser/keyword-continue-as-identifier.rs
index cfdd62a2d..cfdd62a2d 100644
--- a/src/test/ui/parser/keyword-continue-as-identifier.rs
+++ b/tests/ui/parser/keyword-continue-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-continue-as-identifier.stderr b/tests/ui/parser/keyword-continue-as-identifier.stderr
index 81285633f..81285633f 100644
--- a/src/test/ui/parser/keyword-continue-as-identifier.stderr
+++ b/tests/ui/parser/keyword-continue-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-else-as-identifier.rs b/tests/ui/parser/keyword-else-as-identifier.rs
index f12dac3ff..f12dac3ff 100644
--- a/src/test/ui/parser/keyword-else-as-identifier.rs
+++ b/tests/ui/parser/keyword-else-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-else-as-identifier.stderr b/tests/ui/parser/keyword-else-as-identifier.stderr
index 2125fe84a..2125fe84a 100644
--- a/src/test/ui/parser/keyword-else-as-identifier.stderr
+++ b/tests/ui/parser/keyword-else-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-enum-as-identifier.rs b/tests/ui/parser/keyword-enum-as-identifier.rs
index fe66230d0..fe66230d0 100644
--- a/src/test/ui/parser/keyword-enum-as-identifier.rs
+++ b/tests/ui/parser/keyword-enum-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-enum-as-identifier.stderr b/tests/ui/parser/keyword-enum-as-identifier.stderr
index 92d092ccb..92d092ccb 100644
--- a/src/test/ui/parser/keyword-enum-as-identifier.stderr
+++ b/tests/ui/parser/keyword-enum-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-final.rs b/tests/ui/parser/keyword-final.rs
index a79a11032..a79a11032 100644
--- a/src/test/ui/parser/keyword-final.rs
+++ b/tests/ui/parser/keyword-final.rs
diff --git a/src/test/ui/parser/keyword-final.stderr b/tests/ui/parser/keyword-final.stderr
index f1f9f2e2c..f1f9f2e2c 100644
--- a/src/test/ui/parser/keyword-final.stderr
+++ b/tests/ui/parser/keyword-final.stderr
diff --git a/src/test/ui/parser/keyword-fn-as-identifier.rs b/tests/ui/parser/keyword-fn-as-identifier.rs
index f30e115f7..f30e115f7 100644
--- a/src/test/ui/parser/keyword-fn-as-identifier.rs
+++ b/tests/ui/parser/keyword-fn-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-fn-as-identifier.stderr b/tests/ui/parser/keyword-fn-as-identifier.stderr
index 645efbcae..645efbcae 100644
--- a/src/test/ui/parser/keyword-fn-as-identifier.stderr
+++ b/tests/ui/parser/keyword-fn-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-for-as-identifier.rs b/tests/ui/parser/keyword-for-as-identifier.rs
index 9e8a2ad53..9e8a2ad53 100644
--- a/src/test/ui/parser/keyword-for-as-identifier.rs
+++ b/tests/ui/parser/keyword-for-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-for-as-identifier.stderr b/tests/ui/parser/keyword-for-as-identifier.stderr
index 26407cc4d..26407cc4d 100644
--- a/src/test/ui/parser/keyword-for-as-identifier.stderr
+++ b/tests/ui/parser/keyword-for-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-if-as-identifier.rs b/tests/ui/parser/keyword-if-as-identifier.rs
index 0bd5756af..0bd5756af 100644
--- a/src/test/ui/parser/keyword-if-as-identifier.rs
+++ b/tests/ui/parser/keyword-if-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-if-as-identifier.stderr b/tests/ui/parser/keyword-if-as-identifier.stderr
index 26f9a15a7..26f9a15a7 100644
--- a/src/test/ui/parser/keyword-if-as-identifier.stderr
+++ b/tests/ui/parser/keyword-if-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-impl-as-identifier.rs b/tests/ui/parser/keyword-impl-as-identifier.rs
index df529bae0..df529bae0 100644
--- a/src/test/ui/parser/keyword-impl-as-identifier.rs
+++ b/tests/ui/parser/keyword-impl-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-impl-as-identifier.stderr b/tests/ui/parser/keyword-impl-as-identifier.stderr
index 73a50bc38..73a50bc38 100644
--- a/src/test/ui/parser/keyword-impl-as-identifier.stderr
+++ b/tests/ui/parser/keyword-impl-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-in-as-identifier.rs b/tests/ui/parser/keyword-in-as-identifier.rs
index e4499dea2..e4499dea2 100644
--- a/src/test/ui/parser/keyword-in-as-identifier.rs
+++ b/tests/ui/parser/keyword-in-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-in-as-identifier.stderr b/tests/ui/parser/keyword-in-as-identifier.stderr
index 98332b723..98332b723 100644
--- a/src/test/ui/parser/keyword-in-as-identifier.stderr
+++ b/tests/ui/parser/keyword-in-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-let-as-identifier.rs b/tests/ui/parser/keyword-let-as-identifier.rs
index 9b1183501..9b1183501 100644
--- a/src/test/ui/parser/keyword-let-as-identifier.rs
+++ b/tests/ui/parser/keyword-let-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-let-as-identifier.stderr b/tests/ui/parser/keyword-let-as-identifier.stderr
index 86faaed38..86faaed38 100644
--- a/src/test/ui/parser/keyword-let-as-identifier.stderr
+++ b/tests/ui/parser/keyword-let-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-loop-as-identifier.rs b/tests/ui/parser/keyword-loop-as-identifier.rs
index 46914a19b..46914a19b 100644
--- a/src/test/ui/parser/keyword-loop-as-identifier.rs
+++ b/tests/ui/parser/keyword-loop-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-loop-as-identifier.stderr b/tests/ui/parser/keyword-loop-as-identifier.stderr
index 304ad61cc..304ad61cc 100644
--- a/src/test/ui/parser/keyword-loop-as-identifier.stderr
+++ b/tests/ui/parser/keyword-loop-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-match-as-identifier.rs b/tests/ui/parser/keyword-match-as-identifier.rs
index d3cecb991..d3cecb991 100644
--- a/src/test/ui/parser/keyword-match-as-identifier.rs
+++ b/tests/ui/parser/keyword-match-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-match-as-identifier.stderr b/tests/ui/parser/keyword-match-as-identifier.stderr
index 25ac397fb..25ac397fb 100644
--- a/src/test/ui/parser/keyword-match-as-identifier.stderr
+++ b/tests/ui/parser/keyword-match-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-mod-as-identifier.rs b/tests/ui/parser/keyword-mod-as-identifier.rs
index b9c7b6c78..b9c7b6c78 100644
--- a/src/test/ui/parser/keyword-mod-as-identifier.rs
+++ b/tests/ui/parser/keyword-mod-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-mod-as-identifier.stderr b/tests/ui/parser/keyword-mod-as-identifier.stderr
index d5688e871..d5688e871 100644
--- a/src/test/ui/parser/keyword-mod-as-identifier.stderr
+++ b/tests/ui/parser/keyword-mod-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-move-as-identifier.rs b/tests/ui/parser/keyword-move-as-identifier.rs
index 65be02e3c..65be02e3c 100644
--- a/src/test/ui/parser/keyword-move-as-identifier.rs
+++ b/tests/ui/parser/keyword-move-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-move-as-identifier.stderr b/tests/ui/parser/keyword-move-as-identifier.stderr
index 75653cffc..75653cffc 100644
--- a/src/test/ui/parser/keyword-move-as-identifier.stderr
+++ b/tests/ui/parser/keyword-move-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-mut-as-identifier.rs b/tests/ui/parser/keyword-mut-as-identifier.rs
index 9b919d2b3..9b919d2b3 100644
--- a/src/test/ui/parser/keyword-mut-as-identifier.rs
+++ b/tests/ui/parser/keyword-mut-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-mut-as-identifier.stderr b/tests/ui/parser/keyword-mut-as-identifier.stderr
index 040960835..040960835 100644
--- a/src/test/ui/parser/keyword-mut-as-identifier.stderr
+++ b/tests/ui/parser/keyword-mut-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-override.rs b/tests/ui/parser/keyword-override.rs
index 009bebd7d..009bebd7d 100644
--- a/src/test/ui/parser/keyword-override.rs
+++ b/tests/ui/parser/keyword-override.rs
diff --git a/src/test/ui/parser/keyword-override.stderr b/tests/ui/parser/keyword-override.stderr
index cdb573686..cdb573686 100644
--- a/src/test/ui/parser/keyword-override.stderr
+++ b/tests/ui/parser/keyword-override.stderr
diff --git a/src/test/ui/parser/keyword-pub-as-identifier.rs b/tests/ui/parser/keyword-pub-as-identifier.rs
index 2b2bb1411..2b2bb1411 100644
--- a/src/test/ui/parser/keyword-pub-as-identifier.rs
+++ b/tests/ui/parser/keyword-pub-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-pub-as-identifier.stderr b/tests/ui/parser/keyword-pub-as-identifier.stderr
index 8d513507c..8d513507c 100644
--- a/src/test/ui/parser/keyword-pub-as-identifier.stderr
+++ b/tests/ui/parser/keyword-pub-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-ref-as-identifier.rs b/tests/ui/parser/keyword-ref-as-identifier.rs
index f5e04b5db..f5e04b5db 100644
--- a/src/test/ui/parser/keyword-ref-as-identifier.rs
+++ b/tests/ui/parser/keyword-ref-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-ref-as-identifier.stderr b/tests/ui/parser/keyword-ref-as-identifier.stderr
index 618043d89..618043d89 100644
--- a/src/test/ui/parser/keyword-ref-as-identifier.stderr
+++ b/tests/ui/parser/keyword-ref-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-return-as-identifier.rs b/tests/ui/parser/keyword-return-as-identifier.rs
index e1a2db5e4..e1a2db5e4 100644
--- a/src/test/ui/parser/keyword-return-as-identifier.rs
+++ b/tests/ui/parser/keyword-return-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-return-as-identifier.stderr b/tests/ui/parser/keyword-return-as-identifier.stderr
index eeb8e468b..eeb8e468b 100644
--- a/src/test/ui/parser/keyword-return-as-identifier.stderr
+++ b/tests/ui/parser/keyword-return-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-static-as-identifier.rs b/tests/ui/parser/keyword-static-as-identifier.rs
index 423b9854b..423b9854b 100644
--- a/src/test/ui/parser/keyword-static-as-identifier.rs
+++ b/tests/ui/parser/keyword-static-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-static-as-identifier.stderr b/tests/ui/parser/keyword-static-as-identifier.stderr
index a3213e2f2..a3213e2f2 100644
--- a/src/test/ui/parser/keyword-static-as-identifier.stderr
+++ b/tests/ui/parser/keyword-static-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-struct-as-identifier.rs b/tests/ui/parser/keyword-struct-as-identifier.rs
index 18cfe1159..18cfe1159 100644
--- a/src/test/ui/parser/keyword-struct-as-identifier.rs
+++ b/tests/ui/parser/keyword-struct-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-struct-as-identifier.stderr b/tests/ui/parser/keyword-struct-as-identifier.stderr
index b73361a55..b73361a55 100644
--- a/src/test/ui/parser/keyword-struct-as-identifier.stderr
+++ b/tests/ui/parser/keyword-struct-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-trait-as-identifier.rs b/tests/ui/parser/keyword-trait-as-identifier.rs
index 67f81167d..67f81167d 100644
--- a/src/test/ui/parser/keyword-trait-as-identifier.rs
+++ b/tests/ui/parser/keyword-trait-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-trait-as-identifier.stderr b/tests/ui/parser/keyword-trait-as-identifier.stderr
index 56ef5f606..56ef5f606 100644
--- a/src/test/ui/parser/keyword-trait-as-identifier.stderr
+++ b/tests/ui/parser/keyword-trait-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-try-as-identifier-edition2018.rs b/tests/ui/parser/keyword-try-as-identifier-edition2018.rs
index 4fa37bdb0..4fa37bdb0 100644
--- a/src/test/ui/parser/keyword-try-as-identifier-edition2018.rs
+++ b/tests/ui/parser/keyword-try-as-identifier-edition2018.rs
diff --git a/src/test/ui/parser/keyword-try-as-identifier-edition2018.stderr b/tests/ui/parser/keyword-try-as-identifier-edition2018.stderr
index 94a106d47..94a106d47 100644
--- a/src/test/ui/parser/keyword-try-as-identifier-edition2018.stderr
+++ b/tests/ui/parser/keyword-try-as-identifier-edition2018.stderr
diff --git a/src/test/ui/parser/keyword-type-as-identifier.rs b/tests/ui/parser/keyword-type-as-identifier.rs
index 04adddf72..04adddf72 100644
--- a/src/test/ui/parser/keyword-type-as-identifier.rs
+++ b/tests/ui/parser/keyword-type-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-type-as-identifier.stderr b/tests/ui/parser/keyword-type-as-identifier.stderr
index 624c1006b..624c1006b 100644
--- a/src/test/ui/parser/keyword-type-as-identifier.stderr
+++ b/tests/ui/parser/keyword-type-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-typeof.rs b/tests/ui/parser/keyword-typeof.rs
index 29dc77d27..29dc77d27 100644
--- a/src/test/ui/parser/keyword-typeof.rs
+++ b/tests/ui/parser/keyword-typeof.rs
diff --git a/src/test/ui/parser/keyword-typeof.stderr b/tests/ui/parser/keyword-typeof.stderr
index 4c5324505..4c5324505 100644
--- a/src/test/ui/parser/keyword-typeof.stderr
+++ b/tests/ui/parser/keyword-typeof.stderr
diff --git a/src/test/ui/parser/keyword-unsafe-as-identifier.rs b/tests/ui/parser/keyword-unsafe-as-identifier.rs
index 0ff6d188c..0ff6d188c 100644
--- a/src/test/ui/parser/keyword-unsafe-as-identifier.rs
+++ b/tests/ui/parser/keyword-unsafe-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-unsafe-as-identifier.stderr b/tests/ui/parser/keyword-unsafe-as-identifier.stderr
index b552c9cd3..b552c9cd3 100644
--- a/src/test/ui/parser/keyword-unsafe-as-identifier.stderr
+++ b/tests/ui/parser/keyword-unsafe-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-use-as-identifier.rs b/tests/ui/parser/keyword-use-as-identifier.rs
index 821bedee0..821bedee0 100644
--- a/src/test/ui/parser/keyword-use-as-identifier.rs
+++ b/tests/ui/parser/keyword-use-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-use-as-identifier.stderr b/tests/ui/parser/keyword-use-as-identifier.stderr
index 630798659..630798659 100644
--- a/src/test/ui/parser/keyword-use-as-identifier.stderr
+++ b/tests/ui/parser/keyword-use-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-where-as-identifier.rs b/tests/ui/parser/keyword-where-as-identifier.rs
index 56301bd20..56301bd20 100644
--- a/src/test/ui/parser/keyword-where-as-identifier.rs
+++ b/tests/ui/parser/keyword-where-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-where-as-identifier.stderr b/tests/ui/parser/keyword-where-as-identifier.stderr
index 9e72f7940..9e72f7940 100644
--- a/src/test/ui/parser/keyword-where-as-identifier.stderr
+++ b/tests/ui/parser/keyword-where-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword-while-as-identifier.rs b/tests/ui/parser/keyword-while-as-identifier.rs
index 22026d15d..22026d15d 100644
--- a/src/test/ui/parser/keyword-while-as-identifier.rs
+++ b/tests/ui/parser/keyword-while-as-identifier.rs
diff --git a/src/test/ui/parser/keyword-while-as-identifier.stderr b/tests/ui/parser/keyword-while-as-identifier.stderr
index 2bb62105d..2bb62105d 100644
--- a/src/test/ui/parser/keyword-while-as-identifier.stderr
+++ b/tests/ui/parser/keyword-while-as-identifier.stderr
diff --git a/src/test/ui/parser/keyword.rs b/tests/ui/parser/keyword.rs
index 1eb7886c5..1eb7886c5 100644
--- a/src/test/ui/parser/keyword.rs
+++ b/tests/ui/parser/keyword.rs
diff --git a/src/test/ui/parser/keyword.stderr b/tests/ui/parser/keyword.stderr
index ee7d72b39..ee7d72b39 100644
--- a/src/test/ui/parser/keyword.stderr
+++ b/tests/ui/parser/keyword.stderr
diff --git a/src/test/ui/parser/keywords-followed-by-double-colon.rs b/tests/ui/parser/keywords-followed-by-double-colon.rs
index 5c7049f7c..5c7049f7c 100644
--- a/src/test/ui/parser/keywords-followed-by-double-colon.rs
+++ b/tests/ui/parser/keywords-followed-by-double-colon.rs
diff --git a/src/test/ui/parser/keywords-followed-by-double-colon.stderr b/tests/ui/parser/keywords-followed-by-double-colon.stderr
index 4c4d5e5dd..4c4d5e5dd 100644
--- a/src/test/ui/parser/keywords-followed-by-double-colon.stderr
+++ b/tests/ui/parser/keywords-followed-by-double-colon.stderr
diff --git a/tests/ui/parser/kw-in-trait-bounds.rs b/tests/ui/parser/kw-in-trait-bounds.rs
new file mode 100644
index 000000000..e9e85339a
--- /dev/null
+++ b/tests/ui/parser/kw-in-trait-bounds.rs
@@ -0,0 +1,39 @@
+// edition:2018
+
+fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
+//~^ ERROR expected identifier, found keyword `fn`
+//~| ERROR expected identifier, found keyword `fn`
+//~| ERROR expected identifier, found keyword `fn`
+//~| HELP use `Fn` to refer to the trait
+//~| HELP use `Fn` to refer to the trait
+//~| HELP use `Fn` to refer to the trait
+where
+G: fn(),
+    //~^ ERROR expected identifier, found keyword `fn`
+    //~| HELP use `Fn` to refer to the trait
+{}
+
+fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+//~^ ERROR expected identifier, found keyword `struct`
+//~| ERROR expected identifier, found keyword `struct`
+//~| ERROR expected identifier, found keyword `struct`
+//~| ERROR cannot find trait `r#struct` in this scope
+//~| ERROR cannot find trait `r#struct` in this scope
+//~| ERROR cannot find trait `r#struct` in this scope
+//~| HELP  a trait with a similar name exists
+//~| HELP  a trait with a similar name exists
+//~| HELP  a trait with a similar name exists
+//~| HELP  escape `struct` to use it as an identifier
+//~| HELP  escape `struct` to use it as an identifier
+//~| HELP  escape `struct` to use it as an identifier
+where
+    B: struct,
+    //~^ ERROR expected identifier, found keyword `struct`
+    //~| ERROR cannot find trait `r#struct` in this scope
+    //~| HELP  a trait with a similar name exists
+    //~| HELP  escape `struct` to use it as an identifier
+{}
+
+trait Struct {}
+
+fn main() {}
diff --git a/tests/ui/parser/kw-in-trait-bounds.stderr b/tests/ui/parser/kw-in-trait-bounds.stderr
new file mode 100644
index 000000000..2d3aad4d6
--- /dev/null
+++ b/tests/ui/parser/kw-in-trait-bounds.stderr
@@ -0,0 +1,127 @@
+error: expected identifier, found keyword `fn`
+  --> $DIR/kw-in-trait-bounds.rs:3:10
+   |
+LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
+   |          ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | fn _f<F: Fn(), G>(_: impl fn(), _: &dyn fn())
+   |          ~~
+
+error: expected identifier, found keyword `fn`
+  --> $DIR/kw-in-trait-bounds.rs:3:27
+   |
+LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
+   |                           ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | fn _f<F: fn(), G>(_: impl Fn(), _: &dyn fn())
+   |                           ~~
+
+error: expected identifier, found keyword `fn`
+  --> $DIR/kw-in-trait-bounds.rs:3:41
+   |
+LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn fn())
+   |                                         ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | fn _f<F: fn(), G>(_: impl fn(), _: &dyn Fn())
+   |                                         ~~
+
+error: expected identifier, found keyword `fn`
+  --> $DIR/kw-in-trait-bounds.rs:11:4
+   |
+LL | G: fn(),
+   |    ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | G: Fn(),
+   |    ~~
+
+error: expected identifier, found keyword `struct`
+  --> $DIR/kw-in-trait-bounds.rs:16:10
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |          ^^^^^^ expected identifier, found keyword
+   |
+help: escape `struct` to use it as an identifier
+   |
+LL | fn _g<A: r#struct, B>(_: impl struct, _: &dyn struct)
+   |          ++
+
+error: expected identifier, found keyword `struct`
+  --> $DIR/kw-in-trait-bounds.rs:16:29
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |                             ^^^^^^ expected identifier, found keyword
+   |
+help: escape `struct` to use it as an identifier
+   |
+LL | fn _g<A: struct, B>(_: impl r#struct, _: &dyn struct)
+   |                             ++
+
+error: expected identifier, found keyword `struct`
+  --> $DIR/kw-in-trait-bounds.rs:16:45
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |                                             ^^^^^^ expected identifier, found keyword
+   |
+help: escape `struct` to use it as an identifier
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn r#struct)
+   |                                             ++
+
+error: expected identifier, found keyword `struct`
+  --> $DIR/kw-in-trait-bounds.rs:30:8
+   |
+LL |     B: struct,
+   |        ^^^^^^ expected identifier, found keyword
+   |
+help: escape `struct` to use it as an identifier
+   |
+LL |     B: r#struct,
+   |        ++
+
+error[E0405]: cannot find trait `r#struct` in this scope
+  --> $DIR/kw-in-trait-bounds.rs:16:10
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |          ^^^^^^ help: a trait with a similar name exists (notice the capitalization): `Struct`
+...
+LL | trait Struct {}
+   | ------------ similarly named trait `Struct` defined here
+
+error[E0405]: cannot find trait `r#struct` in this scope
+  --> $DIR/kw-in-trait-bounds.rs:30:8
+   |
+LL |     B: struct,
+   |        ^^^^^^ help: a trait with a similar name exists (notice the capitalization): `Struct`
+...
+LL | trait Struct {}
+   | ------------ similarly named trait `Struct` defined here
+
+error[E0405]: cannot find trait `r#struct` in this scope
+  --> $DIR/kw-in-trait-bounds.rs:16:29
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |                             ^^^^^^ help: a trait with a similar name exists (notice the capitalization): `Struct`
+...
+LL | trait Struct {}
+   | ------------ similarly named trait `Struct` defined here
+
+error[E0405]: cannot find trait `r#struct` in this scope
+  --> $DIR/kw-in-trait-bounds.rs:16:45
+   |
+LL | fn _g<A: struct, B>(_: impl struct, _: &dyn struct)
+   |                                             ^^^^^^ help: a trait with a similar name exists (notice the capitalization): `Struct`
+...
+LL | trait Struct {}
+   | ------------ similarly named trait `Struct` defined here
+
+error: aborting due to 12 previous errors
+
+For more information about this error, try `rustc --explain E0405`.
diff --git a/src/test/ui/parser/label-after-block-like.rs b/tests/ui/parser/label-after-block-like.rs
index 55f3f8f9f..55f3f8f9f 100644
--- a/src/test/ui/parser/label-after-block-like.rs
+++ b/tests/ui/parser/label-after-block-like.rs
diff --git a/src/test/ui/parser/label-after-block-like.stderr b/tests/ui/parser/label-after-block-like.stderr
index 8ff50b124..8ff50b124 100644
--- a/src/test/ui/parser/label-after-block-like.stderr
+++ b/tests/ui/parser/label-after-block-like.stderr
diff --git a/src/test/ui/parser/label-is-actually-char.rs b/tests/ui/parser/label-is-actually-char.rs
index 183da603d..183da603d 100644
--- a/src/test/ui/parser/label-is-actually-char.rs
+++ b/tests/ui/parser/label-is-actually-char.rs
diff --git a/src/test/ui/parser/label-is-actually-char.stderr b/tests/ui/parser/label-is-actually-char.stderr
index 28c8d2ada..28c8d2ada 100644
--- a/src/test/ui/parser/label-is-actually-char.stderr
+++ b/tests/ui/parser/label-is-actually-char.stderr
diff --git a/src/test/ui/parser/labeled-no-colon-expr.rs b/tests/ui/parser/labeled-no-colon-expr.rs
index d9ebd7473..d9ebd7473 100644
--- a/src/test/ui/parser/labeled-no-colon-expr.rs
+++ b/tests/ui/parser/labeled-no-colon-expr.rs
diff --git a/src/test/ui/parser/labeled-no-colon-expr.stderr b/tests/ui/parser/labeled-no-colon-expr.stderr
index 62288fe15..62288fe15 100644
--- a/src/test/ui/parser/labeled-no-colon-expr.stderr
+++ b/tests/ui/parser/labeled-no-colon-expr.stderr
diff --git a/src/test/ui/parser/let-binop.fixed b/tests/ui/parser/let-binop.fixed
index 93f7f97b0..93f7f97b0 100644
--- a/src/test/ui/parser/let-binop.fixed
+++ b/tests/ui/parser/let-binop.fixed
diff --git a/src/test/ui/parser/let-binop.rs b/tests/ui/parser/let-binop.rs
index 2adbceae5..2adbceae5 100644
--- a/src/test/ui/parser/let-binop.rs
+++ b/tests/ui/parser/let-binop.rs
diff --git a/src/test/ui/parser/let-binop.stderr b/tests/ui/parser/let-binop.stderr
index dd33e9157..dd33e9157 100644
--- a/src/test/ui/parser/let-binop.stderr
+++ b/tests/ui/parser/let-binop.stderr
diff --git a/src/test/ui/parser/lifetime-in-pattern-recover.rs b/tests/ui/parser/lifetime-in-pattern-recover.rs
index 7fb14b800..7fb14b800 100644
--- a/src/test/ui/parser/lifetime-in-pattern-recover.rs
+++ b/tests/ui/parser/lifetime-in-pattern-recover.rs
diff --git a/src/test/ui/parser/lifetime-in-pattern-recover.stderr b/tests/ui/parser/lifetime-in-pattern-recover.stderr
index 4bf7f57bf..4bf7f57bf 100644
--- a/src/test/ui/parser/lifetime-in-pattern-recover.stderr
+++ b/tests/ui/parser/lifetime-in-pattern-recover.stderr
diff --git a/src/test/ui/parser/lifetime-in-pattern.rs b/tests/ui/parser/lifetime-in-pattern.rs
index d3c638d0c..d3c638d0c 100644
--- a/src/test/ui/parser/lifetime-in-pattern.rs
+++ b/tests/ui/parser/lifetime-in-pattern.rs
diff --git a/src/test/ui/parser/lifetime-in-pattern.stderr b/tests/ui/parser/lifetime-in-pattern.stderr
index a1d721e74..a1d721e74 100644
--- a/src/test/ui/parser/lifetime-in-pattern.stderr
+++ b/tests/ui/parser/lifetime-in-pattern.stderr
diff --git a/src/test/ui/parser/lifetime-semicolon.fixed b/tests/ui/parser/lifetime-semicolon.fixed
index 482b77046..482b77046 100644
--- a/src/test/ui/parser/lifetime-semicolon.fixed
+++ b/tests/ui/parser/lifetime-semicolon.fixed
diff --git a/src/test/ui/parser/lifetime-semicolon.rs b/tests/ui/parser/lifetime-semicolon.rs
index 21c8b0a7f..21c8b0a7f 100644
--- a/src/test/ui/parser/lifetime-semicolon.rs
+++ b/tests/ui/parser/lifetime-semicolon.rs
diff --git a/src/test/ui/parser/lifetime-semicolon.stderr b/tests/ui/parser/lifetime-semicolon.stderr
index ee486c236..ee486c236 100644
--- a/src/test/ui/parser/lifetime-semicolon.stderr
+++ b/tests/ui/parser/lifetime-semicolon.stderr
diff --git a/src/test/ui/parser/lifetime_starts_expressions.rs b/tests/ui/parser/lifetime_starts_expressions.rs
index 903b4de6e..903b4de6e 100644
--- a/src/test/ui/parser/lifetime_starts_expressions.rs
+++ b/tests/ui/parser/lifetime_starts_expressions.rs
diff --git a/src/test/ui/parser/lifetime_starts_expressions.stderr b/tests/ui/parser/lifetime_starts_expressions.stderr
index 82e274325..82e274325 100644
--- a/src/test/ui/parser/lifetime_starts_expressions.stderr
+++ b/tests/ui/parser/lifetime_starts_expressions.stderr
diff --git a/src/test/ui/parser/macro-bad-delimiter-ident.rs b/tests/ui/parser/macro-bad-delimiter-ident.rs
index f461f06b4..f461f06b4 100644
--- a/src/test/ui/parser/macro-bad-delimiter-ident.rs
+++ b/tests/ui/parser/macro-bad-delimiter-ident.rs
diff --git a/src/test/ui/parser/macro-bad-delimiter-ident.stderr b/tests/ui/parser/macro-bad-delimiter-ident.stderr
index f2365fed2..f2365fed2 100644
--- a/src/test/ui/parser/macro-bad-delimiter-ident.stderr
+++ b/tests/ui/parser/macro-bad-delimiter-ident.stderr
diff --git a/src/test/ui/parser/macro-braces-dot-question.rs b/tests/ui/parser/macro-braces-dot-question.rs
index 016b434a6..016b434a6 100644
--- a/src/test/ui/parser/macro-braces-dot-question.rs
+++ b/tests/ui/parser/macro-braces-dot-question.rs
diff --git a/src/test/ui/parser/macro-keyword.rs b/tests/ui/parser/macro-keyword.rs
index 58489fb2c..58489fb2c 100644
--- a/src/test/ui/parser/macro-keyword.rs
+++ b/tests/ui/parser/macro-keyword.rs
diff --git a/src/test/ui/parser/macro-keyword.stderr b/tests/ui/parser/macro-keyword.stderr
index d794671f8..d794671f8 100644
--- a/src/test/ui/parser/macro-keyword.stderr
+++ b/tests/ui/parser/macro-keyword.stderr
diff --git a/src/test/ui/parser/macro-mismatched-delim-brace-paren.rs b/tests/ui/parser/macro-mismatched-delim-brace-paren.rs
index 404aa7b80..404aa7b80 100644
--- a/src/test/ui/parser/macro-mismatched-delim-brace-paren.rs
+++ b/tests/ui/parser/macro-mismatched-delim-brace-paren.rs
diff --git a/src/test/ui/parser/macro-mismatched-delim-brace-paren.stderr b/tests/ui/parser/macro-mismatched-delim-brace-paren.stderr
index 077d31800..077d31800 100644
--- a/src/test/ui/parser/macro-mismatched-delim-brace-paren.stderr
+++ b/tests/ui/parser/macro-mismatched-delim-brace-paren.stderr
diff --git a/src/test/ui/parser/macro-mismatched-delim-paren-brace.rs b/tests/ui/parser/macro-mismatched-delim-paren-brace.rs
index 1a1b9edfb..1a1b9edfb 100644
--- a/src/test/ui/parser/macro-mismatched-delim-paren-brace.rs
+++ b/tests/ui/parser/macro-mismatched-delim-paren-brace.rs
diff --git a/src/test/ui/parser/macro-mismatched-delim-paren-brace.stderr b/tests/ui/parser/macro-mismatched-delim-paren-brace.stderr
index 967a3e6fd..967a3e6fd 100644
--- a/src/test/ui/parser/macro-mismatched-delim-paren-brace.stderr
+++ b/tests/ui/parser/macro-mismatched-delim-paren-brace.stderr
diff --git a/src/test/ui/parser/macro/bad-macro-argument.rs b/tests/ui/parser/macro/bad-macro-argument.rs
index 4b6d23890..4b6d23890 100644
--- a/src/test/ui/parser/macro/bad-macro-argument.rs
+++ b/tests/ui/parser/macro/bad-macro-argument.rs
diff --git a/src/test/ui/parser/macro/bad-macro-argument.stderr b/tests/ui/parser/macro/bad-macro-argument.stderr
index 3cd8accb6..3cd8accb6 100644
--- a/src/test/ui/parser/macro/bad-macro-argument.stderr
+++ b/tests/ui/parser/macro/bad-macro-argument.stderr
diff --git a/src/test/ui/parser/macro/issue-33569.rs b/tests/ui/parser/macro/issue-33569.rs
index 069d181e9..069d181e9 100644
--- a/src/test/ui/parser/macro/issue-33569.rs
+++ b/tests/ui/parser/macro/issue-33569.rs
diff --git a/src/test/ui/parser/macro/issue-33569.stderr b/tests/ui/parser/macro/issue-33569.stderr
index 0dca090fb..0dca090fb 100644
--- a/src/test/ui/parser/macro/issue-33569.stderr
+++ b/tests/ui/parser/macro/issue-33569.stderr
diff --git a/src/test/ui/parser/macro/issue-37113.rs b/tests/ui/parser/macro/issue-37113.rs
index 0044aa561..0044aa561 100644
--- a/src/test/ui/parser/macro/issue-37113.rs
+++ b/tests/ui/parser/macro/issue-37113.rs
diff --git a/src/test/ui/parser/macro/issue-37113.stderr b/tests/ui/parser/macro/issue-37113.stderr
index da9e743a0..da9e743a0 100644
--- a/src/test/ui/parser/macro/issue-37113.stderr
+++ b/tests/ui/parser/macro/issue-37113.stderr
diff --git a/src/test/ui/parser/macro/issue-37234.rs b/tests/ui/parser/macro/issue-37234.rs
index 4debc7479..4debc7479 100644
--- a/src/test/ui/parser/macro/issue-37234.rs
+++ b/tests/ui/parser/macro/issue-37234.rs
diff --git a/src/test/ui/parser/macro/issue-37234.stderr b/tests/ui/parser/macro/issue-37234.stderr
index d79196204..d79196204 100644
--- a/src/test/ui/parser/macro/issue-37234.stderr
+++ b/tests/ui/parser/macro/issue-37234.stderr
diff --git a/src/test/ui/parser/macro/literals-are-validated-before-expansion.rs b/tests/ui/parser/macro/literals-are-validated-before-expansion.rs
index c3fc754b5..c3fc754b5 100644
--- a/src/test/ui/parser/macro/literals-are-validated-before-expansion.rs
+++ b/tests/ui/parser/macro/literals-are-validated-before-expansion.rs
diff --git a/src/test/ui/parser/macro/literals-are-validated-before-expansion.stderr b/tests/ui/parser/macro/literals-are-validated-before-expansion.stderr
index e874f6249..e874f6249 100644
--- a/src/test/ui/parser/macro/literals-are-validated-before-expansion.stderr
+++ b/tests/ui/parser/macro/literals-are-validated-before-expansion.stderr
diff --git a/src/test/ui/parser/macro/macro-doc-comments-1.rs b/tests/ui/parser/macro/macro-doc-comments-1.rs
index 8d8103bb1..8d8103bb1 100644
--- a/src/test/ui/parser/macro/macro-doc-comments-1.rs
+++ b/tests/ui/parser/macro/macro-doc-comments-1.rs
diff --git a/src/test/ui/parser/macro/macro-doc-comments-1.stderr b/tests/ui/parser/macro/macro-doc-comments-1.stderr
index eaeb62d2c..eaeb62d2c 100644
--- a/src/test/ui/parser/macro/macro-doc-comments-1.stderr
+++ b/tests/ui/parser/macro/macro-doc-comments-1.stderr
diff --git a/src/test/ui/parser/macro/macro-doc-comments-2.rs b/tests/ui/parser/macro/macro-doc-comments-2.rs
index 8f33720ae..8f33720ae 100644
--- a/src/test/ui/parser/macro/macro-doc-comments-2.rs
+++ b/tests/ui/parser/macro/macro-doc-comments-2.rs
diff --git a/src/test/ui/parser/macro/macro-doc-comments-2.stderr b/tests/ui/parser/macro/macro-doc-comments-2.stderr
index 1dcd95f6f..1dcd95f6f 100644
--- a/src/test/ui/parser/macro/macro-doc-comments-2.stderr
+++ b/tests/ui/parser/macro/macro-doc-comments-2.stderr
diff --git a/src/test/ui/parser/macro/macro-incomplete-parse.rs b/tests/ui/parser/macro/macro-incomplete-parse.rs
index 544e4aa7b..544e4aa7b 100644
--- a/src/test/ui/parser/macro/macro-incomplete-parse.rs
+++ b/tests/ui/parser/macro/macro-incomplete-parse.rs
diff --git a/src/test/ui/parser/macro/macro-incomplete-parse.stderr b/tests/ui/parser/macro/macro-incomplete-parse.stderr
index 707417b72..707417b72 100644
--- a/src/test/ui/parser/macro/macro-incomplete-parse.stderr
+++ b/tests/ui/parser/macro/macro-incomplete-parse.stderr
diff --git a/src/test/ui/parser/macro/macro-repeat.rs b/tests/ui/parser/macro/macro-repeat.rs
index 3ffbea217..3ffbea217 100644
--- a/src/test/ui/parser/macro/macro-repeat.rs
+++ b/tests/ui/parser/macro/macro-repeat.rs
diff --git a/src/test/ui/parser/macro/macro-repeat.stderr b/tests/ui/parser/macro/macro-repeat.stderr
index 63554b197..63554b197 100644
--- a/src/test/ui/parser/macro/macro-repeat.stderr
+++ b/tests/ui/parser/macro/macro-repeat.stderr
diff --git a/src/test/ui/parser/macro/pub-item-macro.rs b/tests/ui/parser/macro/pub-item-macro.rs
index f5f8a01e6..f5f8a01e6 100644
--- a/src/test/ui/parser/macro/pub-item-macro.rs
+++ b/tests/ui/parser/macro/pub-item-macro.rs
diff --git a/src/test/ui/parser/macro/pub-item-macro.stderr b/tests/ui/parser/macro/pub-item-macro.stderr
index 9a2fffcce..9a2fffcce 100644
--- a/src/test/ui/parser/macro/pub-item-macro.stderr
+++ b/tests/ui/parser/macro/pub-item-macro.stderr
diff --git a/src/test/ui/parser/macro/trait-non-item-macros.rs b/tests/ui/parser/macro/trait-non-item-macros.rs
index 97fb564bf..97fb564bf 100644
--- a/src/test/ui/parser/macro/trait-non-item-macros.rs
+++ b/tests/ui/parser/macro/trait-non-item-macros.rs
diff --git a/src/test/ui/parser/macro/trait-non-item-macros.stderr b/tests/ui/parser/macro/trait-non-item-macros.stderr
index db20e6b24..db20e6b24 100644
--- a/src/test/ui/parser/macro/trait-non-item-macros.stderr
+++ b/tests/ui/parser/macro/trait-non-item-macros.stderr
diff --git a/src/test/ui/parser/macro/trait-object-macro-matcher.rs b/tests/ui/parser/macro/trait-object-macro-matcher.rs
index 560195977..560195977 100644
--- a/src/test/ui/parser/macro/trait-object-macro-matcher.rs
+++ b/tests/ui/parser/macro/trait-object-macro-matcher.rs
diff --git a/src/test/ui/parser/macro/trait-object-macro-matcher.stderr b/tests/ui/parser/macro/trait-object-macro-matcher.stderr
index 40082564b..40082564b 100644
--- a/src/test/ui/parser/macro/trait-object-macro-matcher.stderr
+++ b/tests/ui/parser/macro/trait-object-macro-matcher.stderr
diff --git a/src/test/ui/parser/macros-no-semicolon-items.rs b/tests/ui/parser/macros-no-semicolon-items.rs
index 3afc275d6..3afc275d6 100644
--- a/src/test/ui/parser/macros-no-semicolon-items.rs
+++ b/tests/ui/parser/macros-no-semicolon-items.rs
diff --git a/src/test/ui/parser/macros-no-semicolon-items.stderr b/tests/ui/parser/macros-no-semicolon-items.stderr
index 6d2431c4a..6d2431c4a 100644
--- a/src/test/ui/parser/macros-no-semicolon-items.stderr
+++ b/tests/ui/parser/macros-no-semicolon-items.stderr
diff --git a/src/test/ui/parser/macros-no-semicolon.rs b/tests/ui/parser/macros-no-semicolon.rs
index 24d1ae9e6..24d1ae9e6 100644
--- a/src/test/ui/parser/macros-no-semicolon.rs
+++ b/tests/ui/parser/macros-no-semicolon.rs
diff --git a/src/test/ui/parser/macros-no-semicolon.stderr b/tests/ui/parser/macros-no-semicolon.stderr
index f310662db..f310662db 100644
--- a/src/test/ui/parser/macros-no-semicolon.stderr
+++ b/tests/ui/parser/macros-no-semicolon.stderr
diff --git a/src/test/ui/parser/match-arm-without-braces.rs b/tests/ui/parser/match-arm-without-braces.rs
index bba38fd0f..bba38fd0f 100644
--- a/src/test/ui/parser/match-arm-without-braces.rs
+++ b/tests/ui/parser/match-arm-without-braces.rs
diff --git a/src/test/ui/parser/match-arm-without-braces.stderr b/tests/ui/parser/match-arm-without-braces.stderr
index 37d55aa53..37d55aa53 100644
--- a/src/test/ui/parser/match-arm-without-braces.stderr
+++ b/tests/ui/parser/match-arm-without-braces.stderr
diff --git a/src/test/ui/parser/match-arrows-block-then-binop.rs b/tests/ui/parser/match-arrows-block-then-binop.rs
index 56c917c74..56c917c74 100644
--- a/src/test/ui/parser/match-arrows-block-then-binop.rs
+++ b/tests/ui/parser/match-arrows-block-then-binop.rs
diff --git a/src/test/ui/parser/match-arrows-block-then-binop.stderr b/tests/ui/parser/match-arrows-block-then-binop.stderr
index cb361a3db..cb361a3db 100644
--- a/src/test/ui/parser/match-arrows-block-then-binop.stderr
+++ b/tests/ui/parser/match-arrows-block-then-binop.stderr
diff --git a/src/test/ui/parser/match-refactor-to-expr.fixed b/tests/ui/parser/match-refactor-to-expr.fixed
index 423147b27..423147b27 100644
--- a/src/test/ui/parser/match-refactor-to-expr.fixed
+++ b/tests/ui/parser/match-refactor-to-expr.fixed
diff --git a/src/test/ui/parser/match-refactor-to-expr.rs b/tests/ui/parser/match-refactor-to-expr.rs
index fcba5d044..fcba5d044 100644
--- a/src/test/ui/parser/match-refactor-to-expr.rs
+++ b/tests/ui/parser/match-refactor-to-expr.rs
diff --git a/src/test/ui/parser/match-refactor-to-expr.stderr b/tests/ui/parser/match-refactor-to-expr.stderr
index 851bef8f2..851bef8f2 100644
--- a/src/test/ui/parser/match-refactor-to-expr.stderr
+++ b/tests/ui/parser/match-refactor-to-expr.stderr
diff --git a/src/test/ui/parser/mbe_missing_right_paren.rs b/tests/ui/parser/mbe_missing_right_paren.rs
index 689176b3e..689176b3e 100644
--- a/src/test/ui/parser/mbe_missing_right_paren.rs
+++ b/tests/ui/parser/mbe_missing_right_paren.rs
diff --git a/src/test/ui/parser/mbe_missing_right_paren.stderr b/tests/ui/parser/mbe_missing_right_paren.stderr
index ccaf77d39..ccaf77d39 100644
--- a/src/test/ui/parser/mbe_missing_right_paren.stderr
+++ b/tests/ui/parser/mbe_missing_right_paren.stderr
diff --git a/tests/ui/parser/method-call-on-struct-literal-in-if-condition.rs b/tests/ui/parser/method-call-on-struct-literal-in-if-condition.rs
new file mode 100644
index 000000000..8be7c9ee8
--- /dev/null
+++ b/tests/ui/parser/method-call-on-struct-literal-in-if-condition.rs
@@ -0,0 +1,13 @@
+pub struct Example { a: i32 }
+
+impl Example {
+    fn is_pos(&self) -> bool { self.a > 0 }
+}
+
+fn one() -> i32 { 1 }
+
+fn main() {
+    if Example { a: one(), }.is_pos() { //~ ERROR invalid struct literal
+        println!("Positive!");
+    }
+}
diff --git a/tests/ui/parser/method-call-on-struct-literal-in-if-condition.stderr b/tests/ui/parser/method-call-on-struct-literal-in-if-condition.stderr
new file mode 100644
index 000000000..7fd7ffc94
--- /dev/null
+++ b/tests/ui/parser/method-call-on-struct-literal-in-if-condition.stderr
@@ -0,0 +1,13 @@
+error: invalid struct literal
+  --> $DIR/method-call-on-struct-literal-in-if-condition.rs:10:8
+   |
+LL |     if Example { a: one(), }.is_pos() {
+   |        ^^^^^^^^^^^^^^^^^^^^^
+   |
+help: you might need to surround the struct literal in parentheses
+   |
+LL |     if (Example { a: one(), }).is_pos() {
+   |        +                     +
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs b/tests/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs
index 8f46970b1..8f46970b1 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr b/tests/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr
index cc7cc0c55..cc7cc0c55 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-struct.rs b/tests/ui/parser/mismatched-braces/missing-close-brace-in-struct.rs
index 090a17b41..090a17b41 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-struct.rs
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-struct.rs
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-struct.stderr b/tests/ui/parser/mismatched-braces/missing-close-brace-in-struct.stderr
index ad1e90e43..ad1e90e43 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-struct.stderr
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-struct.stderr
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs b/tests/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs
index b6932deb5..b6932deb5 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr b/tests/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr
index 7c6254356..7c6254356 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr
+++ b/tests/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr
diff --git a/src/test/ui/parser/mismatched-delim-brace-empty-block.rs b/tests/ui/parser/mismatched-delim-brace-empty-block.rs
index 61d7a9af2..61d7a9af2 100644
--- a/src/test/ui/parser/mismatched-delim-brace-empty-block.rs
+++ b/tests/ui/parser/mismatched-delim-brace-empty-block.rs
diff --git a/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr b/tests/ui/parser/mismatched-delim-brace-empty-block.stderr
index 165eb8ae9..165eb8ae9 100644
--- a/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr
+++ b/tests/ui/parser/mismatched-delim-brace-empty-block.stderr
diff --git a/src/test/ui/parser/missing-closing-angle-bracket-eq-constraint.rs b/tests/ui/parser/missing-closing-angle-bracket-eq-constraint.rs
index da95c1bfa..da95c1bfa 100644
--- a/src/test/ui/parser/missing-closing-angle-bracket-eq-constraint.rs
+++ b/tests/ui/parser/missing-closing-angle-bracket-eq-constraint.rs
diff --git a/src/test/ui/parser/missing-closing-angle-bracket-eq-constraint.stderr b/tests/ui/parser/missing-closing-angle-bracket-eq-constraint.stderr
index bad241634..bad241634 100644
--- a/src/test/ui/parser/missing-closing-angle-bracket-eq-constraint.stderr
+++ b/tests/ui/parser/missing-closing-angle-bracket-eq-constraint.stderr
diff --git a/src/test/ui/parser/missing-closing-angle-bracket-struct-field-ty.rs b/tests/ui/parser/missing-closing-angle-bracket-struct-field-ty.rs
index d69a56c51..d69a56c51 100644
--- a/src/test/ui/parser/missing-closing-angle-bracket-struct-field-ty.rs
+++ b/tests/ui/parser/missing-closing-angle-bracket-struct-field-ty.rs
diff --git a/src/test/ui/parser/missing-closing-angle-bracket-struct-field-ty.stderr b/tests/ui/parser/missing-closing-angle-bracket-struct-field-ty.stderr
index 6d8b0c3fc..6d8b0c3fc 100644
--- a/src/test/ui/parser/missing-closing-angle-bracket-struct-field-ty.stderr
+++ b/tests/ui/parser/missing-closing-angle-bracket-struct-field-ty.stderr
diff --git a/src/test/ui/parser/missing-semicolon.rs b/tests/ui/parser/missing-semicolon.rs
index f68d177c0..f68d177c0 100644
--- a/src/test/ui/parser/missing-semicolon.rs
+++ b/tests/ui/parser/missing-semicolon.rs
diff --git a/src/test/ui/parser/missing-semicolon.stderr b/tests/ui/parser/missing-semicolon.stderr
index e0d5e84ec..e0d5e84ec 100644
--- a/src/test/ui/parser/missing-semicolon.stderr
+++ b/tests/ui/parser/missing-semicolon.stderr
diff --git a/src/test/ui/parser/missing_right_paren.rs b/tests/ui/parser/missing_right_paren.rs
index 810dee957..810dee957 100644
--- a/src/test/ui/parser/missing_right_paren.rs
+++ b/tests/ui/parser/missing_right_paren.rs
diff --git a/src/test/ui/parser/missing_right_paren.stderr b/tests/ui/parser/missing_right_paren.stderr
index 3fe0d0f42..3fe0d0f42 100644
--- a/src/test/ui/parser/missing_right_paren.stderr
+++ b/tests/ui/parser/missing_right_paren.stderr
diff --git a/src/test/ui/parser/misspelled-macro-rules.fixed b/tests/ui/parser/misspelled-macro-rules.fixed
index 62be913d8..62be913d8 100644
--- a/src/test/ui/parser/misspelled-macro-rules.fixed
+++ b/tests/ui/parser/misspelled-macro-rules.fixed
diff --git a/src/test/ui/parser/misspelled-macro-rules.rs b/tests/ui/parser/misspelled-macro-rules.rs
index 4290e6e5e..4290e6e5e 100644
--- a/src/test/ui/parser/misspelled-macro-rules.rs
+++ b/tests/ui/parser/misspelled-macro-rules.rs
diff --git a/src/test/ui/parser/misspelled-macro-rules.stderr b/tests/ui/parser/misspelled-macro-rules.stderr
index 56df71238..56df71238 100644
--- a/src/test/ui/parser/misspelled-macro-rules.stderr
+++ b/tests/ui/parser/misspelled-macro-rules.stderr
diff --git a/src/test/ui/parser/mod_file_not_exist.rs b/tests/ui/parser/mod_file_not_exist.rs
index 7b079eb02..7b079eb02 100644
--- a/src/test/ui/parser/mod_file_not_exist.rs
+++ b/tests/ui/parser/mod_file_not_exist.rs
diff --git a/src/test/ui/parser/mod_file_not_exist.stderr b/tests/ui/parser/mod_file_not_exist.stderr
index 62456d518..62456d518 100644
--- a/src/test/ui/parser/mod_file_not_exist.stderr
+++ b/tests/ui/parser/mod_file_not_exist.stderr
diff --git a/src/test/ui/parser/mod_file_not_exist_windows.rs b/tests/ui/parser/mod_file_not_exist_windows.rs
index 5db21e2bb..5db21e2bb 100644
--- a/src/test/ui/parser/mod_file_not_exist_windows.rs
+++ b/tests/ui/parser/mod_file_not_exist_windows.rs
diff --git a/src/test/ui/parser/mod_file_not_exist_windows.stderr b/tests/ui/parser/mod_file_not_exist_windows.stderr
index d5143dbe9..d5143dbe9 100644
--- a/src/test/ui/parser/mod_file_not_exist_windows.stderr
+++ b/tests/ui/parser/mod_file_not_exist_windows.stderr
diff --git a/src/test/ui/parser/mod_file_with_path_attr.rs b/tests/ui/parser/mod_file_with_path_attr.rs
index 9450d89e5..9450d89e5 100644
--- a/src/test/ui/parser/mod_file_with_path_attr.rs
+++ b/tests/ui/parser/mod_file_with_path_attr.rs
diff --git a/src/test/ui/parser/mod_file_with_path_attr.stderr b/tests/ui/parser/mod_file_with_path_attr.stderr
index cd1add73d..cd1add73d 100644
--- a/src/test/ui/parser/mod_file_with_path_attr.stderr
+++ b/tests/ui/parser/mod_file_with_path_attr.stderr
diff --git a/src/test/ui/parser/multibyte-char-use-seperator-issue-80134.rs b/tests/ui/parser/multibyte-char-use-seperator-issue-80134.rs
index 7e7995d67..7e7995d67 100644
--- a/src/test/ui/parser/multibyte-char-use-seperator-issue-80134.rs
+++ b/tests/ui/parser/multibyte-char-use-seperator-issue-80134.rs
diff --git a/src/test/ui/parser/multibyte-char-use-seperator-issue-80134.stderr b/tests/ui/parser/multibyte-char-use-seperator-issue-80134.stderr
index 21e71aa12..21e71aa12 100644
--- a/src/test/ui/parser/multibyte-char-use-seperator-issue-80134.stderr
+++ b/tests/ui/parser/multibyte-char-use-seperator-issue-80134.stderr
diff --git a/src/test/ui/parser/multiline-comment-line-tracking.rs b/tests/ui/parser/multiline-comment-line-tracking.rs
index d4735e8a7..d4735e8a7 100644
--- a/src/test/ui/parser/multiline-comment-line-tracking.rs
+++ b/tests/ui/parser/multiline-comment-line-tracking.rs
diff --git a/src/test/ui/parser/multiline-comment-line-tracking.stderr b/tests/ui/parser/multiline-comment-line-tracking.stderr
index cac0c801a..cac0c801a 100644
--- a/src/test/ui/parser/multiline-comment-line-tracking.stderr
+++ b/tests/ui/parser/multiline-comment-line-tracking.stderr
diff --git a/src/test/ui/parser/multitrait.rs b/tests/ui/parser/multitrait.rs
index f9b4b37ac..f9b4b37ac 100644
--- a/src/test/ui/parser/multitrait.rs
+++ b/tests/ui/parser/multitrait.rs
diff --git a/src/test/ui/parser/multitrait.stderr b/tests/ui/parser/multitrait.stderr
index 5a8bb2f7a..5a8bb2f7a 100644
--- a/src/test/ui/parser/multitrait.stderr
+++ b/tests/ui/parser/multitrait.stderr
diff --git a/src/test/ui/parser/mut-patterns.rs b/tests/ui/parser/mut-patterns.rs
index 8b83d6ab2..8b83d6ab2 100644
--- a/src/test/ui/parser/mut-patterns.rs
+++ b/tests/ui/parser/mut-patterns.rs
diff --git a/src/test/ui/parser/mut-patterns.stderr b/tests/ui/parser/mut-patterns.stderr
index f179d8c9e..f179d8c9e 100644
--- a/src/test/ui/parser/mut-patterns.stderr
+++ b/tests/ui/parser/mut-patterns.stderr
diff --git a/tests/ui/parser/nested-bad-turbofish.rs b/tests/ui/parser/nested-bad-turbofish.rs
new file mode 100644
index 000000000..02099fde2
--- /dev/null
+++ b/tests/ui/parser/nested-bad-turbofish.rs
@@ -0,0 +1,3 @@
+fn main() {
+    foo<<S as T>::V>(); //~ ERROR
+}
diff --git a/tests/ui/parser/nested-bad-turbofish.stderr b/tests/ui/parser/nested-bad-turbofish.stderr
new file mode 100644
index 000000000..d82fa80e5
--- /dev/null
+++ b/tests/ui/parser/nested-bad-turbofish.stderr
@@ -0,0 +1,11 @@
+error: comparison operators cannot be chained
+  --> $DIR/nested-bad-turbofish.rs:2:16
+   |
+LL |     foo<<S as T>::V>();
+   |                ^   ^
+   |
+   = help: use `::<...>` instead of `<...>` to specify lifetime, type, or const arguments
+   = help: or use `(...)` if you meant to specify fn arguments
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/nested-missing-closing-angle-bracket.rs b/tests/ui/parser/nested-missing-closing-angle-bracket.rs
index 84ffdd176..84ffdd176 100644
--- a/src/test/ui/parser/nested-missing-closing-angle-bracket.rs
+++ b/tests/ui/parser/nested-missing-closing-angle-bracket.rs
diff --git a/src/test/ui/parser/nested-missing-closing-angle-bracket.stderr b/tests/ui/parser/nested-missing-closing-angle-bracket.stderr
index b85bc0256..b85bc0256 100644
--- a/src/test/ui/parser/nested-missing-closing-angle-bracket.stderr
+++ b/tests/ui/parser/nested-missing-closing-angle-bracket.stderr
diff --git a/src/test/ui/parser/new-unicode-escapes-1.rs b/tests/ui/parser/new-unicode-escapes-1.rs
index d6a54660e..d6a54660e 100644
--- a/src/test/ui/parser/new-unicode-escapes-1.rs
+++ b/tests/ui/parser/new-unicode-escapes-1.rs
diff --git a/src/test/ui/parser/new-unicode-escapes-1.stderr b/tests/ui/parser/new-unicode-escapes-1.stderr
index d133e46b4..d133e46b4 100644
--- a/src/test/ui/parser/new-unicode-escapes-1.stderr
+++ b/tests/ui/parser/new-unicode-escapes-1.stderr
diff --git a/src/test/ui/parser/new-unicode-escapes-2.rs b/tests/ui/parser/new-unicode-escapes-2.rs
index cbb614c19..cbb614c19 100644
--- a/src/test/ui/parser/new-unicode-escapes-2.rs
+++ b/tests/ui/parser/new-unicode-escapes-2.rs
diff --git a/src/test/ui/parser/new-unicode-escapes-2.stderr b/tests/ui/parser/new-unicode-escapes-2.stderr
index 2f3f8c0f9..2f3f8c0f9 100644
--- a/src/test/ui/parser/new-unicode-escapes-2.stderr
+++ b/tests/ui/parser/new-unicode-escapes-2.stderr
diff --git a/src/test/ui/parser/new-unicode-escapes-3.rs b/tests/ui/parser/new-unicode-escapes-3.rs
index 295ab08c0..295ab08c0 100644
--- a/src/test/ui/parser/new-unicode-escapes-3.rs
+++ b/tests/ui/parser/new-unicode-escapes-3.rs
diff --git a/src/test/ui/parser/new-unicode-escapes-3.stderr b/tests/ui/parser/new-unicode-escapes-3.stderr
index f5a0f8fc7..f5a0f8fc7 100644
--- a/src/test/ui/parser/new-unicode-escapes-3.stderr
+++ b/tests/ui/parser/new-unicode-escapes-3.stderr
diff --git a/src/test/ui/parser/new-unicode-escapes-4.rs b/tests/ui/parser/new-unicode-escapes-4.rs
index 79882713e..79882713e 100644
--- a/src/test/ui/parser/new-unicode-escapes-4.rs
+++ b/tests/ui/parser/new-unicode-escapes-4.rs
diff --git a/src/test/ui/parser/new-unicode-escapes-4.stderr b/tests/ui/parser/new-unicode-escapes-4.stderr
index 514591af1..514591af1 100644
--- a/src/test/ui/parser/new-unicode-escapes-4.stderr
+++ b/tests/ui/parser/new-unicode-escapes-4.stderr
diff --git a/src/test/ui/parser/no-binary-float-literal.rs b/tests/ui/parser/no-binary-float-literal.rs
index e07ff6518..e07ff6518 100644
--- a/src/test/ui/parser/no-binary-float-literal.rs
+++ b/tests/ui/parser/no-binary-float-literal.rs
diff --git a/src/test/ui/parser/no-binary-float-literal.stderr b/tests/ui/parser/no-binary-float-literal.stderr
index cfd448684..cfd448684 100644
--- a/src/test/ui/parser/no-binary-float-literal.stderr
+++ b/tests/ui/parser/no-binary-float-literal.stderr
diff --git a/src/test/ui/parser/no-const-fn-in-extern-block.rs b/tests/ui/parser/no-const-fn-in-extern-block.rs
index 1993124ed..1993124ed 100644
--- a/src/test/ui/parser/no-const-fn-in-extern-block.rs
+++ b/tests/ui/parser/no-const-fn-in-extern-block.rs
diff --git a/src/test/ui/parser/no-const-fn-in-extern-block.stderr b/tests/ui/parser/no-const-fn-in-extern-block.stderr
index 4ac0e2655..4ac0e2655 100644
--- a/src/test/ui/parser/no-const-fn-in-extern-block.stderr
+++ b/tests/ui/parser/no-const-fn-in-extern-block.stderr
diff --git a/src/test/ui/parser/no-hex-float-literal.rs b/tests/ui/parser/no-hex-float-literal.rs
index bf11dee08..bf11dee08 100644
--- a/src/test/ui/parser/no-hex-float-literal.rs
+++ b/tests/ui/parser/no-hex-float-literal.rs
diff --git a/src/test/ui/parser/no-hex-float-literal.stderr b/tests/ui/parser/no-hex-float-literal.stderr
index 258ab06d5..258ab06d5 100644
--- a/src/test/ui/parser/no-hex-float-literal.stderr
+++ b/tests/ui/parser/no-hex-float-literal.stderr
diff --git a/src/test/ui/parser/no-unsafe-self.rs b/tests/ui/parser/no-unsafe-self.rs
index d1cd8ad53..d1cd8ad53 100644
--- a/src/test/ui/parser/no-unsafe-self.rs
+++ b/tests/ui/parser/no-unsafe-self.rs
diff --git a/src/test/ui/parser/no-unsafe-self.stderr b/tests/ui/parser/no-unsafe-self.stderr
index 23323945e..23323945e 100644
--- a/src/test/ui/parser/no-unsafe-self.stderr
+++ b/tests/ui/parser/no-unsafe-self.stderr
diff --git a/src/test/ui/parser/not-a-pred.rs b/tests/ui/parser/not-a-pred.rs
index 5518b554d..5518b554d 100644
--- a/src/test/ui/parser/not-a-pred.rs
+++ b/tests/ui/parser/not-a-pred.rs
diff --git a/src/test/ui/parser/not-a-pred.stderr b/tests/ui/parser/not-a-pred.stderr
index bcc64a687..bcc64a687 100644
--- a/src/test/ui/parser/not-a-pred.stderr
+++ b/tests/ui/parser/not-a-pred.stderr
diff --git a/src/test/ui/parser/nt-parsing-has-recovery.rs b/tests/ui/parser/nt-parsing-has-recovery.rs
index ccbeb398a..ccbeb398a 100644
--- a/src/test/ui/parser/nt-parsing-has-recovery.rs
+++ b/tests/ui/parser/nt-parsing-has-recovery.rs
diff --git a/src/test/ui/parser/nt-parsing-has-recovery.stderr b/tests/ui/parser/nt-parsing-has-recovery.stderr
index 263c4ad53..263c4ad53 100644
--- a/src/test/ui/parser/nt-parsing-has-recovery.stderr
+++ b/tests/ui/parser/nt-parsing-has-recovery.stderr
diff --git a/src/test/ui/parser/numeric-lifetime.rs b/tests/ui/parser/numeric-lifetime.rs
index 2d82354c6..2d82354c6 100644
--- a/src/test/ui/parser/numeric-lifetime.rs
+++ b/tests/ui/parser/numeric-lifetime.rs
diff --git a/src/test/ui/parser/numeric-lifetime.stderr b/tests/ui/parser/numeric-lifetime.stderr
index 7c1bcb726..7c1bcb726 100644
--- a/src/test/ui/parser/numeric-lifetime.stderr
+++ b/tests/ui/parser/numeric-lifetime.stderr
diff --git a/src/test/ui/parser/obsolete-syntax-impl-for-dotdot.rs b/tests/ui/parser/obsolete-syntax-impl-for-dotdot.rs
index e928f09aa..e928f09aa 100644
--- a/src/test/ui/parser/obsolete-syntax-impl-for-dotdot.rs
+++ b/tests/ui/parser/obsolete-syntax-impl-for-dotdot.rs
diff --git a/src/test/ui/parser/obsolete-syntax-impl-for-dotdot.stderr b/tests/ui/parser/obsolete-syntax-impl-for-dotdot.stderr
index b7108ced0..b7108ced0 100644
--- a/src/test/ui/parser/obsolete-syntax-impl-for-dotdot.stderr
+++ b/tests/ui/parser/obsolete-syntax-impl-for-dotdot.stderr
diff --git a/src/test/ui/parser/old-suffixes-are-really-forbidden.rs b/tests/ui/parser/old-suffixes-are-really-forbidden.rs
index eea95b7d6..eea95b7d6 100644
--- a/src/test/ui/parser/old-suffixes-are-really-forbidden.rs
+++ b/tests/ui/parser/old-suffixes-are-really-forbidden.rs
diff --git a/src/test/ui/parser/old-suffixes-are-really-forbidden.stderr b/tests/ui/parser/old-suffixes-are-really-forbidden.stderr
index fb309793b..fb309793b 100644
--- a/src/test/ui/parser/old-suffixes-are-really-forbidden.stderr
+++ b/tests/ui/parser/old-suffixes-are-really-forbidden.stderr
diff --git a/src/test/ui/parser/omitted-arg-in-item-fn.rs b/tests/ui/parser/omitted-arg-in-item-fn.rs
index 49cbc4d6b..49cbc4d6b 100644
--- a/src/test/ui/parser/omitted-arg-in-item-fn.rs
+++ b/tests/ui/parser/omitted-arg-in-item-fn.rs
diff --git a/src/test/ui/parser/omitted-arg-in-item-fn.stderr b/tests/ui/parser/omitted-arg-in-item-fn.stderr
index ce2eab051..ce2eab051 100644
--- a/src/test/ui/parser/omitted-arg-in-item-fn.stderr
+++ b/tests/ui/parser/omitted-arg-in-item-fn.stderr
diff --git a/src/test/ui/parser/operator-associativity.rs b/tests/ui/parser/operator-associativity.rs
index 4f40c80bc..4f40c80bc 100644
--- a/src/test/ui/parser/operator-associativity.rs
+++ b/tests/ui/parser/operator-associativity.rs
diff --git a/src/test/ui/parser/paamayim-nekudotayim.rs b/tests/ui/parser/paamayim-nekudotayim.rs
index cb151d652..cb151d652 100644
--- a/src/test/ui/parser/paamayim-nekudotayim.rs
+++ b/tests/ui/parser/paamayim-nekudotayim.rs
diff --git a/src/test/ui/parser/paamayim-nekudotayim.stderr b/tests/ui/parser/paamayim-nekudotayim.stderr
index 6ceba07f4..6ceba07f4 100644
--- a/src/test/ui/parser/paamayim-nekudotayim.stderr
+++ b/tests/ui/parser/paamayim-nekudotayim.stderr
diff --git a/src/test/ui/parser/parse-assoc-type-lt.rs b/tests/ui/parser/parse-assoc-type-lt.rs
index d3fe6079a..d3fe6079a 100644
--- a/src/test/ui/parser/parse-assoc-type-lt.rs
+++ b/tests/ui/parser/parse-assoc-type-lt.rs
diff --git a/src/test/ui/parser/parse-error-correct.rs b/tests/ui/parser/parse-error-correct.rs
index 13759a235..13759a235 100644
--- a/src/test/ui/parser/parse-error-correct.rs
+++ b/tests/ui/parser/parse-error-correct.rs
diff --git a/src/test/ui/parser/parse-error-correct.stderr b/tests/ui/parser/parse-error-correct.stderr
index 691df9126..691df9126 100644
--- a/src/test/ui/parser/parse-error-correct.stderr
+++ b/tests/ui/parser/parse-error-correct.stderr
diff --git a/src/test/ui/parser/parse-panic.rs b/tests/ui/parser/parse-panic.rs
index aeb2ba4fa..aeb2ba4fa 100644
--- a/src/test/ui/parser/parse-panic.rs
+++ b/tests/ui/parser/parse-panic.rs
diff --git a/src/test/ui/parser/parser-recovery-1.rs b/tests/ui/parser/parser-recovery-1.rs
index 7e26b4f2b..7e26b4f2b 100644
--- a/src/test/ui/parser/parser-recovery-1.rs
+++ b/tests/ui/parser/parser-recovery-1.rs
diff --git a/src/test/ui/parser/parser-recovery-1.stderr b/tests/ui/parser/parser-recovery-1.stderr
index 0cb771ea3..0cb771ea3 100644
--- a/src/test/ui/parser/parser-recovery-1.stderr
+++ b/tests/ui/parser/parser-recovery-1.stderr
diff --git a/src/test/ui/parser/parser-recovery-2.rs b/tests/ui/parser/parser-recovery-2.rs
index 48b22afff..48b22afff 100644
--- a/src/test/ui/parser/parser-recovery-2.rs
+++ b/tests/ui/parser/parser-recovery-2.rs
diff --git a/src/test/ui/parser/parser-recovery-2.stderr b/tests/ui/parser/parser-recovery-2.stderr
index 8829cf4c1..8829cf4c1 100644
--- a/src/test/ui/parser/parser-recovery-2.stderr
+++ b/tests/ui/parser/parser-recovery-2.stderr
diff --git a/src/test/ui/parser/parser-unicode-whitespace.rs b/tests/ui/parser/parser-unicode-whitespace.rs
index 555cd68c3..555cd68c3 100644
--- a/src/test/ui/parser/parser-unicode-whitespace.rs
+++ b/tests/ui/parser/parser-unicode-whitespace.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-1.rs b/tests/ui/parser/pat-lt-bracket-1.rs
index 2e2001434..2e2001434 100644
--- a/src/test/ui/parser/pat-lt-bracket-1.rs
+++ b/tests/ui/parser/pat-lt-bracket-1.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-1.stderr b/tests/ui/parser/pat-lt-bracket-1.stderr
index e8ccbad66..e8ccbad66 100644
--- a/src/test/ui/parser/pat-lt-bracket-1.stderr
+++ b/tests/ui/parser/pat-lt-bracket-1.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-2.rs b/tests/ui/parser/pat-lt-bracket-2.rs
index 3a778ed14..3a778ed14 100644
--- a/src/test/ui/parser/pat-lt-bracket-2.rs
+++ b/tests/ui/parser/pat-lt-bracket-2.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-2.stderr b/tests/ui/parser/pat-lt-bracket-2.stderr
index c78f96e1a..c78f96e1a 100644
--- a/src/test/ui/parser/pat-lt-bracket-2.stderr
+++ b/tests/ui/parser/pat-lt-bracket-2.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-3.rs b/tests/ui/parser/pat-lt-bracket-3.rs
index a8bdfd3fa..a8bdfd3fa 100644
--- a/src/test/ui/parser/pat-lt-bracket-3.rs
+++ b/tests/ui/parser/pat-lt-bracket-3.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-3.stderr b/tests/ui/parser/pat-lt-bracket-3.stderr
index bacf868e3..bacf868e3 100644
--- a/src/test/ui/parser/pat-lt-bracket-3.stderr
+++ b/tests/ui/parser/pat-lt-bracket-3.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-4.rs b/tests/ui/parser/pat-lt-bracket-4.rs
index de314f6c6..de314f6c6 100644
--- a/src/test/ui/parser/pat-lt-bracket-4.rs
+++ b/tests/ui/parser/pat-lt-bracket-4.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-4.stderr b/tests/ui/parser/pat-lt-bracket-4.stderr
index 911c276b9..911c276b9 100644
--- a/src/test/ui/parser/pat-lt-bracket-4.stderr
+++ b/tests/ui/parser/pat-lt-bracket-4.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-5.rs b/tests/ui/parser/pat-lt-bracket-5.rs
index aaece1f6b..aaece1f6b 100644
--- a/src/test/ui/parser/pat-lt-bracket-5.rs
+++ b/tests/ui/parser/pat-lt-bracket-5.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-5.stderr b/tests/ui/parser/pat-lt-bracket-5.stderr
index e23674bce..e23674bce 100644
--- a/src/test/ui/parser/pat-lt-bracket-5.stderr
+++ b/tests/ui/parser/pat-lt-bracket-5.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-6.rs b/tests/ui/parser/pat-lt-bracket-6.rs
index 7becffa9f..7becffa9f 100644
--- a/src/test/ui/parser/pat-lt-bracket-6.rs
+++ b/tests/ui/parser/pat-lt-bracket-6.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-6.stderr b/tests/ui/parser/pat-lt-bracket-6.stderr
index 035d0dbfe..035d0dbfe 100644
--- a/src/test/ui/parser/pat-lt-bracket-6.stderr
+++ b/tests/ui/parser/pat-lt-bracket-6.stderr
diff --git a/src/test/ui/parser/pat-lt-bracket-7.rs b/tests/ui/parser/pat-lt-bracket-7.rs
index 327aef5ad..327aef5ad 100644
--- a/src/test/ui/parser/pat-lt-bracket-7.rs
+++ b/tests/ui/parser/pat-lt-bracket-7.rs
diff --git a/src/test/ui/parser/pat-lt-bracket-7.stderr b/tests/ui/parser/pat-lt-bracket-7.stderr
index 004dcfb2a..004dcfb2a 100644
--- a/src/test/ui/parser/pat-lt-bracket-7.stderr
+++ b/tests/ui/parser/pat-lt-bracket-7.stderr
diff --git a/src/test/ui/parser/pat-ranges-1.rs b/tests/ui/parser/pat-ranges-1.rs
index 1dafb5a07..1dafb5a07 100644
--- a/src/test/ui/parser/pat-ranges-1.rs
+++ b/tests/ui/parser/pat-ranges-1.rs
diff --git a/src/test/ui/parser/pat-ranges-1.stderr b/tests/ui/parser/pat-ranges-1.stderr
index b64a3ce5c..b64a3ce5c 100644
--- a/src/test/ui/parser/pat-ranges-1.stderr
+++ b/tests/ui/parser/pat-ranges-1.stderr
diff --git a/src/test/ui/parser/pat-ranges-2.rs b/tests/ui/parser/pat-ranges-2.rs
index 1593222ac..1593222ac 100644
--- a/src/test/ui/parser/pat-ranges-2.rs
+++ b/tests/ui/parser/pat-ranges-2.rs
diff --git a/src/test/ui/parser/pat-ranges-2.stderr b/tests/ui/parser/pat-ranges-2.stderr
index 1a9e33beb..1a9e33beb 100644
--- a/src/test/ui/parser/pat-ranges-2.stderr
+++ b/tests/ui/parser/pat-ranges-2.stderr
diff --git a/src/test/ui/parser/pat-ranges-3.rs b/tests/ui/parser/pat-ranges-3.rs
index 8976dcf0d..8976dcf0d 100644
--- a/src/test/ui/parser/pat-ranges-3.rs
+++ b/tests/ui/parser/pat-ranges-3.rs
diff --git a/src/test/ui/parser/pat-ranges-3.stderr b/tests/ui/parser/pat-ranges-3.stderr
index c9787b789..c9787b789 100644
--- a/src/test/ui/parser/pat-ranges-3.stderr
+++ b/tests/ui/parser/pat-ranges-3.stderr
diff --git a/src/test/ui/parser/pat-ranges-4.rs b/tests/ui/parser/pat-ranges-4.rs
index 61188976b..61188976b 100644
--- a/src/test/ui/parser/pat-ranges-4.rs
+++ b/tests/ui/parser/pat-ranges-4.rs
diff --git a/src/test/ui/parser/pat-ranges-4.stderr b/tests/ui/parser/pat-ranges-4.stderr
index 69084b5a4..69084b5a4 100644
--- a/src/test/ui/parser/pat-ranges-4.stderr
+++ b/tests/ui/parser/pat-ranges-4.stderr
diff --git a/src/test/ui/parser/pat-ref-enum.rs b/tests/ui/parser/pat-ref-enum.rs
index 412dd141d..412dd141d 100644
--- a/src/test/ui/parser/pat-ref-enum.rs
+++ b/tests/ui/parser/pat-ref-enum.rs
diff --git a/src/test/ui/parser/pat-ref-enum.stderr b/tests/ui/parser/pat-ref-enum.stderr
index a3bce3372..a3bce3372 100644
--- a/src/test/ui/parser/pat-ref-enum.stderr
+++ b/tests/ui/parser/pat-ref-enum.stderr
diff --git a/src/test/ui/parser/pat-tuple-1.rs b/tests/ui/parser/pat-tuple-1.rs
index 0e49b547f..0e49b547f 100644
--- a/src/test/ui/parser/pat-tuple-1.rs
+++ b/tests/ui/parser/pat-tuple-1.rs
diff --git a/src/test/ui/parser/pat-tuple-1.stderr b/tests/ui/parser/pat-tuple-1.stderr
index 391f2c428..391f2c428 100644
--- a/src/test/ui/parser/pat-tuple-1.stderr
+++ b/tests/ui/parser/pat-tuple-1.stderr
diff --git a/src/test/ui/parser/pat-tuple-2.rs b/tests/ui/parser/pat-tuple-2.rs
index a8f3debd3..a8f3debd3 100644
--- a/src/test/ui/parser/pat-tuple-2.rs
+++ b/tests/ui/parser/pat-tuple-2.rs
diff --git a/src/test/ui/parser/pat-tuple-3.rs b/tests/ui/parser/pat-tuple-3.rs
index 1486ab231..1486ab231 100644
--- a/src/test/ui/parser/pat-tuple-3.rs
+++ b/tests/ui/parser/pat-tuple-3.rs
diff --git a/src/test/ui/parser/pat-tuple-3.stderr b/tests/ui/parser/pat-tuple-3.stderr
index 9ac0611c5..9ac0611c5 100644
--- a/src/test/ui/parser/pat-tuple-3.stderr
+++ b/tests/ui/parser/pat-tuple-3.stderr
diff --git a/src/test/ui/parser/pub-method-macro.rs b/tests/ui/parser/pub-method-macro.rs
index 0183bdcf6..0183bdcf6 100644
--- a/src/test/ui/parser/pub-method-macro.rs
+++ b/tests/ui/parser/pub-method-macro.rs
diff --git a/src/test/ui/parser/pub-method-macro.stderr b/tests/ui/parser/pub-method-macro.stderr
index 7c7a90926..7c7a90926 100644
--- a/src/test/ui/parser/pub-method-macro.stderr
+++ b/tests/ui/parser/pub-method-macro.stderr
diff --git a/src/test/ui/parser/public-instead-of-pub-1.fixed b/tests/ui/parser/public-instead-of-pub-1.fixed
index a4fa68ba5..a4fa68ba5 100644
--- a/src/test/ui/parser/public-instead-of-pub-1.fixed
+++ b/tests/ui/parser/public-instead-of-pub-1.fixed
diff --git a/src/test/ui/parser/public-instead-of-pub-1.rs b/tests/ui/parser/public-instead-of-pub-1.rs
index 43565c9b1..43565c9b1 100644
--- a/src/test/ui/parser/public-instead-of-pub-1.rs
+++ b/tests/ui/parser/public-instead-of-pub-1.rs
diff --git a/src/test/ui/parser/public-instead-of-pub-1.stderr b/tests/ui/parser/public-instead-of-pub-1.stderr
index 795a5bcf5..795a5bcf5 100644
--- a/src/test/ui/parser/public-instead-of-pub-1.stderr
+++ b/tests/ui/parser/public-instead-of-pub-1.stderr
diff --git a/src/test/ui/parser/public-instead-of-pub-2.rs b/tests/ui/parser/public-instead-of-pub-2.rs
index 8a43c361e..8a43c361e 100644
--- a/src/test/ui/parser/public-instead-of-pub-2.rs
+++ b/tests/ui/parser/public-instead-of-pub-2.rs
diff --git a/src/test/ui/parser/public-instead-of-pub-2.stderr b/tests/ui/parser/public-instead-of-pub-2.stderr
index efe225656..efe225656 100644
--- a/src/test/ui/parser/public-instead-of-pub-2.stderr
+++ b/tests/ui/parser/public-instead-of-pub-2.stderr
diff --git a/src/test/ui/parser/public-instead-of-pub-3.fixed b/tests/ui/parser/public-instead-of-pub-3.fixed
index 14f620f41..14f620f41 100644
--- a/src/test/ui/parser/public-instead-of-pub-3.fixed
+++ b/tests/ui/parser/public-instead-of-pub-3.fixed
diff --git a/src/test/ui/parser/public-instead-of-pub-3.rs b/tests/ui/parser/public-instead-of-pub-3.rs
index ee27cb1a1..ee27cb1a1 100644
--- a/src/test/ui/parser/public-instead-of-pub-3.rs
+++ b/tests/ui/parser/public-instead-of-pub-3.rs
diff --git a/src/test/ui/parser/public-instead-of-pub-3.stderr b/tests/ui/parser/public-instead-of-pub-3.stderr
index 72efae08d..72efae08d 100644
--- a/src/test/ui/parser/public-instead-of-pub-3.stderr
+++ b/tests/ui/parser/public-instead-of-pub-3.stderr
diff --git a/src/test/ui/parser/public-instead-of-pub.fixed b/tests/ui/parser/public-instead-of-pub.fixed
index 01db60999..01db60999 100644
--- a/src/test/ui/parser/public-instead-of-pub.fixed
+++ b/tests/ui/parser/public-instead-of-pub.fixed
diff --git a/src/test/ui/parser/public-instead-of-pub.rs b/tests/ui/parser/public-instead-of-pub.rs
index 18e0fd3af..18e0fd3af 100644
--- a/src/test/ui/parser/public-instead-of-pub.rs
+++ b/tests/ui/parser/public-instead-of-pub.rs
diff --git a/src/test/ui/parser/public-instead-of-pub.stderr b/tests/ui/parser/public-instead-of-pub.stderr
index af875491e..af875491e 100644
--- a/src/test/ui/parser/public-instead-of-pub.stderr
+++ b/tests/ui/parser/public-instead-of-pub.stderr
diff --git a/src/test/ui/parser/qualified-path-in-turbofish.fixed b/tests/ui/parser/qualified-path-in-turbofish.fixed
index 404d2f776..404d2f776 100644
--- a/src/test/ui/parser/qualified-path-in-turbofish.fixed
+++ b/tests/ui/parser/qualified-path-in-turbofish.fixed
diff --git a/src/test/ui/parser/qualified-path-in-turbofish.rs b/tests/ui/parser/qualified-path-in-turbofish.rs
index 2f4b2ed34..2f4b2ed34 100644
--- a/src/test/ui/parser/qualified-path-in-turbofish.rs
+++ b/tests/ui/parser/qualified-path-in-turbofish.rs
diff --git a/src/test/ui/parser/qualified-path-in-turbofish.stderr b/tests/ui/parser/qualified-path-in-turbofish.stderr
index 8857d2ef3..8857d2ef3 100644
--- a/src/test/ui/parser/qualified-path-in-turbofish.stderr
+++ b/tests/ui/parser/qualified-path-in-turbofish.stderr
diff --git a/src/test/ui/parser/range-3.rs b/tests/ui/parser/range-3.rs
index 2c917a24e..2c917a24e 100644
--- a/src/test/ui/parser/range-3.rs
+++ b/tests/ui/parser/range-3.rs
diff --git a/src/test/ui/parser/range-3.stderr b/tests/ui/parser/range-3.stderr
index 340167f18..340167f18 100644
--- a/src/test/ui/parser/range-3.stderr
+++ b/tests/ui/parser/range-3.stderr
diff --git a/src/test/ui/parser/range-4.rs b/tests/ui/parser/range-4.rs
index c970c96de..c970c96de 100644
--- a/src/test/ui/parser/range-4.rs
+++ b/tests/ui/parser/range-4.rs
diff --git a/src/test/ui/parser/range-4.stderr b/tests/ui/parser/range-4.stderr
index 720d48938..720d48938 100644
--- a/src/test/ui/parser/range-4.stderr
+++ b/tests/ui/parser/range-4.stderr
diff --git a/src/test/ui/parser/range-inclusive-extra-equals.rs b/tests/ui/parser/range-inclusive-extra-equals.rs
index d41c0699c..d41c0699c 100644
--- a/src/test/ui/parser/range-inclusive-extra-equals.rs
+++ b/tests/ui/parser/range-inclusive-extra-equals.rs
diff --git a/src/test/ui/parser/range-inclusive-extra-equals.stderr b/tests/ui/parser/range-inclusive-extra-equals.stderr
index d37b6be4f..d37b6be4f 100644
--- a/src/test/ui/parser/range-inclusive-extra-equals.stderr
+++ b/tests/ui/parser/range-inclusive-extra-equals.stderr
diff --git a/src/test/ui/parser/range_inclusive.fixed b/tests/ui/parser/range_inclusive.fixed
index fe23880d1..fe23880d1 100644
--- a/src/test/ui/parser/range_inclusive.fixed
+++ b/tests/ui/parser/range_inclusive.fixed
diff --git a/src/test/ui/parser/range_inclusive.rs b/tests/ui/parser/range_inclusive.rs
index bc6d2413d..bc6d2413d 100644
--- a/src/test/ui/parser/range_inclusive.rs
+++ b/tests/ui/parser/range_inclusive.rs
diff --git a/src/test/ui/parser/range_inclusive.stderr b/tests/ui/parser/range_inclusive.stderr
index 8a9178263..8a9178263 100644
--- a/src/test/ui/parser/range_inclusive.stderr
+++ b/tests/ui/parser/range_inclusive.stderr
diff --git a/src/test/ui/parser/range_inclusive_dotdotdot.rs b/tests/ui/parser/range_inclusive_dotdotdot.rs
index c3e600e77..c3e600e77 100644
--- a/src/test/ui/parser/range_inclusive_dotdotdot.rs
+++ b/tests/ui/parser/range_inclusive_dotdotdot.rs
diff --git a/src/test/ui/parser/range_inclusive_dotdotdot.stderr b/tests/ui/parser/range_inclusive_dotdotdot.stderr
index 2dc2c87eb..2dc2c87eb 100644
--- a/src/test/ui/parser/range_inclusive_dotdotdot.stderr
+++ b/tests/ui/parser/range_inclusive_dotdotdot.stderr
diff --git a/src/test/ui/parser/ranges-precedence.rs b/tests/ui/parser/ranges-precedence.rs
index db241ed0c..db241ed0c 100644
--- a/src/test/ui/parser/ranges-precedence.rs
+++ b/tests/ui/parser/ranges-precedence.rs
diff --git a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs b/tests/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs
index bdfc29a3d..bdfc29a3d 100644
--- a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs
+++ b/tests/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.rs
diff --git a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr b/tests/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr
index 3a7e2a4b1..3a7e2a4b1 100644
--- a/src/test/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr
+++ b/tests/ui/parser/raw/issue-70677-panic-on-unterminated-raw-str-at-eof.stderr
diff --git a/src/test/ui/parser/raw/raw-byte-string-eof.rs b/tests/ui/parser/raw/raw-byte-string-eof.rs
index b74907b72..b74907b72 100644
--- a/src/test/ui/parser/raw/raw-byte-string-eof.rs
+++ b/tests/ui/parser/raw/raw-byte-string-eof.rs
diff --git a/src/test/ui/parser/raw/raw-byte-string-eof.stderr b/tests/ui/parser/raw/raw-byte-string-eof.stderr
index a76668e80..a76668e80 100644
--- a/src/test/ui/parser/raw/raw-byte-string-eof.stderr
+++ b/tests/ui/parser/raw/raw-byte-string-eof.stderr
diff --git a/src/test/ui/parser/raw/raw-byte-string-literals.rs b/tests/ui/parser/raw/raw-byte-string-literals.rs
index 1b859fee5..1b859fee5 100644
--- a/src/test/ui/parser/raw/raw-byte-string-literals.rs
+++ b/tests/ui/parser/raw/raw-byte-string-literals.rs
diff --git a/src/test/ui/parser/raw/raw-byte-string-literals.stderr b/tests/ui/parser/raw/raw-byte-string-literals.stderr
index a2f27d1ed..a2f27d1ed 100644
--- a/src/test/ui/parser/raw/raw-byte-string-literals.stderr
+++ b/tests/ui/parser/raw/raw-byte-string-literals.stderr
diff --git a/src/test/ui/parser/raw/raw-literal-keywords.rs b/tests/ui/parser/raw/raw-literal-keywords.rs
index a986980fa..a986980fa 100644
--- a/src/test/ui/parser/raw/raw-literal-keywords.rs
+++ b/tests/ui/parser/raw/raw-literal-keywords.rs
diff --git a/src/test/ui/parser/raw/raw-literal-keywords.stderr b/tests/ui/parser/raw/raw-literal-keywords.stderr
index f7b6c894a..f7b6c894a 100644
--- a/src/test/ui/parser/raw/raw-literal-keywords.stderr
+++ b/tests/ui/parser/raw/raw-literal-keywords.stderr
diff --git a/src/test/ui/parser/raw/raw-literal-self.rs b/tests/ui/parser/raw/raw-literal-self.rs
index a0c9e24c2..a0c9e24c2 100644
--- a/src/test/ui/parser/raw/raw-literal-self.rs
+++ b/tests/ui/parser/raw/raw-literal-self.rs
diff --git a/src/test/ui/parser/raw/raw-literal-self.stderr b/tests/ui/parser/raw/raw-literal-self.stderr
index 2a40dfe20..2a40dfe20 100644
--- a/src/test/ui/parser/raw/raw-literal-self.stderr
+++ b/tests/ui/parser/raw/raw-literal-self.stderr
diff --git a/src/test/ui/parser/raw/raw-literal-underscore.rs b/tests/ui/parser/raw/raw-literal-underscore.rs
index a9d9e13a9..a9d9e13a9 100644
--- a/src/test/ui/parser/raw/raw-literal-underscore.rs
+++ b/tests/ui/parser/raw/raw-literal-underscore.rs
diff --git a/src/test/ui/parser/raw/raw-literal-underscore.stderr b/tests/ui/parser/raw/raw-literal-underscore.stderr
index d7a364d85..d7a364d85 100644
--- a/src/test/ui/parser/raw/raw-literal-underscore.stderr
+++ b/tests/ui/parser/raw/raw-literal-underscore.stderr
diff --git a/src/test/ui/parser/raw/raw-str-delim.rs b/tests/ui/parser/raw/raw-str-delim.rs
index 2f13893ce..2f13893ce 100644
--- a/src/test/ui/parser/raw/raw-str-delim.rs
+++ b/tests/ui/parser/raw/raw-str-delim.rs
diff --git a/src/test/ui/parser/raw/raw-str-delim.stderr b/tests/ui/parser/raw/raw-str-delim.stderr
index 8a04f99a1..8a04f99a1 100644
--- a/src/test/ui/parser/raw/raw-str-delim.stderr
+++ b/tests/ui/parser/raw/raw-str-delim.stderr
diff --git a/src/test/ui/parser/raw/raw-str-in-macro-call.rs b/tests/ui/parser/raw/raw-str-in-macro-call.rs
index 462c2279f..462c2279f 100644
--- a/src/test/ui/parser/raw/raw-str-in-macro-call.rs
+++ b/tests/ui/parser/raw/raw-str-in-macro-call.rs
diff --git a/src/test/ui/parser/raw/raw-str-unbalanced.rs b/tests/ui/parser/raw/raw-str-unbalanced.rs
index 38537f8b3..38537f8b3 100644
--- a/src/test/ui/parser/raw/raw-str-unbalanced.rs
+++ b/tests/ui/parser/raw/raw-str-unbalanced.rs
diff --git a/src/test/ui/parser/raw/raw-str-unbalanced.stderr b/tests/ui/parser/raw/raw-str-unbalanced.stderr
index eac8c06c1..eac8c06c1 100644
--- a/src/test/ui/parser/raw/raw-str-unbalanced.stderr
+++ b/tests/ui/parser/raw/raw-str-unbalanced.stderr
diff --git a/src/test/ui/parser/raw/raw-str-unterminated.rs b/tests/ui/parser/raw/raw-str-unterminated.rs
index fd3172955..fd3172955 100644
--- a/src/test/ui/parser/raw/raw-str-unterminated.rs
+++ b/tests/ui/parser/raw/raw-str-unterminated.rs
diff --git a/src/test/ui/parser/raw/raw-str-unterminated.stderr b/tests/ui/parser/raw/raw-str-unterminated.stderr
index 077f763f1..077f763f1 100644
--- a/src/test/ui/parser/raw/raw-str-unterminated.stderr
+++ b/tests/ui/parser/raw/raw-str-unterminated.stderr
diff --git a/src/test/ui/parser/raw/raw-string-2.rs b/tests/ui/parser/raw/raw-string-2.rs
index 067332d28..067332d28 100644
--- a/src/test/ui/parser/raw/raw-string-2.rs
+++ b/tests/ui/parser/raw/raw-string-2.rs
diff --git a/src/test/ui/parser/raw/raw-string-2.stderr b/tests/ui/parser/raw/raw-string-2.stderr
index 8bbac9d7b..8bbac9d7b 100644
--- a/src/test/ui/parser/raw/raw-string-2.stderr
+++ b/tests/ui/parser/raw/raw-string-2.stderr
diff --git a/src/test/ui/parser/raw/raw-string.rs b/tests/ui/parser/raw/raw-string.rs
index 84f07c4a9..84f07c4a9 100644
--- a/src/test/ui/parser/raw/raw-string.rs
+++ b/tests/ui/parser/raw/raw-string.rs
diff --git a/src/test/ui/parser/raw/raw-string.stderr b/tests/ui/parser/raw/raw-string.stderr
index b2b853a89..b2b853a89 100644
--- a/src/test/ui/parser/raw/raw-string.stderr
+++ b/tests/ui/parser/raw/raw-string.stderr
diff --git a/src/test/ui/parser/recover-assoc-const-constraint.rs b/tests/ui/parser/recover-assoc-const-constraint.rs
index 1453e6cb5..1453e6cb5 100644
--- a/src/test/ui/parser/recover-assoc-const-constraint.rs
+++ b/tests/ui/parser/recover-assoc-const-constraint.rs
diff --git a/src/test/ui/parser/recover-assoc-const-constraint.stderr b/tests/ui/parser/recover-assoc-const-constraint.stderr
index 2d36ce4e9..2d36ce4e9 100644
--- a/src/test/ui/parser/recover-assoc-const-constraint.stderr
+++ b/tests/ui/parser/recover-assoc-const-constraint.stderr
diff --git a/src/test/ui/parser/recover-assoc-eq-missing-term.rs b/tests/ui/parser/recover-assoc-eq-missing-term.rs
index 4b42c44dc..4b42c44dc 100644
--- a/src/test/ui/parser/recover-assoc-eq-missing-term.rs
+++ b/tests/ui/parser/recover-assoc-eq-missing-term.rs
diff --git a/src/test/ui/parser/recover-assoc-eq-missing-term.stderr b/tests/ui/parser/recover-assoc-eq-missing-term.stderr
index 152f7f2fb..152f7f2fb 100644
--- a/src/test/ui/parser/recover-assoc-eq-missing-term.stderr
+++ b/tests/ui/parser/recover-assoc-eq-missing-term.stderr
diff --git a/src/test/ui/parser/recover-assoc-lifetime-constraint.rs b/tests/ui/parser/recover-assoc-lifetime-constraint.rs
index 558fcdfe1..558fcdfe1 100644
--- a/src/test/ui/parser/recover-assoc-lifetime-constraint.rs
+++ b/tests/ui/parser/recover-assoc-lifetime-constraint.rs
diff --git a/src/test/ui/parser/recover-assoc-lifetime-constraint.stderr b/tests/ui/parser/recover-assoc-lifetime-constraint.stderr
index 79437533d..79437533d 100644
--- a/src/test/ui/parser/recover-assoc-lifetime-constraint.stderr
+++ b/tests/ui/parser/recover-assoc-lifetime-constraint.stderr
diff --git a/src/test/ui/parser/recover-const-async-fn-ptr.rs b/tests/ui/parser/recover-const-async-fn-ptr.rs
index 25af8772c..25af8772c 100644
--- a/src/test/ui/parser/recover-const-async-fn-ptr.rs
+++ b/tests/ui/parser/recover-const-async-fn-ptr.rs
diff --git a/src/test/ui/parser/recover-const-async-fn-ptr.stderr b/tests/ui/parser/recover-const-async-fn-ptr.stderr
index 7012096b6..7012096b6 100644
--- a/src/test/ui/parser/recover-const-async-fn-ptr.stderr
+++ b/tests/ui/parser/recover-const-async-fn-ptr.stderr
diff --git a/src/test/ui/parser/recover-enum.rs b/tests/ui/parser/recover-enum.rs
index 08dd939e2..08dd939e2 100644
--- a/src/test/ui/parser/recover-enum.rs
+++ b/tests/ui/parser/recover-enum.rs
diff --git a/src/test/ui/parser/recover-enum.stderr b/tests/ui/parser/recover-enum.stderr
index a2b650e4f..a2b650e4f 100644
--- a/src/test/ui/parser/recover-enum.stderr
+++ b/tests/ui/parser/recover-enum.stderr
diff --git a/src/test/ui/parser/recover-enum2.rs b/tests/ui/parser/recover-enum2.rs
index 0c9420889..0c9420889 100644
--- a/src/test/ui/parser/recover-enum2.rs
+++ b/tests/ui/parser/recover-enum2.rs
diff --git a/src/test/ui/parser/recover-enum2.stderr b/tests/ui/parser/recover-enum2.stderr
index 7634bca92..7634bca92 100644
--- a/src/test/ui/parser/recover-enum2.stderr
+++ b/tests/ui/parser/recover-enum2.stderr
diff --git a/src/test/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.rs b/tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.rs
index e815c7611..e815c7611 100644
--- a/src/test/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.rs
+++ b/tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.rs
diff --git a/src/test/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr b/tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr
index 17237c930..17237c930 100644
--- a/src/test/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr
+++ b/tests/ui/parser/recover-field-extra-angle-brackets-in-struct-with-a-field.stderr
diff --git a/src/test/ui/parser/recover-field-extra-angle-brackets.rs b/tests/ui/parser/recover-field-extra-angle-brackets.rs
index 5e0e00bcb..5e0e00bcb 100644
--- a/src/test/ui/parser/recover-field-extra-angle-brackets.rs
+++ b/tests/ui/parser/recover-field-extra-angle-brackets.rs
diff --git a/src/test/ui/parser/recover-field-extra-angle-brackets.stderr b/tests/ui/parser/recover-field-extra-angle-brackets.stderr
index 318e55f6e..318e55f6e 100644
--- a/src/test/ui/parser/recover-field-extra-angle-brackets.stderr
+++ b/tests/ui/parser/recover-field-extra-angle-brackets.stderr
diff --git a/src/test/ui/parser/recover-field-semi.rs b/tests/ui/parser/recover-field-semi.rs
index b70357886..b70357886 100644
--- a/src/test/ui/parser/recover-field-semi.rs
+++ b/tests/ui/parser/recover-field-semi.rs
diff --git a/src/test/ui/parser/recover-field-semi.stderr b/tests/ui/parser/recover-field-semi.stderr
index 3cf484748..3cf484748 100644
--- a/src/test/ui/parser/recover-field-semi.stderr
+++ b/tests/ui/parser/recover-field-semi.stderr
diff --git a/src/test/ui/parser/recover-fn-ptr-with-generics.rs b/tests/ui/parser/recover-fn-ptr-with-generics.rs
index 31de418be..31de418be 100644
--- a/src/test/ui/parser/recover-fn-ptr-with-generics.rs
+++ b/tests/ui/parser/recover-fn-ptr-with-generics.rs
diff --git a/src/test/ui/parser/recover-fn-ptr-with-generics.stderr b/tests/ui/parser/recover-fn-ptr-with-generics.stderr
index 1da9c1857..1da9c1857 100644
--- a/src/test/ui/parser/recover-fn-ptr-with-generics.stderr
+++ b/tests/ui/parser/recover-fn-ptr-with-generics.stderr
diff --git a/tests/ui/parser/recover-fn-trait-from-fn-kw.rs b/tests/ui/parser/recover-fn-trait-from-fn-kw.rs
new file mode 100644
index 000000000..b6611e627
--- /dev/null
+++ b/tests/ui/parser/recover-fn-trait-from-fn-kw.rs
@@ -0,0 +1,12 @@
+fn foo(_: impl fn() -> i32) {}
+//~^ ERROR expected identifier, found keyword `fn`
+
+fn foo2<T: fn(i32)>(_: T) {}
+//~^ ERROR expected identifier, found keyword `fn`
+
+fn main() {
+    foo(|| ());
+    //~^ mismatched types
+    foo2(|_: ()| {});
+    //~^ type mismatch in closure arguments
+}
diff --git a/tests/ui/parser/recover-fn-trait-from-fn-kw.stderr b/tests/ui/parser/recover-fn-trait-from-fn-kw.stderr
new file mode 100644
index 000000000..3681a796c
--- /dev/null
+++ b/tests/ui/parser/recover-fn-trait-from-fn-kw.stderr
@@ -0,0 +1,48 @@
+error: expected identifier, found keyword `fn`
+  --> $DIR/recover-fn-trait-from-fn-kw.rs:1:16
+   |
+LL | fn foo(_: impl fn() -> i32) {}
+   |                ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | fn foo(_: impl Fn() -> i32) {}
+   |                ~~
+
+error: expected identifier, found keyword `fn`
+  --> $DIR/recover-fn-trait-from-fn-kw.rs:4:12
+   |
+LL | fn foo2<T: fn(i32)>(_: T) {}
+   |            ^^
+   |
+help: use `Fn` to refer to the trait
+   |
+LL | fn foo2<T: Fn(i32)>(_: T) {}
+   |            ~~
+
+error[E0308]: mismatched types
+  --> $DIR/recover-fn-trait-from-fn-kw.rs:8:12
+   |
+LL |     foo(|| ());
+   |            ^^ expected `i32`, found `()`
+
+error[E0631]: type mismatch in closure arguments
+  --> $DIR/recover-fn-trait-from-fn-kw.rs:10:5
+   |
+LL |     foo2(|_: ()| {});
+   |     ^^^^ ------- found signature defined here
+   |     |
+   |     expected due to this
+   |
+   = note: expected closure signature `fn(i32) -> _`
+              found closure signature `fn(()) -> _`
+note: required by a bound in `foo2`
+  --> $DIR/recover-fn-trait-from-fn-kw.rs:4:12
+   |
+LL | fn foo2<T: fn(i32)>(_: T) {}
+   |            ^^^^^^^ required by this bound in `foo2`
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0308, E0631.
+For more information about an error, try `rustc --explain E0308`.
diff --git a/src/test/ui/parser/recover-for-loop-parens-around-head.rs b/tests/ui/parser/recover-for-loop-parens-around-head.rs
index 053b428bd..053b428bd 100644
--- a/src/test/ui/parser/recover-for-loop-parens-around-head.rs
+++ b/tests/ui/parser/recover-for-loop-parens-around-head.rs
diff --git a/src/test/ui/parser/recover-for-loop-parens-around-head.stderr b/tests/ui/parser/recover-for-loop-parens-around-head.stderr
index 3bad29f20..3bad29f20 100644
--- a/src/test/ui/parser/recover-for-loop-parens-around-head.stderr
+++ b/tests/ui/parser/recover-for-loop-parens-around-head.stderr
diff --git a/src/test/ui/parser/recover-from-bad-variant.rs b/tests/ui/parser/recover-from-bad-variant.rs
index e8887147c..e8887147c 100644
--- a/src/test/ui/parser/recover-from-bad-variant.rs
+++ b/tests/ui/parser/recover-from-bad-variant.rs
diff --git a/src/test/ui/parser/recover-from-bad-variant.stderr b/tests/ui/parser/recover-from-bad-variant.stderr
index 04968bbdf..04968bbdf 100644
--- a/src/test/ui/parser/recover-from-bad-variant.stderr
+++ b/tests/ui/parser/recover-from-bad-variant.stderr
diff --git a/src/test/ui/parser/recover-from-homoglyph.rs b/tests/ui/parser/recover-from-homoglyph.rs
index 99ce0d1a6..99ce0d1a6 100644
--- a/src/test/ui/parser/recover-from-homoglyph.rs
+++ b/tests/ui/parser/recover-from-homoglyph.rs
diff --git a/src/test/ui/parser/recover-from-homoglyph.stderr b/tests/ui/parser/recover-from-homoglyph.stderr
index f11ca9fd5..f11ca9fd5 100644
--- a/src/test/ui/parser/recover-from-homoglyph.stderr
+++ b/tests/ui/parser/recover-from-homoglyph.stderr
diff --git a/src/test/ui/parser/recover-labeled-non-block-expr.fixed b/tests/ui/parser/recover-labeled-non-block-expr.fixed
index c2e76444d..c2e76444d 100644
--- a/src/test/ui/parser/recover-labeled-non-block-expr.fixed
+++ b/tests/ui/parser/recover-labeled-non-block-expr.fixed
diff --git a/src/test/ui/parser/recover-labeled-non-block-expr.rs b/tests/ui/parser/recover-labeled-non-block-expr.rs
index fc11c646a..fc11c646a 100644
--- a/src/test/ui/parser/recover-labeled-non-block-expr.rs
+++ b/tests/ui/parser/recover-labeled-non-block-expr.rs
diff --git a/src/test/ui/parser/recover-labeled-non-block-expr.stderr b/tests/ui/parser/recover-labeled-non-block-expr.stderr
index d66ce6950..d66ce6950 100644
--- a/src/test/ui/parser/recover-labeled-non-block-expr.stderr
+++ b/tests/ui/parser/recover-labeled-non-block-expr.stderr
diff --git a/src/test/ui/parser/recover-missing-semi-before-item.fixed b/tests/ui/parser/recover-missing-semi-before-item.fixed
index 0be17e69e..0be17e69e 100644
--- a/src/test/ui/parser/recover-missing-semi-before-item.fixed
+++ b/tests/ui/parser/recover-missing-semi-before-item.fixed
diff --git a/src/test/ui/parser/recover-missing-semi-before-item.rs b/tests/ui/parser/recover-missing-semi-before-item.rs
index 867b7b749..867b7b749 100644
--- a/src/test/ui/parser/recover-missing-semi-before-item.rs
+++ b/tests/ui/parser/recover-missing-semi-before-item.rs
diff --git a/src/test/ui/parser/recover-missing-semi-before-item.stderr b/tests/ui/parser/recover-missing-semi-before-item.stderr
index 61c43f2f1..61c43f2f1 100644
--- a/src/test/ui/parser/recover-missing-semi-before-item.stderr
+++ b/tests/ui/parser/recover-missing-semi-before-item.stderr
diff --git a/src/test/ui/parser/recover-missing-semi.rs b/tests/ui/parser/recover-missing-semi.rs
index f47d5e680..f47d5e680 100644
--- a/src/test/ui/parser/recover-missing-semi.rs
+++ b/tests/ui/parser/recover-missing-semi.rs
diff --git a/src/test/ui/parser/recover-missing-semi.stderr b/tests/ui/parser/recover-missing-semi.stderr
index ba4798285..ba4798285 100644
--- a/src/test/ui/parser/recover-missing-semi.stderr
+++ b/tests/ui/parser/recover-missing-semi.stderr
diff --git a/src/test/ui/parser/recover-quantified-closure.rs b/tests/ui/parser/recover-quantified-closure.rs
index 10af39b70..df22f5e06 100644
--- a/src/test/ui/parser/recover-quantified-closure.rs
+++ b/tests/ui/parser/recover-quantified-closure.rs
@@ -7,6 +7,6 @@ fn main() {
 enum Foo { Bar }
 fn foo(x: impl Iterator<Item = Foo>) {
     for <Foo>::Bar in x {}
-    //~^ ERROR expected one of `move`, `static`, `|`
+    //~^ ERROR expected one of `const`, `move`, `static`, `|`
     //~^^ ERROR `for<...>` binders for closures are experimental
 }
diff --git a/src/test/ui/parser/recover-quantified-closure.stderr b/tests/ui/parser/recover-quantified-closure.stderr
index 39eec80f6..9ec4d2c03 100644
--- a/src/test/ui/parser/recover-quantified-closure.stderr
+++ b/tests/ui/parser/recover-quantified-closure.stderr
@@ -1,8 +1,8 @@
-error: expected one of `move`, `static`, `|`, or `||`, found `::`
+error: expected one of `const`, `move`, `static`, `|`, or `||`, found `::`
   --> $DIR/recover-quantified-closure.rs:9:14
    |
 LL |     for <Foo>::Bar in x {}
-   |              ^^ expected one of `move`, `static`, `|`, or `||`
+   |              ^^ expected one of `const`, `move`, `static`, `|`, or `||`
 
 error[E0658]: `for<...>` binders for closures are experimental
   --> $DIR/recover-quantified-closure.rs:2:5
diff --git a/src/test/ui/parser/recover-range-pats.rs b/tests/ui/parser/recover-range-pats.rs
index 156c7ad94..156c7ad94 100644
--- a/src/test/ui/parser/recover-range-pats.rs
+++ b/tests/ui/parser/recover-range-pats.rs
diff --git a/src/test/ui/parser/recover-range-pats.stderr b/tests/ui/parser/recover-range-pats.stderr
index c54f13e01..c54f13e01 100644
--- a/src/test/ui/parser/recover-range-pats.stderr
+++ b/tests/ui/parser/recover-range-pats.stderr
diff --git a/src/test/ui/parser/recover-ref-dyn-mut.rs b/tests/ui/parser/recover-ref-dyn-mut.rs
index 3016275cc..3016275cc 100644
--- a/src/test/ui/parser/recover-ref-dyn-mut.rs
+++ b/tests/ui/parser/recover-ref-dyn-mut.rs
diff --git a/src/test/ui/parser/recover-ref-dyn-mut.stderr b/tests/ui/parser/recover-ref-dyn-mut.stderr
index c048c8ea1..c048c8ea1 100644
--- a/src/test/ui/parser/recover-ref-dyn-mut.stderr
+++ b/tests/ui/parser/recover-ref-dyn-mut.stderr
diff --git a/src/test/ui/parser/recover-struct.rs b/tests/ui/parser/recover-struct.rs
index bfa5b454c..bfa5b454c 100644
--- a/src/test/ui/parser/recover-struct.rs
+++ b/tests/ui/parser/recover-struct.rs
diff --git a/src/test/ui/parser/recover-struct.stderr b/tests/ui/parser/recover-struct.stderr
index 9f6fb06ca..9f6fb06ca 100644
--- a/src/test/ui/parser/recover-struct.stderr
+++ b/tests/ui/parser/recover-struct.stderr
diff --git a/src/test/ui/parser/recover-tuple-pat.rs b/tests/ui/parser/recover-tuple-pat.rs
index 7fded752d..7fded752d 100644
--- a/src/test/ui/parser/recover-tuple-pat.rs
+++ b/tests/ui/parser/recover-tuple-pat.rs
diff --git a/src/test/ui/parser/recover-tuple-pat.stderr b/tests/ui/parser/recover-tuple-pat.stderr
index 93a6a66a6..93a6a66a6 100644
--- a/src/test/ui/parser/recover-tuple-pat.stderr
+++ b/tests/ui/parser/recover-tuple-pat.stderr
diff --git a/src/test/ui/parser/recover-tuple.rs b/tests/ui/parser/recover-tuple.rs
index 59e2695de..59e2695de 100644
--- a/src/test/ui/parser/recover-tuple.rs
+++ b/tests/ui/parser/recover-tuple.rs
diff --git a/src/test/ui/parser/recover-tuple.stderr b/tests/ui/parser/recover-tuple.stderr
index 88891b54b..88891b54b 100644
--- a/src/test/ui/parser/recover-tuple.stderr
+++ b/tests/ui/parser/recover-tuple.stderr
diff --git a/tests/ui/parser/recover-unticked-labels.fixed b/tests/ui/parser/recover-unticked-labels.fixed
new file mode 100644
index 000000000..159d995b8
--- /dev/null
+++ b/tests/ui/parser/recover-unticked-labels.fixed
@@ -0,0 +1,7 @@
+// run-rustfix
+
+fn main() {
+    'label: loop { break 'label };    //~ error: cannot find value `label` in this scope
+    'label: loop { break 'label 0 };  //~ error: expected a label, found an identifier
+    'label: loop { continue 'label }; //~ error: expected a label, found an identifier
+}
diff --git a/tests/ui/parser/recover-unticked-labels.rs b/tests/ui/parser/recover-unticked-labels.rs
new file mode 100644
index 000000000..56034de68
--- /dev/null
+++ b/tests/ui/parser/recover-unticked-labels.rs
@@ -0,0 +1,7 @@
+// run-rustfix
+
+fn main() {
+    'label: loop { break label };    //~ error: cannot find value `label` in this scope
+    'label: loop { break label 0 };  //~ error: expected a label, found an identifier
+    'label: loop { continue label }; //~ error: expected a label, found an identifier
+}
diff --git a/tests/ui/parser/recover-unticked-labels.stderr b/tests/ui/parser/recover-unticked-labels.stderr
new file mode 100644
index 000000000..c115dffb1
--- /dev/null
+++ b/tests/ui/parser/recover-unticked-labels.stderr
@@ -0,0 +1,25 @@
+error: expected a label, found an identifier
+  --> $DIR/recover-unticked-labels.rs:5:26
+   |
+LL |     'label: loop { break label 0 };
+   |                          ^^^^^ help: labels start with a tick: `'label`
+
+error: expected a label, found an identifier
+  --> $DIR/recover-unticked-labels.rs:6:29
+   |
+LL |     'label: loop { continue label };
+   |                             ^^^^^ help: labels start with a tick: `'label`
+
+error[E0425]: cannot find value `label` in this scope
+  --> $DIR/recover-unticked-labels.rs:4:26
+   |
+LL |     'label: loop { break label };
+   |     ------               ^^^^^
+   |     |                    |
+   |     |                    not found in this scope
+   |     |                    help: use the similarly named label: `'label`
+   |     a label with a similar name exists
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.fixed b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.fixed
new file mode 100644
index 000000000..227c40e97
--- /dev/null
+++ b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.fixed
@@ -0,0 +1,15 @@
+// Regression test for issues #100790 and #106439.
+// run-rustfix
+
+pub struct Example(usize)
+where
+    (): Sized;
+//~^^^ ERROR where clauses are not allowed before tuple struct bodies
+
+struct _Demo(pub usize, usize)
+where
+    (): Sized,
+    String: Clone;
+//~^^^^ ERROR where clauses are not allowed before tuple struct bodies
+
+fn main() {}
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.rs b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.rs
new file mode 100644
index 000000000..3699e6fe5
--- /dev/null
+++ b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.rs
@@ -0,0 +1,17 @@
+// Regression test for issues #100790 and #106439.
+// run-rustfix
+
+pub struct Example
+where
+    (): Sized,
+(usize);
+//~^^^ ERROR where clauses are not allowed before tuple struct bodies
+
+struct _Demo
+where
+    (): Sized,
+    String: Clone,
+(pub usize, usize);
+//~^^^^ ERROR where clauses are not allowed before tuple struct bodies
+
+fn main() {}
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.stderr b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.stderr
new file mode 100644
index 000000000..18aa5fadb
--- /dev/null
+++ b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-0.stderr
@@ -0,0 +1,40 @@
+error: where clauses are not allowed before tuple struct bodies
+  --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:5:1
+   |
+LL |   pub struct Example
+   |              ------- while parsing this tuple struct
+LL | / where
+LL | |     (): Sized,
+   | |______________^ unexpected where clause
+LL |   (usize);
+   |   ------- the struct body
+   |
+help: move the body before the where clause
+   |
+LL ~ pub struct Example(usize)
+LL | where
+LL ~     (): Sized;
+   |
+
+error: where clauses are not allowed before tuple struct bodies
+  --> $DIR/recover-where-clause-before-tuple-struct-body-0.rs:11:1
+   |
+LL |   struct _Demo
+   |          ----- while parsing this tuple struct
+LL | / where
+LL | |     (): Sized,
+LL | |     String: Clone,
+   | |__________________^ unexpected where clause
+LL |   (pub usize, usize);
+   |   ------------------ the struct body
+   |
+help: move the body before the where clause
+   |
+LL ~ struct _Demo(pub usize, usize)
+LL | where
+LL |     (): Sized,
+LL ~     String: Clone;
+   |
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.rs b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.rs
new file mode 100644
index 000000000..f515ae81e
--- /dev/null
+++ b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.rs
@@ -0,0 +1,7 @@
+// Regression test for issues #100790 and #106439.
+
+// Make sure that we still show a helpful error message even if the trailing semicolon is missing.
+
+struct Foo<T> where T: MyTrait, (T)
+//~^ ERROR where clauses are not allowed before tuple struct bodies
+//~| ERROR expected `;`, found `<eof>`
diff --git a/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.stderr b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.stderr
new file mode 100644
index 000000000..2219c2a73
--- /dev/null
+++ b/tests/ui/parser/recover-where-clause-before-tuple-struct-body-1.stderr
@@ -0,0 +1,23 @@
+error: where clauses are not allowed before tuple struct bodies
+  --> $DIR/recover-where-clause-before-tuple-struct-body-1.rs:5:15
+   |
+LL | struct Foo<T> where T: MyTrait, (T)
+   |        ---    ^^^^^^^^^^^^^^^^^ --- the struct body
+   |        |      |
+   |        |      unexpected where clause
+   |        while parsing this tuple struct
+   |
+help: move the body before the where clause
+   |
+LL - struct Foo<T> where T: MyTrait, (T)
+LL + struct Foo<T>(T) where T: MyTrait
+   |
+
+error: expected `;`, found `<eof>`
+  --> $DIR/recover-where-clause-before-tuple-struct-body-1.rs:5:35
+   |
+LL | struct Foo<T> where T: MyTrait, (T)
+   |                                   ^ expected `;`
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/parser/recovered-struct-variant.rs b/tests/ui/parser/recovered-struct-variant.rs
index 5b195dcc3..5b195dcc3 100644
--- a/src/test/ui/parser/recovered-struct-variant.rs
+++ b/tests/ui/parser/recovered-struct-variant.rs
diff --git a/src/test/ui/parser/recovered-struct-variant.stderr b/tests/ui/parser/recovered-struct-variant.stderr
index 78c67866f..78c67866f 100644
--- a/src/test/ui/parser/recovered-struct-variant.stderr
+++ b/tests/ui/parser/recovered-struct-variant.stderr
diff --git a/src/test/ui/parser/regions-out-of-scope-slice.rs b/tests/ui/parser/regions-out-of-scope-slice.rs
index d223619e1..d223619e1 100644
--- a/src/test/ui/parser/regions-out-of-scope-slice.rs
+++ b/tests/ui/parser/regions-out-of-scope-slice.rs
diff --git a/src/test/ui/parser/regions-out-of-scope-slice.stderr b/tests/ui/parser/regions-out-of-scope-slice.stderr
index bbc657ffd..bbc657ffd 100644
--- a/src/test/ui/parser/regions-out-of-scope-slice.stderr
+++ b/tests/ui/parser/regions-out-of-scope-slice.stderr
diff --git a/src/test/ui/parser/removed-syntax-closure-lifetime.rs b/tests/ui/parser/removed-syntax-closure-lifetime.rs
index e807a1794..e807a1794 100644
--- a/src/test/ui/parser/removed-syntax-closure-lifetime.rs
+++ b/tests/ui/parser/removed-syntax-closure-lifetime.rs
diff --git a/src/test/ui/parser/removed-syntax-closure-lifetime.stderr b/tests/ui/parser/removed-syntax-closure-lifetime.stderr
index e107c6b78..e107c6b78 100644
--- a/src/test/ui/parser/removed-syntax-closure-lifetime.stderr
+++ b/tests/ui/parser/removed-syntax-closure-lifetime.stderr
diff --git a/src/test/ui/parser/removed-syntax-enum-newtype.rs b/tests/ui/parser/removed-syntax-enum-newtype.rs
index 518f90b2b..518f90b2b 100644
--- a/src/test/ui/parser/removed-syntax-enum-newtype.rs
+++ b/tests/ui/parser/removed-syntax-enum-newtype.rs
diff --git a/src/test/ui/parser/removed-syntax-enum-newtype.stderr b/tests/ui/parser/removed-syntax-enum-newtype.stderr
index 8f7ca3567..8f7ca3567 100644
--- a/src/test/ui/parser/removed-syntax-enum-newtype.stderr
+++ b/tests/ui/parser/removed-syntax-enum-newtype.stderr
diff --git a/src/test/ui/parser/removed-syntax-field-let-2.rs b/tests/ui/parser/removed-syntax-field-let-2.rs
index 7ff91b476..7ff91b476 100644
--- a/src/test/ui/parser/removed-syntax-field-let-2.rs
+++ b/tests/ui/parser/removed-syntax-field-let-2.rs
diff --git a/src/test/ui/parser/removed-syntax-field-let-2.stderr b/tests/ui/parser/removed-syntax-field-let-2.stderr
index fda0919b9..fda0919b9 100644
--- a/src/test/ui/parser/removed-syntax-field-let-2.stderr
+++ b/tests/ui/parser/removed-syntax-field-let-2.stderr
diff --git a/src/test/ui/parser/removed-syntax-field-let.rs b/tests/ui/parser/removed-syntax-field-let.rs
index 6d64de296..6d64de296 100644
--- a/src/test/ui/parser/removed-syntax-field-let.rs
+++ b/tests/ui/parser/removed-syntax-field-let.rs
diff --git a/src/test/ui/parser/removed-syntax-field-let.stderr b/tests/ui/parser/removed-syntax-field-let.stderr
index 9bc18dabd..9bc18dabd 100644
--- a/src/test/ui/parser/removed-syntax-field-let.stderr
+++ b/tests/ui/parser/removed-syntax-field-let.stderr
diff --git a/src/test/ui/parser/removed-syntax-field-semicolon.rs b/tests/ui/parser/removed-syntax-field-semicolon.rs
index 808f2a5cc..808f2a5cc 100644
--- a/src/test/ui/parser/removed-syntax-field-semicolon.rs
+++ b/tests/ui/parser/removed-syntax-field-semicolon.rs
diff --git a/src/test/ui/parser/removed-syntax-field-semicolon.stderr b/tests/ui/parser/removed-syntax-field-semicolon.stderr
index 532d4fb2b..532d4fb2b 100644
--- a/src/test/ui/parser/removed-syntax-field-semicolon.stderr
+++ b/tests/ui/parser/removed-syntax-field-semicolon.stderr
diff --git a/src/test/ui/parser/removed-syntax-fixed-vec.rs b/tests/ui/parser/removed-syntax-fixed-vec.rs
index 560efecb9..560efecb9 100644
--- a/src/test/ui/parser/removed-syntax-fixed-vec.rs
+++ b/tests/ui/parser/removed-syntax-fixed-vec.rs
diff --git a/src/test/ui/parser/removed-syntax-fixed-vec.stderr b/tests/ui/parser/removed-syntax-fixed-vec.stderr
index a2b97544f..a2b97544f 100644
--- a/src/test/ui/parser/removed-syntax-fixed-vec.stderr
+++ b/tests/ui/parser/removed-syntax-fixed-vec.stderr
diff --git a/src/test/ui/parser/removed-syntax-fn-sigil.rs b/tests/ui/parser/removed-syntax-fn-sigil.rs
index 725843429..725843429 100644
--- a/src/test/ui/parser/removed-syntax-fn-sigil.rs
+++ b/tests/ui/parser/removed-syntax-fn-sigil.rs
diff --git a/src/test/ui/parser/removed-syntax-fn-sigil.stderr b/tests/ui/parser/removed-syntax-fn-sigil.stderr
index 196a5af47..196a5af47 100644
--- a/src/test/ui/parser/removed-syntax-fn-sigil.stderr
+++ b/tests/ui/parser/removed-syntax-fn-sigil.stderr
diff --git a/src/test/ui/parser/removed-syntax-mode.rs b/tests/ui/parser/removed-syntax-mode.rs
index a438db3b0..a438db3b0 100644
--- a/src/test/ui/parser/removed-syntax-mode.rs
+++ b/tests/ui/parser/removed-syntax-mode.rs
diff --git a/src/test/ui/parser/removed-syntax-mode.stderr b/tests/ui/parser/removed-syntax-mode.stderr
index d0393b379..d0393b379 100644
--- a/src/test/ui/parser/removed-syntax-mode.stderr
+++ b/tests/ui/parser/removed-syntax-mode.stderr
diff --git a/src/test/ui/parser/removed-syntax-mut-vec-expr.rs b/tests/ui/parser/removed-syntax-mut-vec-expr.rs
index 2ee95db5a..2ee95db5a 100644
--- a/src/test/ui/parser/removed-syntax-mut-vec-expr.rs
+++ b/tests/ui/parser/removed-syntax-mut-vec-expr.rs
diff --git a/src/test/ui/parser/removed-syntax-mut-vec-expr.stderr b/tests/ui/parser/removed-syntax-mut-vec-expr.stderr
index 313420fb9..313420fb9 100644
--- a/src/test/ui/parser/removed-syntax-mut-vec-expr.stderr
+++ b/tests/ui/parser/removed-syntax-mut-vec-expr.stderr
diff --git a/src/test/ui/parser/removed-syntax-mut-vec-ty.rs b/tests/ui/parser/removed-syntax-mut-vec-ty.rs
index 923a7ea37..923a7ea37 100644
--- a/src/test/ui/parser/removed-syntax-mut-vec-ty.rs
+++ b/tests/ui/parser/removed-syntax-mut-vec-ty.rs
diff --git a/src/test/ui/parser/removed-syntax-mut-vec-ty.stderr b/tests/ui/parser/removed-syntax-mut-vec-ty.stderr
index 02b518e25..02b518e25 100644
--- a/src/test/ui/parser/removed-syntax-mut-vec-ty.stderr
+++ b/tests/ui/parser/removed-syntax-mut-vec-ty.stderr
diff --git a/src/test/ui/parser/removed-syntax-ptr-lifetime.rs b/tests/ui/parser/removed-syntax-ptr-lifetime.rs
index cc69af44a..cc69af44a 100644
--- a/src/test/ui/parser/removed-syntax-ptr-lifetime.rs
+++ b/tests/ui/parser/removed-syntax-ptr-lifetime.rs
diff --git a/src/test/ui/parser/removed-syntax-ptr-lifetime.stderr b/tests/ui/parser/removed-syntax-ptr-lifetime.stderr
index 914de43e6..914de43e6 100644
--- a/src/test/ui/parser/removed-syntax-ptr-lifetime.stderr
+++ b/tests/ui/parser/removed-syntax-ptr-lifetime.stderr
diff --git a/src/test/ui/parser/removed-syntax-record.rs b/tests/ui/parser/removed-syntax-record.rs
index d1d91c8f7..d1d91c8f7 100644
--- a/src/test/ui/parser/removed-syntax-record.rs
+++ b/tests/ui/parser/removed-syntax-record.rs
diff --git a/src/test/ui/parser/removed-syntax-record.stderr b/tests/ui/parser/removed-syntax-record.stderr
index 0a1655840..0a1655840 100644
--- a/src/test/ui/parser/removed-syntax-record.stderr
+++ b/tests/ui/parser/removed-syntax-record.stderr
diff --git a/src/test/ui/parser/removed-syntax-static-fn.rs b/tests/ui/parser/removed-syntax-static-fn.rs
index cd643b874..cd643b874 100644
--- a/src/test/ui/parser/removed-syntax-static-fn.rs
+++ b/tests/ui/parser/removed-syntax-static-fn.rs
diff --git a/src/test/ui/parser/removed-syntax-static-fn.stderr b/tests/ui/parser/removed-syntax-static-fn.stderr
index 52e065894..52e065894 100644
--- a/src/test/ui/parser/removed-syntax-static-fn.stderr
+++ b/tests/ui/parser/removed-syntax-static-fn.stderr
diff --git a/src/test/ui/parser/removed-syntax-uniq-mut-expr.rs b/tests/ui/parser/removed-syntax-uniq-mut-expr.rs
index 08ef4b432..08ef4b432 100644
--- a/src/test/ui/parser/removed-syntax-uniq-mut-expr.rs
+++ b/tests/ui/parser/removed-syntax-uniq-mut-expr.rs
diff --git a/src/test/ui/parser/removed-syntax-uniq-mut-expr.stderr b/tests/ui/parser/removed-syntax-uniq-mut-expr.stderr
index 63d2fdb8c..63d2fdb8c 100644
--- a/src/test/ui/parser/removed-syntax-uniq-mut-expr.stderr
+++ b/tests/ui/parser/removed-syntax-uniq-mut-expr.stderr
diff --git a/src/test/ui/parser/removed-syntax-uniq-mut-ty.rs b/tests/ui/parser/removed-syntax-uniq-mut-ty.rs
index a8dee5bbd..a8dee5bbd 100644
--- a/src/test/ui/parser/removed-syntax-uniq-mut-ty.rs
+++ b/tests/ui/parser/removed-syntax-uniq-mut-ty.rs
diff --git a/src/test/ui/parser/removed-syntax-uniq-mut-ty.stderr b/tests/ui/parser/removed-syntax-uniq-mut-ty.stderr
index 39db0be9f..39db0be9f 100644
--- a/src/test/ui/parser/removed-syntax-uniq-mut-ty.stderr
+++ b/tests/ui/parser/removed-syntax-uniq-mut-ty.stderr
diff --git a/src/test/ui/parser/removed-syntax-with-1.rs b/tests/ui/parser/removed-syntax-with-1.rs
index 2c1e152dc..2c1e152dc 100644
--- a/src/test/ui/parser/removed-syntax-with-1.rs
+++ b/tests/ui/parser/removed-syntax-with-1.rs
diff --git a/src/test/ui/parser/removed-syntax-with-1.stderr b/tests/ui/parser/removed-syntax-with-1.stderr
index c3f747b61..c3f747b61 100644
--- a/src/test/ui/parser/removed-syntax-with-1.stderr
+++ b/tests/ui/parser/removed-syntax-with-1.stderr
diff --git a/src/test/ui/parser/removed-syntax-with-2.rs b/tests/ui/parser/removed-syntax-with-2.rs
index 451057c66..451057c66 100644
--- a/src/test/ui/parser/removed-syntax-with-2.rs
+++ b/tests/ui/parser/removed-syntax-with-2.rs
diff --git a/src/test/ui/parser/removed-syntax-with-2.stderr b/tests/ui/parser/removed-syntax-with-2.stderr
index c6ae1ce67..c6ae1ce67 100644
--- a/src/test/ui/parser/removed-syntax-with-2.stderr
+++ b/tests/ui/parser/removed-syntax-with-2.stderr
diff --git a/src/test/ui/parser/require-parens-for-chained-comparison.rs b/tests/ui/parser/require-parens-for-chained-comparison.rs
index 5b90e905a..5b90e905a 100644
--- a/src/test/ui/parser/require-parens-for-chained-comparison.rs
+++ b/tests/ui/parser/require-parens-for-chained-comparison.rs
diff --git a/src/test/ui/parser/require-parens-for-chained-comparison.stderr b/tests/ui/parser/require-parens-for-chained-comparison.stderr
index 52e201c43..52e201c43 100644
--- a/src/test/ui/parser/require-parens-for-chained-comparison.stderr
+++ b/tests/ui/parser/require-parens-for-chained-comparison.stderr
diff --git a/src/test/ui/parser/self-in-function-arg.rs b/tests/ui/parser/self-in-function-arg.rs
index 6172ffe1b..6172ffe1b 100644
--- a/src/test/ui/parser/self-in-function-arg.rs
+++ b/tests/ui/parser/self-in-function-arg.rs
diff --git a/src/test/ui/parser/self-in-function-arg.stderr b/tests/ui/parser/self-in-function-arg.stderr
index 47d8381b0..47d8381b0 100644
--- a/src/test/ui/parser/self-in-function-arg.stderr
+++ b/tests/ui/parser/self-in-function-arg.stderr
diff --git a/src/test/ui/parser/self-param-semantic-fail.rs b/tests/ui/parser/self-param-semantic-fail.rs
index 621aab279..621aab279 100644
--- a/src/test/ui/parser/self-param-semantic-fail.rs
+++ b/tests/ui/parser/self-param-semantic-fail.rs
diff --git a/src/test/ui/parser/self-param-semantic-fail.stderr b/tests/ui/parser/self-param-semantic-fail.stderr
index e5d679773..e5d679773 100644
--- a/src/test/ui/parser/self-param-semantic-fail.stderr
+++ b/tests/ui/parser/self-param-semantic-fail.stderr
diff --git a/src/test/ui/parser/self-param-syntactic-pass.rs b/tests/ui/parser/self-param-syntactic-pass.rs
index d7bb7863c..d7bb7863c 100644
--- a/src/test/ui/parser/self-param-syntactic-pass.rs
+++ b/tests/ui/parser/self-param-syntactic-pass.rs
diff --git a/src/test/ui/parser/semi-after-closure-in-macro.rs b/tests/ui/parser/semi-after-closure-in-macro.rs
index 14efb6100..14efb6100 100644
--- a/src/test/ui/parser/semi-after-closure-in-macro.rs
+++ b/tests/ui/parser/semi-after-closure-in-macro.rs
diff --git a/src/test/ui/parser/several-carriage-returns-in-doc-comment.rs b/tests/ui/parser/several-carriage-returns-in-doc-comment.rs
index ee14c55d2..ee14c55d2 100644
--- a/src/test/ui/parser/several-carriage-returns-in-doc-comment.rs
+++ b/tests/ui/parser/several-carriage-returns-in-doc-comment.rs
diff --git a/src/test/ui/parser/several-carriage-returns-in-doc-comment.stderr b/tests/ui/parser/several-carriage-returns-in-doc-comment.stderr
index 07066fc22..07066fc22 100644
--- a/src/test/ui/parser/several-carriage-returns-in-doc-comment.stderr
+++ b/tests/ui/parser/several-carriage-returns-in-doc-comment.stderr
diff --git a/src/test/ui/parser/shebang/issue-71471-ignore-tidy.rs b/tests/ui/parser/shebang/issue-71471-ignore-tidy.rs
index a25051808..a25051808 100644
--- a/src/test/ui/parser/shebang/issue-71471-ignore-tidy.rs
+++ b/tests/ui/parser/shebang/issue-71471-ignore-tidy.rs
diff --git a/src/test/ui/parser/shebang/issue-71471-ignore-tidy.stderr b/tests/ui/parser/shebang/issue-71471-ignore-tidy.stderr
index 896a9dc83..896a9dc83 100644
--- a/src/test/ui/parser/shebang/issue-71471-ignore-tidy.stderr
+++ b/tests/ui/parser/shebang/issue-71471-ignore-tidy.stderr
diff --git a/src/test/ui/parser/shebang/multiline-attrib.rs b/tests/ui/parser/shebang/multiline-attrib.rs
index 931c94c7f..931c94c7f 100644
--- a/src/test/ui/parser/shebang/multiline-attrib.rs
+++ b/tests/ui/parser/shebang/multiline-attrib.rs
diff --git a/src/test/ui/parser/shebang/regular-attrib.rs b/tests/ui/parser/shebang/regular-attrib.rs
index ca8fb0830..ca8fb0830 100644
--- a/src/test/ui/parser/shebang/regular-attrib.rs
+++ b/tests/ui/parser/shebang/regular-attrib.rs
diff --git a/src/test/ui/parser/shebang/shebang-and-attrib.rs b/tests/ui/parser/shebang/shebang-and-attrib.rs
index 61b89c655..61b89c655 100644
--- a/src/test/ui/parser/shebang/shebang-and-attrib.rs
+++ b/tests/ui/parser/shebang/shebang-and-attrib.rs
diff --git a/src/test/ui/parser/shebang/shebang-comment.rs b/tests/ui/parser/shebang/shebang-comment.rs
index 2b1ab0c57..2b1ab0c57 100644
--- a/src/test/ui/parser/shebang/shebang-comment.rs
+++ b/tests/ui/parser/shebang/shebang-comment.rs
diff --git a/src/test/ui/parser/shebang/shebang-doc-comment.rs b/tests/ui/parser/shebang/shebang-doc-comment.rs
index 72866753e..72866753e 100644
--- a/src/test/ui/parser/shebang/shebang-doc-comment.rs
+++ b/tests/ui/parser/shebang/shebang-doc-comment.rs
diff --git a/src/test/ui/parser/shebang/shebang-doc-comment.stderr b/tests/ui/parser/shebang/shebang-doc-comment.stderr
index 2227d45ec..2227d45ec 100644
--- a/src/test/ui/parser/shebang/shebang-doc-comment.stderr
+++ b/tests/ui/parser/shebang/shebang-doc-comment.stderr
diff --git a/src/test/ui/parser/shebang/shebang-empty.rs b/tests/ui/parser/shebang/shebang-empty.rs
index e38cc637e..e38cc637e 100644
--- a/src/test/ui/parser/shebang/shebang-empty.rs
+++ b/tests/ui/parser/shebang/shebang-empty.rs
diff --git a/src/test/ui/parser/shebang/shebang-must-start-file.rs b/tests/ui/parser/shebang/shebang-must-start-file.rs
index e0392572d..e0392572d 100644
--- a/src/test/ui/parser/shebang/shebang-must-start-file.rs
+++ b/tests/ui/parser/shebang/shebang-must-start-file.rs
diff --git a/src/test/ui/parser/shebang/shebang-must-start-file.stderr b/tests/ui/parser/shebang/shebang-must-start-file.stderr
index 50543e8bd..50543e8bd 100644
--- a/src/test/ui/parser/shebang/shebang-must-start-file.stderr
+++ b/tests/ui/parser/shebang/shebang-must-start-file.stderr
diff --git a/src/test/ui/parser/shebang/shebang-space.rs b/tests/ui/parser/shebang/shebang-space.rs
index 0978b759d..0978b759d 100644
--- a/src/test/ui/parser/shebang/shebang-space.rs
+++ b/tests/ui/parser/shebang/shebang-space.rs
diff --git a/src/test/ui/parser/shebang/sneaky-attrib.rs b/tests/ui/parser/shebang/sneaky-attrib.rs
index b406cc3aa..b406cc3aa 100644
--- a/src/test/ui/parser/shebang/sneaky-attrib.rs
+++ b/tests/ui/parser/shebang/sneaky-attrib.rs
diff --git a/src/test/ui/parser/shebang/valid-shebang.rs b/tests/ui/parser/shebang/valid-shebang.rs
index e480d3da3..e480d3da3 100644
--- a/src/test/ui/parser/shebang/valid-shebang.rs
+++ b/tests/ui/parser/shebang/valid-shebang.rs
diff --git a/src/test/ui/parser/similar-tokens.rs b/tests/ui/parser/similar-tokens.rs
index e3024c61a..e3024c61a 100644
--- a/src/test/ui/parser/similar-tokens.rs
+++ b/tests/ui/parser/similar-tokens.rs
diff --git a/src/test/ui/parser/similar-tokens.stderr b/tests/ui/parser/similar-tokens.stderr
index 90acfc052..90acfc052 100644
--- a/src/test/ui/parser/similar-tokens.stderr
+++ b/tests/ui/parser/similar-tokens.stderr
diff --git a/src/test/ui/parser/slowparse-bstring.rs b/tests/ui/parser/slowparse-bstring.rs
index f3a6a6683..f3a6a6683 100644
--- a/src/test/ui/parser/slowparse-bstring.rs
+++ b/tests/ui/parser/slowparse-bstring.rs
diff --git a/src/test/ui/parser/slowparse-string.rs b/tests/ui/parser/slowparse-string.rs
index 6ebc61dae..6ebc61dae 100644
--- a/src/test/ui/parser/slowparse-string.rs
+++ b/tests/ui/parser/slowparse-string.rs
diff --git a/src/test/ui/parser/stmt_expr_attrs_placement.rs b/tests/ui/parser/stmt_expr_attrs_placement.rs
index 5e9d29a15..5e9d29a15 100644
--- a/src/test/ui/parser/stmt_expr_attrs_placement.rs
+++ b/tests/ui/parser/stmt_expr_attrs_placement.rs
diff --git a/src/test/ui/parser/stmt_expr_attrs_placement.stderr b/tests/ui/parser/stmt_expr_attrs_placement.stderr
index bf4005698..bf4005698 100644
--- a/src/test/ui/parser/stmt_expr_attrs_placement.stderr
+++ b/tests/ui/parser/stmt_expr_attrs_placement.stderr
diff --git a/src/test/ui/parser/stripped-nested-outline-mod-pass.rs b/tests/ui/parser/stripped-nested-outline-mod-pass.rs
index 1b4669a43..1b4669a43 100644
--- a/src/test/ui/parser/stripped-nested-outline-mod-pass.rs
+++ b/tests/ui/parser/stripped-nested-outline-mod-pass.rs
diff --git a/src/test/ui/parser/struct-default-values-and-missing-field-separator.fixed b/tests/ui/parser/struct-default-values-and-missing-field-separator.fixed
index 28191b826..28191b826 100644
--- a/src/test/ui/parser/struct-default-values-and-missing-field-separator.fixed
+++ b/tests/ui/parser/struct-default-values-and-missing-field-separator.fixed
diff --git a/src/test/ui/parser/struct-default-values-and-missing-field-separator.rs b/tests/ui/parser/struct-default-values-and-missing-field-separator.rs
index 924cb08a9..924cb08a9 100644
--- a/src/test/ui/parser/struct-default-values-and-missing-field-separator.rs
+++ b/tests/ui/parser/struct-default-values-and-missing-field-separator.rs
diff --git a/src/test/ui/parser/struct-default-values-and-missing-field-separator.stderr b/tests/ui/parser/struct-default-values-and-missing-field-separator.stderr
index 7f16ebcfc..7f16ebcfc 100644
--- a/src/test/ui/parser/struct-default-values-and-missing-field-separator.stderr
+++ b/tests/ui/parser/struct-default-values-and-missing-field-separator.stderr
diff --git a/src/test/ui/parser/struct-field-numeric-shorthand.rs b/tests/ui/parser/struct-field-numeric-shorthand.rs
index 645abd9c7..645abd9c7 100644
--- a/src/test/ui/parser/struct-field-numeric-shorthand.rs
+++ b/tests/ui/parser/struct-field-numeric-shorthand.rs
diff --git a/src/test/ui/parser/struct-field-numeric-shorthand.stderr b/tests/ui/parser/struct-field-numeric-shorthand.stderr
index bfb8a931b..bfb8a931b 100644
--- a/src/test/ui/parser/struct-field-numeric-shorthand.stderr
+++ b/tests/ui/parser/struct-field-numeric-shorthand.stderr
diff --git a/src/test/ui/parser/struct-filed-with-attr.fixed b/tests/ui/parser/struct-filed-with-attr.fixed
index a799ec8ca..a799ec8ca 100644
--- a/src/test/ui/parser/struct-filed-with-attr.fixed
+++ b/tests/ui/parser/struct-filed-with-attr.fixed
diff --git a/src/test/ui/parser/struct-filed-with-attr.rs b/tests/ui/parser/struct-filed-with-attr.rs
index bfc78e15b..bfc78e15b 100644
--- a/src/test/ui/parser/struct-filed-with-attr.rs
+++ b/tests/ui/parser/struct-filed-with-attr.rs
diff --git a/src/test/ui/parser/struct-filed-with-attr.stderr b/tests/ui/parser/struct-filed-with-attr.stderr
index c2cd7e82e..c2cd7e82e 100644
--- a/src/test/ui/parser/struct-filed-with-attr.stderr
+++ b/tests/ui/parser/struct-filed-with-attr.stderr
diff --git a/src/test/ui/parser/struct-literal-in-for.rs b/tests/ui/parser/struct-literal-in-for.rs
index 3227ae37b..3227ae37b 100644
--- a/src/test/ui/parser/struct-literal-in-for.rs
+++ b/tests/ui/parser/struct-literal-in-for.rs
diff --git a/src/test/ui/parser/struct-literal-in-for.stderr b/tests/ui/parser/struct-literal-in-for.stderr
index 1c91eba68..1c91eba68 100644
--- a/src/test/ui/parser/struct-literal-in-for.stderr
+++ b/tests/ui/parser/struct-literal-in-for.stderr
diff --git a/src/test/ui/parser/struct-literal-in-if.rs b/tests/ui/parser/struct-literal-in-if.rs
index 2ce2c8f18..2ce2c8f18 100644
--- a/src/test/ui/parser/struct-literal-in-if.rs
+++ b/tests/ui/parser/struct-literal-in-if.rs
diff --git a/src/test/ui/parser/struct-literal-in-if.stderr b/tests/ui/parser/struct-literal-in-if.stderr
index b5a9864bb..b5a9864bb 100644
--- a/src/test/ui/parser/struct-literal-in-if.stderr
+++ b/tests/ui/parser/struct-literal-in-if.stderr
diff --git a/src/test/ui/parser/struct-literal-in-match-discriminant.rs b/tests/ui/parser/struct-literal-in-match-discriminant.rs
index ce132df5a..ce132df5a 100644
--- a/src/test/ui/parser/struct-literal-in-match-discriminant.rs
+++ b/tests/ui/parser/struct-literal-in-match-discriminant.rs
diff --git a/src/test/ui/parser/struct-literal-in-match-discriminant.stderr b/tests/ui/parser/struct-literal-in-match-discriminant.stderr
index 692b4d735..692b4d735 100644
--- a/src/test/ui/parser/struct-literal-in-match-discriminant.stderr
+++ b/tests/ui/parser/struct-literal-in-match-discriminant.stderr
diff --git a/src/test/ui/parser/struct-literal-in-match-guard.rs b/tests/ui/parser/struct-literal-in-match-guard.rs
index bf0551b5c..bf0551b5c 100644
--- a/src/test/ui/parser/struct-literal-in-match-guard.rs
+++ b/tests/ui/parser/struct-literal-in-match-guard.rs
diff --git a/src/test/ui/parser/struct-literal-in-while.rs b/tests/ui/parser/struct-literal-in-while.rs
index 5000ce85b..5000ce85b 100644
--- a/src/test/ui/parser/struct-literal-in-while.rs
+++ b/tests/ui/parser/struct-literal-in-while.rs
diff --git a/src/test/ui/parser/struct-literal-in-while.stderr b/tests/ui/parser/struct-literal-in-while.stderr
index 17e9277e0..17e9277e0 100644
--- a/src/test/ui/parser/struct-literal-in-while.stderr
+++ b/tests/ui/parser/struct-literal-in-while.stderr
diff --git a/src/test/ui/parser/struct-literal-restrictions-in-lamda.rs b/tests/ui/parser/struct-literal-restrictions-in-lamda.rs
index e185153dc..e185153dc 100644
--- a/src/test/ui/parser/struct-literal-restrictions-in-lamda.rs
+++ b/tests/ui/parser/struct-literal-restrictions-in-lamda.rs
diff --git a/src/test/ui/parser/struct-literal-restrictions-in-lamda.stderr b/tests/ui/parser/struct-literal-restrictions-in-lamda.stderr
index 0852c7cb4..0852c7cb4 100644
--- a/src/test/ui/parser/struct-literal-restrictions-in-lamda.stderr
+++ b/tests/ui/parser/struct-literal-restrictions-in-lamda.stderr
diff --git a/src/test/ui/parser/struct-literal-variant-in-if.rs b/tests/ui/parser/struct-literal-variant-in-if.rs
index 4ef8effaf..4ef8effaf 100644
--- a/src/test/ui/parser/struct-literal-variant-in-if.rs
+++ b/tests/ui/parser/struct-literal-variant-in-if.rs
diff --git a/src/test/ui/parser/struct-literal-variant-in-if.stderr b/tests/ui/parser/struct-literal-variant-in-if.stderr
index 9f0c0074d..9f0c0074d 100644
--- a/src/test/ui/parser/struct-literal-variant-in-if.stderr
+++ b/tests/ui/parser/struct-literal-variant-in-if.stderr
diff --git a/src/test/ui/parser/suggest-assoc-const.fixed b/tests/ui/parser/suggest-assoc-const.fixed
index 259f37b23..259f37b23 100644
--- a/src/test/ui/parser/suggest-assoc-const.fixed
+++ b/tests/ui/parser/suggest-assoc-const.fixed
diff --git a/src/test/ui/parser/suggest-assoc-const.rs b/tests/ui/parser/suggest-assoc-const.rs
index c7be712ec..c7be712ec 100644
--- a/src/test/ui/parser/suggest-assoc-const.rs
+++ b/tests/ui/parser/suggest-assoc-const.rs
diff --git a/src/test/ui/parser/suggest-assoc-const.stderr b/tests/ui/parser/suggest-assoc-const.stderr
index 2ddfa07c5..2ddfa07c5 100644
--- a/src/test/ui/parser/suggest-assoc-const.stderr
+++ b/tests/ui/parser/suggest-assoc-const.stderr
diff --git a/src/test/ui/parser/suggest-const-for-global-var.rs b/tests/ui/parser/suggest-const-for-global-var.rs
index d6216cb7a..d6216cb7a 100644
--- a/src/test/ui/parser/suggest-const-for-global-var.rs
+++ b/tests/ui/parser/suggest-const-for-global-var.rs
diff --git a/src/test/ui/parser/suggest-const-for-global-var.stderr b/tests/ui/parser/suggest-const-for-global-var.stderr
index 94e44ec7f..94e44ec7f 100644
--- a/src/test/ui/parser/suggest-const-for-global-var.stderr
+++ b/tests/ui/parser/suggest-const-for-global-var.stderr
diff --git a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.fixed b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.fixed
index 637047354..637047354 100644
--- a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.fixed
+++ b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.fixed
diff --git a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.rs b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.rs
index 4650b05e2..4650b05e2 100644
--- a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.rs
+++ b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.rs
diff --git a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.stderr b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.stderr
index 396e0c130..396e0c130 100644
--- a/src/test/ui/parser/suggest-removing-semicolon-after-impl-trait-items.stderr
+++ b/tests/ui/parser/suggest-removing-semicolon-after-impl-trait-items.stderr
diff --git a/src/test/ui/parser/suggest-semi-in-array.rs b/tests/ui/parser/suggest-semi-in-array.rs
index 9ce2e59e5..9ce2e59e5 100644
--- a/src/test/ui/parser/suggest-semi-in-array.rs
+++ b/tests/ui/parser/suggest-semi-in-array.rs
diff --git a/src/test/ui/parser/suggest-semi-in-array.stderr b/tests/ui/parser/suggest-semi-in-array.stderr
index d7cd6efae..d7cd6efae 100644
--- a/src/test/ui/parser/suggest-semi-in-array.stderr
+++ b/tests/ui/parser/suggest-semi-in-array.stderr
diff --git a/src/test/ui/parser/suggest-semicolon-before-array.fixed b/tests/ui/parser/suggest-semicolon-before-array.fixed
index a06b58b27..a06b58b27 100644
--- a/src/test/ui/parser/suggest-semicolon-before-array.fixed
+++ b/tests/ui/parser/suggest-semicolon-before-array.fixed
diff --git a/src/test/ui/parser/suggest-semicolon-before-array.rs b/tests/ui/parser/suggest-semicolon-before-array.rs
index f601ca2ae..f601ca2ae 100644
--- a/src/test/ui/parser/suggest-semicolon-before-array.rs
+++ b/tests/ui/parser/suggest-semicolon-before-array.rs
diff --git a/src/test/ui/parser/suggest-semicolon-before-array.stderr b/tests/ui/parser/suggest-semicolon-before-array.stderr
index 8a33321fb..8a33321fb 100644
--- a/src/test/ui/parser/suggest-semicolon-before-array.stderr
+++ b/tests/ui/parser/suggest-semicolon-before-array.stderr
diff --git a/src/test/ui/parser/trailing-carriage-return-in-string.rs b/tests/ui/parser/trailing-carriage-return-in-string.rs
index 5d3c31944..5d3c31944 100644
--- a/src/test/ui/parser/trailing-carriage-return-in-string.rs
+++ b/tests/ui/parser/trailing-carriage-return-in-string.rs
diff --git a/src/test/ui/parser/trailing-carriage-return-in-string.stderr b/tests/ui/parser/trailing-carriage-return-in-string.stderr
index 8a44e0270..8a44e0270 100644
--- a/src/test/ui/parser/trailing-carriage-return-in-string.stderr
+++ b/tests/ui/parser/trailing-carriage-return-in-string.stderr
diff --git a/src/test/ui/parser/trailing-plus-in-bounds.rs b/tests/ui/parser/trailing-plus-in-bounds.rs
index 400649bcf..400649bcf 100644
--- a/src/test/ui/parser/trailing-plus-in-bounds.rs
+++ b/tests/ui/parser/trailing-plus-in-bounds.rs
diff --git a/src/test/ui/parser/trailing-question-in-macro-type.rs b/tests/ui/parser/trailing-question-in-macro-type.rs
index e2a681ddd..e2a681ddd 100644
--- a/src/test/ui/parser/trailing-question-in-macro-type.rs
+++ b/tests/ui/parser/trailing-question-in-macro-type.rs
diff --git a/src/test/ui/parser/trailing-question-in-macro-type.stderr b/tests/ui/parser/trailing-question-in-macro-type.stderr
index c096ae04f..c096ae04f 100644
--- a/src/test/ui/parser/trailing-question-in-macro-type.stderr
+++ b/tests/ui/parser/trailing-question-in-macro-type.stderr
diff --git a/src/test/ui/parser/trailing-question-in-type.fixed b/tests/ui/parser/trailing-question-in-type.fixed
index 6ea24484e..6ea24484e 100644
--- a/src/test/ui/parser/trailing-question-in-type.fixed
+++ b/tests/ui/parser/trailing-question-in-type.fixed
diff --git a/src/test/ui/parser/trailing-question-in-type.rs b/tests/ui/parser/trailing-question-in-type.rs
index b1c508365..b1c508365 100644
--- a/src/test/ui/parser/trailing-question-in-type.rs
+++ b/tests/ui/parser/trailing-question-in-type.rs
diff --git a/src/test/ui/parser/trailing-question-in-type.stderr b/tests/ui/parser/trailing-question-in-type.stderr
index a3cd419c0..a3cd419c0 100644
--- a/src/test/ui/parser/trailing-question-in-type.stderr
+++ b/tests/ui/parser/trailing-question-in-type.stderr
diff --git a/src/test/ui/parser/trait-bounds-not-on-impl.rs b/tests/ui/parser/trait-bounds-not-on-impl.rs
index 02563847e..02563847e 100644
--- a/src/test/ui/parser/trait-bounds-not-on-impl.rs
+++ b/tests/ui/parser/trait-bounds-not-on-impl.rs
diff --git a/src/test/ui/parser/trait-bounds-not-on-impl.stderr b/tests/ui/parser/trait-bounds-not-on-impl.stderr
index 8d2d5e3d7..8d2d5e3d7 100644
--- a/src/test/ui/parser/trait-bounds-not-on-impl.stderr
+++ b/tests/ui/parser/trait-bounds-not-on-impl.stderr
diff --git a/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.rs b/tests/ui/parser/trait-item-with-defaultness-fail-semantic.rs
index f2d97b7ba..f2d97b7ba 100644
--- a/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.rs
+++ b/tests/ui/parser/trait-item-with-defaultness-fail-semantic.rs
diff --git a/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.stderr b/tests/ui/parser/trait-item-with-defaultness-fail-semantic.stderr
index be858cd65..be858cd65 100644
--- a/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.stderr
+++ b/tests/ui/parser/trait-item-with-defaultness-fail-semantic.stderr
diff --git a/src/test/ui/parser/trait-item-with-defaultness-pass.rs b/tests/ui/parser/trait-item-with-defaultness-pass.rs
index a6318bd99..a6318bd99 100644
--- a/src/test/ui/parser/trait-item-with-defaultness-pass.rs
+++ b/tests/ui/parser/trait-item-with-defaultness-pass.rs
diff --git a/src/test/ui/parser/trait-object-bad-parens.rs b/tests/ui/parser/trait-object-bad-parens.rs
index 8e267c744..8e267c744 100644
--- a/src/test/ui/parser/trait-object-bad-parens.rs
+++ b/tests/ui/parser/trait-object-bad-parens.rs
diff --git a/src/test/ui/parser/trait-object-bad-parens.stderr b/tests/ui/parser/trait-object-bad-parens.stderr
index 74e484eeb..74e484eeb 100644
--- a/src/test/ui/parser/trait-object-bad-parens.stderr
+++ b/tests/ui/parser/trait-object-bad-parens.stderr
diff --git a/src/test/ui/parser/trait-object-delimiters.rs b/tests/ui/parser/trait-object-delimiters.rs
index cc04ac052..cc04ac052 100644
--- a/src/test/ui/parser/trait-object-delimiters.rs
+++ b/tests/ui/parser/trait-object-delimiters.rs
diff --git a/src/test/ui/parser/trait-object-delimiters.stderr b/tests/ui/parser/trait-object-delimiters.stderr
index 99c451545..99c451545 100644
--- a/src/test/ui/parser/trait-object-delimiters.stderr
+++ b/tests/ui/parser/trait-object-delimiters.stderr
diff --git a/src/test/ui/parser/trait-object-lifetime-parens.rs b/tests/ui/parser/trait-object-lifetime-parens.rs
index f44ebe5ba..f44ebe5ba 100644
--- a/src/test/ui/parser/trait-object-lifetime-parens.rs
+++ b/tests/ui/parser/trait-object-lifetime-parens.rs
diff --git a/src/test/ui/parser/trait-object-lifetime-parens.stderr b/tests/ui/parser/trait-object-lifetime-parens.stderr
index 9c7a9662c..9c7a9662c 100644
--- a/src/test/ui/parser/trait-object-lifetime-parens.stderr
+++ b/tests/ui/parser/trait-object-lifetime-parens.stderr
diff --git a/src/test/ui/parser/trait-object-polytrait-priority.rs b/tests/ui/parser/trait-object-polytrait-priority.rs
index 63425f3e2..63425f3e2 100644
--- a/src/test/ui/parser/trait-object-polytrait-priority.rs
+++ b/tests/ui/parser/trait-object-polytrait-priority.rs
diff --git a/src/test/ui/parser/trait-object-polytrait-priority.stderr b/tests/ui/parser/trait-object-polytrait-priority.stderr
index a6add6079..a6add6079 100644
--- a/src/test/ui/parser/trait-object-polytrait-priority.stderr
+++ b/tests/ui/parser/trait-object-polytrait-priority.stderr
diff --git a/src/test/ui/parser/trait-object-trait-parens.rs b/tests/ui/parser/trait-object-trait-parens.rs
index 438034bc3..438034bc3 100644
--- a/src/test/ui/parser/trait-object-trait-parens.rs
+++ b/tests/ui/parser/trait-object-trait-parens.rs
diff --git a/src/test/ui/parser/trait-object-trait-parens.stderr b/tests/ui/parser/trait-object-trait-parens.stderr
index 5e07a3fe6..5e07a3fe6 100644
--- a/src/test/ui/parser/trait-object-trait-parens.stderr
+++ b/tests/ui/parser/trait-object-trait-parens.stderr
diff --git a/src/test/ui/parser/trait-plusequal-splitting.rs b/tests/ui/parser/trait-plusequal-splitting.rs
index 6ca677450..6ca677450 100644
--- a/src/test/ui/parser/trait-plusequal-splitting.rs
+++ b/tests/ui/parser/trait-plusequal-splitting.rs
diff --git a/src/test/ui/parser/trait-pub-assoc-const.rs b/tests/ui/parser/trait-pub-assoc-const.rs
index 219ffa309..219ffa309 100644
--- a/src/test/ui/parser/trait-pub-assoc-const.rs
+++ b/tests/ui/parser/trait-pub-assoc-const.rs
diff --git a/src/test/ui/parser/trait-pub-assoc-const.stderr b/tests/ui/parser/trait-pub-assoc-const.stderr
index efd09a036..efd09a036 100644
--- a/src/test/ui/parser/trait-pub-assoc-const.stderr
+++ b/tests/ui/parser/trait-pub-assoc-const.stderr
diff --git a/src/test/ui/parser/trait-pub-assoc-ty.rs b/tests/ui/parser/trait-pub-assoc-ty.rs
index a78dfbdcd..a78dfbdcd 100644
--- a/src/test/ui/parser/trait-pub-assoc-ty.rs
+++ b/tests/ui/parser/trait-pub-assoc-ty.rs
diff --git a/src/test/ui/parser/trait-pub-assoc-ty.stderr b/tests/ui/parser/trait-pub-assoc-ty.stderr
index e76373f5c..e76373f5c 100644
--- a/src/test/ui/parser/trait-pub-assoc-ty.stderr
+++ b/tests/ui/parser/trait-pub-assoc-ty.stderr
diff --git a/src/test/ui/parser/trait-pub-method.rs b/tests/ui/parser/trait-pub-method.rs
index 1f6ee028a..1f6ee028a 100644
--- a/src/test/ui/parser/trait-pub-method.rs
+++ b/tests/ui/parser/trait-pub-method.rs
diff --git a/src/test/ui/parser/trait-pub-method.stderr b/tests/ui/parser/trait-pub-method.stderr
index 0e3fe027c..0e3fe027c 100644
--- a/src/test/ui/parser/trait-pub-method.stderr
+++ b/tests/ui/parser/trait-pub-method.stderr
diff --git a/src/test/ui/parser/type-alias-where-fixable.fixed b/tests/ui/parser/type-alias-where-fixable.fixed
index 2f47c0d91..2f47c0d91 100644
--- a/src/test/ui/parser/type-alias-where-fixable.fixed
+++ b/tests/ui/parser/type-alias-where-fixable.fixed
diff --git a/src/test/ui/parser/type-alias-where-fixable.rs b/tests/ui/parser/type-alias-where-fixable.rs
index b20aa9398..b20aa9398 100644
--- a/src/test/ui/parser/type-alias-where-fixable.rs
+++ b/tests/ui/parser/type-alias-where-fixable.rs
diff --git a/src/test/ui/parser/type-alias-where-fixable.stderr b/tests/ui/parser/type-alias-where-fixable.stderr
index f0acb388b..f0acb388b 100644
--- a/src/test/ui/parser/type-alias-where-fixable.stderr
+++ b/tests/ui/parser/type-alias-where-fixable.stderr
diff --git a/src/test/ui/parser/type-alias-where.rs b/tests/ui/parser/type-alias-where.rs
index 62e301cb4..62e301cb4 100644
--- a/src/test/ui/parser/type-alias-where.rs
+++ b/tests/ui/parser/type-alias-where.rs
diff --git a/src/test/ui/parser/type-alias-where.stderr b/tests/ui/parser/type-alias-where.stderr
index fb8381792..fb8381792 100644
--- a/src/test/ui/parser/type-alias-where.stderr
+++ b/tests/ui/parser/type-alias-where.stderr
diff --git a/src/test/ui/parser/type-parameters-in-field-exprs.rs b/tests/ui/parser/type-parameters-in-field-exprs.rs
index 4cd77ebbd..4cd77ebbd 100644
--- a/src/test/ui/parser/type-parameters-in-field-exprs.rs
+++ b/tests/ui/parser/type-parameters-in-field-exprs.rs
diff --git a/src/test/ui/parser/type-parameters-in-field-exprs.stderr b/tests/ui/parser/type-parameters-in-field-exprs.stderr
index ce7364d35..ce7364d35 100644
--- a/src/test/ui/parser/type-parameters-in-field-exprs.stderr
+++ b/tests/ui/parser/type-parameters-in-field-exprs.stderr
diff --git a/src/test/ui/parser/unbalanced-doublequote.rs b/tests/ui/parser/unbalanced-doublequote.rs
index f21316205..f21316205 100644
--- a/src/test/ui/parser/unbalanced-doublequote.rs
+++ b/tests/ui/parser/unbalanced-doublequote.rs
diff --git a/src/test/ui/parser/unbalanced-doublequote.stderr b/tests/ui/parser/unbalanced-doublequote.stderr
index 94b300a7b..94b300a7b 100644
--- a/src/test/ui/parser/unbalanced-doublequote.stderr
+++ b/tests/ui/parser/unbalanced-doublequote.stderr
diff --git a/src/test/ui/parser/unclosed-braces.rs b/tests/ui/parser/unclosed-braces.rs
index ed94fff38..ed94fff38 100644
--- a/src/test/ui/parser/unclosed-braces.rs
+++ b/tests/ui/parser/unclosed-braces.rs
diff --git a/src/test/ui/parser/unclosed-braces.stderr b/tests/ui/parser/unclosed-braces.stderr
index cbc5f8de4..cbc5f8de4 100644
--- a/src/test/ui/parser/unclosed-braces.stderr
+++ b/tests/ui/parser/unclosed-braces.stderr
diff --git a/src/test/ui/parser/unclosed-delimiter-in-dep.rs b/tests/ui/parser/unclosed-delimiter-in-dep.rs
index 6db1b66e9..6db1b66e9 100644
--- a/src/test/ui/parser/unclosed-delimiter-in-dep.rs
+++ b/tests/ui/parser/unclosed-delimiter-in-dep.rs
diff --git a/src/test/ui/parser/unclosed-delimiter-in-dep.stderr b/tests/ui/parser/unclosed-delimiter-in-dep.stderr
index 1366ef1bb..1366ef1bb 100644
--- a/src/test/ui/parser/unclosed-delimiter-in-dep.stderr
+++ b/tests/ui/parser/unclosed-delimiter-in-dep.stderr
diff --git a/src/test/ui/parser/unclosed_delim_mod.rs b/tests/ui/parser/unclosed_delim_mod.rs
index d977d2c03..d977d2c03 100644
--- a/src/test/ui/parser/unclosed_delim_mod.rs
+++ b/tests/ui/parser/unclosed_delim_mod.rs
diff --git a/src/test/ui/parser/unclosed_delim_mod.stderr b/tests/ui/parser/unclosed_delim_mod.stderr
index a46d020b9..a46d020b9 100644
--- a/src/test/ui/parser/unclosed_delim_mod.stderr
+++ b/tests/ui/parser/unclosed_delim_mod.stderr
diff --git a/src/test/ui/parser/underscore-suffix-for-float.rs b/tests/ui/parser/underscore-suffix-for-float.rs
index c9b7eced0..c9b7eced0 100644
--- a/src/test/ui/parser/underscore-suffix-for-float.rs
+++ b/tests/ui/parser/underscore-suffix-for-float.rs
diff --git a/src/test/ui/parser/underscore-suffix-for-float.stderr b/tests/ui/parser/underscore-suffix-for-float.stderr
index a5f3b6551..a5f3b6551 100644
--- a/src/test/ui/parser/underscore-suffix-for-float.stderr
+++ b/tests/ui/parser/underscore-suffix-for-float.stderr
diff --git a/src/test/ui/parser/underscore-suffix-for-string.rs b/tests/ui/parser/underscore-suffix-for-string.rs
index bd260752e..bd260752e 100644
--- a/src/test/ui/parser/underscore-suffix-for-string.rs
+++ b/tests/ui/parser/underscore-suffix-for-string.rs
diff --git a/src/test/ui/parser/underscore-suffix-for-string.stderr b/tests/ui/parser/underscore-suffix-for-string.stderr
index 2fe2c130e..2fe2c130e 100644
--- a/src/test/ui/parser/underscore-suffix-for-string.stderr
+++ b/tests/ui/parser/underscore-suffix-for-string.stderr
diff --git a/src/test/ui/parser/underscore_item_not_const.rs b/tests/ui/parser/underscore_item_not_const.rs
index c01ac4752..c01ac4752 100644
--- a/src/test/ui/parser/underscore_item_not_const.rs
+++ b/tests/ui/parser/underscore_item_not_const.rs
diff --git a/src/test/ui/parser/underscore_item_not_const.stderr b/tests/ui/parser/underscore_item_not_const.stderr
index 0bc7642dd..0bc7642dd 100644
--- a/src/test/ui/parser/underscore_item_not_const.stderr
+++ b/tests/ui/parser/underscore_item_not_const.stderr
diff --git a/src/test/ui/parser/unicode-character-literal.fixed b/tests/ui/parser/unicode-character-literal.fixed
index 26ef5ffa1..26ef5ffa1 100644
--- a/src/test/ui/parser/unicode-character-literal.fixed
+++ b/tests/ui/parser/unicode-character-literal.fixed
diff --git a/src/test/ui/parser/unicode-character-literal.rs b/tests/ui/parser/unicode-character-literal.rs
index d331522c0..d331522c0 100644
--- a/src/test/ui/parser/unicode-character-literal.rs
+++ b/tests/ui/parser/unicode-character-literal.rs
diff --git a/src/test/ui/parser/unicode-character-literal.stderr b/tests/ui/parser/unicode-character-literal.stderr
index 5cd3bd0fe..5cd3bd0fe 100644
--- a/src/test/ui/parser/unicode-character-literal.stderr
+++ b/tests/ui/parser/unicode-character-literal.stderr
diff --git a/tests/ui/parser/unicode-chars.rs b/tests/ui/parser/unicode-chars.rs
new file mode 100644
index 000000000..cd25c7566
--- /dev/null
+++ b/tests/ui/parser/unicode-chars.rs
@@ -0,0 +1,12 @@
+fn main() {
+    let y = 0;
+    //~^ ERROR unknown start of token: \u{37e}
+    //~^^ HELP Unicode character ';' (Greek Question Mark) looks like ';' (Semicolon), but it is not
+        let x = 0;
+    //~^ ERROR unknown start of token: \u{a0}
+    //~^^ NOTE character appears 3 more times
+    //~^^^ HELP Unicode character ' ' (No-Break Space) looks like ' ' (Space), but it is not
+    let _ = 1 ⩵ 2;
+    //~^ ERROR unknown start of token
+    //~^^ HELP Unicode character '⩵' (Two Consecutive Equals Signs) looks like '==' (Double Equals Sign), but it is not
+}
diff --git a/tests/ui/parser/unicode-chars.stderr b/tests/ui/parser/unicode-chars.stderr
new file mode 100644
index 000000000..086de5ec0
--- /dev/null
+++ b/tests/ui/parser/unicode-chars.stderr
@@ -0,0 +1,36 @@
+error: unknown start of token: \u{37e}
+  --> $DIR/unicode-chars.rs:2:14
+   |
+LL |     let y = 0;
+   |              ^
+   |
+help: Unicode character ';' (Greek Question Mark) looks like ';' (Semicolon), but it is not
+   |
+LL |     let y = 0;
+   |              ~
+
+error: unknown start of token: \u{a0}
+  --> $DIR/unicode-chars.rs:5:5
+   |
+LL |         let x = 0;
+   |     ^^^^
+   |
+   = note: character appears 3 more times
+help: Unicode character ' ' (No-Break Space) looks like ' ' (Space), but it is not
+   |
+LL |         let x = 0;
+   |     ++++
+
+error: unknown start of token: \u{2a75}
+  --> $DIR/unicode-chars.rs:9:15
+   |
+LL |     let _ = 1 ⩵ 2;
+   |               ^
+   |
+help: Unicode character '⩵' (Two Consecutive Equals Signs) looks like '==' (Double Equals Sign), but it is not
+   |
+LL |     let _ = 1 == 2;
+   |               ~~
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/parser/unicode-control-codepoints.rs b/tests/ui/parser/unicode-control-codepoints.rs
index df099bb62..df099bb62 100644
--- a/src/test/ui/parser/unicode-control-codepoints.rs
+++ b/tests/ui/parser/unicode-control-codepoints.rs
diff --git a/src/test/ui/parser/unicode-control-codepoints.stderr b/tests/ui/parser/unicode-control-codepoints.stderr
index fc071a941..fc071a941 100644
--- a/src/test/ui/parser/unicode-control-codepoints.stderr
+++ b/tests/ui/parser/unicode-control-codepoints.stderr
diff --git a/src/test/ui/parser/unicode-quote-chars.rs b/tests/ui/parser/unicode-quote-chars.rs
index 868d2b227..868d2b227 100644
--- a/src/test/ui/parser/unicode-quote-chars.rs
+++ b/tests/ui/parser/unicode-quote-chars.rs
diff --git a/src/test/ui/parser/unicode-quote-chars.stderr b/tests/ui/parser/unicode-quote-chars.stderr
index 092abeb53..092abeb53 100644
--- a/src/test/ui/parser/unicode-quote-chars.stderr
+++ b/tests/ui/parser/unicode-quote-chars.stderr
diff --git a/src/test/ui/parser/unmatched-delimiter-at-end-of-file.rs b/tests/ui/parser/unmatched-delimiter-at-end-of-file.rs
index f56013266..f56013266 100644
--- a/src/test/ui/parser/unmatched-delimiter-at-end-of-file.rs
+++ b/tests/ui/parser/unmatched-delimiter-at-end-of-file.rs
diff --git a/src/test/ui/parser/unmatched-delimiter-at-end-of-file.stderr b/tests/ui/parser/unmatched-delimiter-at-end-of-file.stderr
index 430a13e6e..430a13e6e 100644
--- a/src/test/ui/parser/unmatched-delimiter-at-end-of-file.stderr
+++ b/tests/ui/parser/unmatched-delimiter-at-end-of-file.stderr
diff --git a/src/test/ui/parser/unmatched-langle-1.rs b/tests/ui/parser/unmatched-langle-1.rs
index fdf2ae398..fdf2ae398 100644
--- a/src/test/ui/parser/unmatched-langle-1.rs
+++ b/tests/ui/parser/unmatched-langle-1.rs
diff --git a/src/test/ui/parser/unmatched-langle-1.stderr b/tests/ui/parser/unmatched-langle-1.stderr
index cdf74bded..cdf74bded 100644
--- a/src/test/ui/parser/unmatched-langle-1.stderr
+++ b/tests/ui/parser/unmatched-langle-1.stderr
diff --git a/src/test/ui/parser/unmatched-langle-2.rs b/tests/ui/parser/unmatched-langle-2.rs
index 8de0d7d89..8de0d7d89 100644
--- a/src/test/ui/parser/unmatched-langle-2.rs
+++ b/tests/ui/parser/unmatched-langle-2.rs
diff --git a/src/test/ui/parser/unmatched-langle-2.stderr b/tests/ui/parser/unmatched-langle-2.stderr
index 773bb33d8..773bb33d8 100644
--- a/src/test/ui/parser/unmatched-langle-2.stderr
+++ b/tests/ui/parser/unmatched-langle-2.stderr
diff --git a/src/test/ui/parser/unnecessary-let.rs b/tests/ui/parser/unnecessary-let.rs
index 627910962..627910962 100644
--- a/src/test/ui/parser/unnecessary-let.rs
+++ b/tests/ui/parser/unnecessary-let.rs
diff --git a/src/test/ui/parser/unnecessary-let.stderr b/tests/ui/parser/unnecessary-let.stderr
index 952119cae..952119cae 100644
--- a/src/test/ui/parser/unnecessary-let.stderr
+++ b/tests/ui/parser/unnecessary-let.stderr
diff --git a/src/test/ui/parser/unsafe-foreign-mod-2.rs b/tests/ui/parser/unsafe-foreign-mod-2.rs
index 77856fb67..77856fb67 100644
--- a/src/test/ui/parser/unsafe-foreign-mod-2.rs
+++ b/tests/ui/parser/unsafe-foreign-mod-2.rs
diff --git a/src/test/ui/parser/unsafe-foreign-mod-2.stderr b/tests/ui/parser/unsafe-foreign-mod-2.stderr
index 7cc2de141..7cc2de141 100644
--- a/src/test/ui/parser/unsafe-foreign-mod-2.stderr
+++ b/tests/ui/parser/unsafe-foreign-mod-2.stderr
diff --git a/src/test/ui/parser/unsafe-foreign-mod.rs b/tests/ui/parser/unsafe-foreign-mod.rs
index eab134a4a..eab134a4a 100644
--- a/src/test/ui/parser/unsafe-foreign-mod.rs
+++ b/tests/ui/parser/unsafe-foreign-mod.rs
diff --git a/src/test/ui/parser/unsafe-foreign-mod.stderr b/tests/ui/parser/unsafe-foreign-mod.stderr
index 4acf72c5d..4acf72c5d 100644
--- a/src/test/ui/parser/unsafe-foreign-mod.stderr
+++ b/tests/ui/parser/unsafe-foreign-mod.stderr
diff --git a/src/test/ui/parser/unsafe-mod.rs b/tests/ui/parser/unsafe-mod.rs
index 7916d878e..7916d878e 100644
--- a/src/test/ui/parser/unsafe-mod.rs
+++ b/tests/ui/parser/unsafe-mod.rs
diff --git a/src/test/ui/parser/unsafe-mod.stderr b/tests/ui/parser/unsafe-mod.stderr
index dac6e7a35..dac6e7a35 100644
--- a/src/test/ui/parser/unsafe-mod.stderr
+++ b/tests/ui/parser/unsafe-mod.stderr
diff --git a/src/test/ui/parser/unsized.rs b/tests/ui/parser/unsized.rs
index e7fd7a196..e7fd7a196 100644
--- a/src/test/ui/parser/unsized.rs
+++ b/tests/ui/parser/unsized.rs
diff --git a/src/test/ui/parser/unsized.stderr b/tests/ui/parser/unsized.stderr
index 3d4ed526b..3d4ed526b 100644
--- a/src/test/ui/parser/unsized.stderr
+++ b/tests/ui/parser/unsized.stderr
diff --git a/src/test/ui/parser/unsized2.rs b/tests/ui/parser/unsized2.rs
index 21370b329..21370b329 100644
--- a/src/test/ui/parser/unsized2.rs
+++ b/tests/ui/parser/unsized2.rs
diff --git a/src/test/ui/parser/unsized2.stderr b/tests/ui/parser/unsized2.stderr
index 17e39b292..17e39b292 100644
--- a/src/test/ui/parser/unsized2.stderr
+++ b/tests/ui/parser/unsized2.stderr
diff --git a/src/test/ui/parser/use-as-where-use-ends-with-mod-sep.rs b/tests/ui/parser/use-as-where-use-ends-with-mod-sep.rs
index b4bb48418..b4bb48418 100644
--- a/src/test/ui/parser/use-as-where-use-ends-with-mod-sep.rs
+++ b/tests/ui/parser/use-as-where-use-ends-with-mod-sep.rs
diff --git a/src/test/ui/parser/use-as-where-use-ends-with-mod-sep.stderr b/tests/ui/parser/use-as-where-use-ends-with-mod-sep.stderr
index 192ab5eb7..192ab5eb7 100644
--- a/src/test/ui/parser/use-as-where-use-ends-with-mod-sep.stderr
+++ b/tests/ui/parser/use-as-where-use-ends-with-mod-sep.stderr
diff --git a/src/test/ui/parser/use-colon-as-mod-sep.rs b/tests/ui/parser/use-colon-as-mod-sep.rs
index e1e8756b0..e1e8756b0 100644
--- a/src/test/ui/parser/use-colon-as-mod-sep.rs
+++ b/tests/ui/parser/use-colon-as-mod-sep.rs
diff --git a/src/test/ui/parser/use-colon-as-mod-sep.stderr b/tests/ui/parser/use-colon-as-mod-sep.stderr
index e825dfed1..e825dfed1 100644
--- a/src/test/ui/parser/use-colon-as-mod-sep.stderr
+++ b/tests/ui/parser/use-colon-as-mod-sep.stderr
diff --git a/src/test/ui/parser/use-ends-with-mod-sep.rs b/tests/ui/parser/use-ends-with-mod-sep.rs
index ad8da4d18..ad8da4d18 100644
--- a/src/test/ui/parser/use-ends-with-mod-sep.rs
+++ b/tests/ui/parser/use-ends-with-mod-sep.rs
diff --git a/src/test/ui/parser/use-ends-with-mod-sep.stderr b/tests/ui/parser/use-ends-with-mod-sep.stderr
index bd0d881a0..bd0d881a0 100644
--- a/src/test/ui/parser/use-ends-with-mod-sep.stderr
+++ b/tests/ui/parser/use-ends-with-mod-sep.stderr
diff --git a/src/test/ui/parser/use-unclosed-brace.rs b/tests/ui/parser/use-unclosed-brace.rs
index 41742f37f..41742f37f 100644
--- a/src/test/ui/parser/use-unclosed-brace.rs
+++ b/tests/ui/parser/use-unclosed-brace.rs
diff --git a/src/test/ui/parser/use-unclosed-brace.stderr b/tests/ui/parser/use-unclosed-brace.stderr
index 438fe9c47..438fe9c47 100644
--- a/src/test/ui/parser/use-unclosed-brace.stderr
+++ b/tests/ui/parser/use-unclosed-brace.stderr
diff --git a/src/test/ui/parser/utf16-be-without-bom.rs b/tests/ui/parser/utf16-be-without-bom.rs
index 22aa19717..22aa19717 100644
--- a/src/test/ui/parser/utf16-be-without-bom.rs
+++ b/tests/ui/parser/utf16-be-without-bom.rs
diff --git a/src/test/ui/parser/utf16-be-without-bom.stderr b/tests/ui/parser/utf16-be-without-bom.stderr
index 768d2c531..768d2c531 100644
--- a/src/test/ui/parser/utf16-be-without-bom.stderr
+++ b/tests/ui/parser/utf16-be-without-bom.stderr
diff --git a/src/test/ui/parser/utf16-le-without-bom.rs b/tests/ui/parser/utf16-le-without-bom.rs
index 3c1049929..3c1049929 100644
--- a/src/test/ui/parser/utf16-le-without-bom.rs
+++ b/tests/ui/parser/utf16-le-without-bom.rs
diff --git a/src/test/ui/parser/utf16-le-without-bom.stderr b/tests/ui/parser/utf16-le-without-bom.stderr
index 4f4b91e39..4f4b91e39 100644
--- a/src/test/ui/parser/utf16-le-without-bom.stderr
+++ b/tests/ui/parser/utf16-le-without-bom.stderr
diff --git a/src/test/ui/parser/utf8_idents-rpass.rs b/tests/ui/parser/utf8_idents-rpass.rs
index 206744a58..206744a58 100644
--- a/src/test/ui/parser/utf8_idents-rpass.rs
+++ b/tests/ui/parser/utf8_idents-rpass.rs
diff --git a/src/test/ui/parser/variadic-ffi-nested-syntactic-fail.rs b/tests/ui/parser/variadic-ffi-nested-syntactic-fail.rs
index 9eeee195e..9eeee195e 100644
--- a/src/test/ui/parser/variadic-ffi-nested-syntactic-fail.rs
+++ b/tests/ui/parser/variadic-ffi-nested-syntactic-fail.rs
diff --git a/src/test/ui/parser/variadic-ffi-nested-syntactic-fail.stderr b/tests/ui/parser/variadic-ffi-nested-syntactic-fail.stderr
index 8b9d676a4..8b9d676a4 100644
--- a/src/test/ui/parser/variadic-ffi-nested-syntactic-fail.stderr
+++ b/tests/ui/parser/variadic-ffi-nested-syntactic-fail.stderr
diff --git a/src/test/ui/parser/variadic-ffi-semantic-restrictions.rs b/tests/ui/parser/variadic-ffi-semantic-restrictions.rs
index 0b61e267d..0b61e267d 100644
--- a/src/test/ui/parser/variadic-ffi-semantic-restrictions.rs
+++ b/tests/ui/parser/variadic-ffi-semantic-restrictions.rs
diff --git a/src/test/ui/parser/variadic-ffi-semantic-restrictions.stderr b/tests/ui/parser/variadic-ffi-semantic-restrictions.stderr
index f1cbbb279..f1cbbb279 100644
--- a/src/test/ui/parser/variadic-ffi-semantic-restrictions.stderr
+++ b/tests/ui/parser/variadic-ffi-semantic-restrictions.stderr
diff --git a/src/test/ui/parser/variadic-ffi-syntactic-pass.rs b/tests/ui/parser/variadic-ffi-syntactic-pass.rs
index 3875d6af1..3875d6af1 100644
--- a/src/test/ui/parser/variadic-ffi-syntactic-pass.rs
+++ b/tests/ui/parser/variadic-ffi-syntactic-pass.rs
diff --git a/src/test/ui/parser/virtual-structs.rs b/tests/ui/parser/virtual-structs.rs
index ce57a3454..ce57a3454 100644
--- a/src/test/ui/parser/virtual-structs.rs
+++ b/tests/ui/parser/virtual-structs.rs
diff --git a/src/test/ui/parser/virtual-structs.stderr b/tests/ui/parser/virtual-structs.stderr
index a5211d83f..a5211d83f 100644
--- a/src/test/ui/parser/virtual-structs.stderr
+++ b/tests/ui/parser/virtual-structs.stderr
diff --git a/src/test/ui/parser/where-clauses-no-bounds-or-predicates.rs b/tests/ui/parser/where-clauses-no-bounds-or-predicates.rs
index e80db5372..e80db5372 100644
--- a/src/test/ui/parser/where-clauses-no-bounds-or-predicates.rs
+++ b/tests/ui/parser/where-clauses-no-bounds-or-predicates.rs
diff --git a/src/test/ui/parser/where-clauses-no-bounds-or-predicates.stderr b/tests/ui/parser/where-clauses-no-bounds-or-predicates.stderr
index b80b0a409..b80b0a409 100644
--- a/src/test/ui/parser/where-clauses-no-bounds-or-predicates.stderr
+++ b/tests/ui/parser/where-clauses-no-bounds-or-predicates.stderr
diff --git a/src/test/ui/parser/where_with_bound.rs b/tests/ui/parser/where_with_bound.rs
index 3ca45f188..3ca45f188 100644
--- a/src/test/ui/parser/where_with_bound.rs
+++ b/tests/ui/parser/where_with_bound.rs
diff --git a/src/test/ui/parser/where_with_bound.stderr b/tests/ui/parser/where_with_bound.stderr
index ff98b3f5f..ff98b3f5f 100644
--- a/src/test/ui/parser/where_with_bound.stderr
+++ b/tests/ui/parser/where_with_bound.stderr
diff --git a/src/test/ui/parser/while-if-let-without-body.rs b/tests/ui/parser/while-if-let-without-body.rs
index 063c0145c..063c0145c 100644
--- a/src/test/ui/parser/while-if-let-without-body.rs
+++ b/tests/ui/parser/while-if-let-without-body.rs
diff --git a/src/test/ui/parser/while-if-let-without-body.stderr b/tests/ui/parser/while-if-let-without-body.stderr
index 2dac45c11..2dac45c11 100644
--- a/src/test/ui/parser/while-if-let-without-body.stderr
+++ b/tests/ui/parser/while-if-let-without-body.stderr
diff --git a/src/test/ui/parser/wrong-escape-of-curly-braces.rs b/tests/ui/parser/wrong-escape-of-curly-braces.rs
index 8e5258acd..8e5258acd 100644
--- a/src/test/ui/parser/wrong-escape-of-curly-braces.rs
+++ b/tests/ui/parser/wrong-escape-of-curly-braces.rs
diff --git a/src/test/ui/parser/wrong-escape-of-curly-braces.stderr b/tests/ui/parser/wrong-escape-of-curly-braces.stderr
index ff1a2fb0f..ff1a2fb0f 100644
--- a/src/test/ui/parser/wrong-escape-of-curly-braces.stderr
+++ b/tests/ui/parser/wrong-escape-of-curly-braces.stderr