499 files changed, 247 insertions, 18 deletions

diff --git a/src/test/ui/macros/ambiguity-legacy-vs-modern.rs b/tests/ui/macros/ambiguity-legacy-vs-modern.rs
index 216b9dd05..216b9dd05 100644
--- a/src/test/ui/macros/ambiguity-legacy-vs-modern.rs
+++ b/tests/ui/macros/ambiguity-legacy-vs-modern.rs
diff --git a/src/test/ui/macros/ambiguity-legacy-vs-modern.stderr b/tests/ui/macros/ambiguity-legacy-vs-modern.stderr
index 330aa6acf..330aa6acf 100644
--- a/src/test/ui/macros/ambiguity-legacy-vs-modern.stderr
+++ b/tests/ui/macros/ambiguity-legacy-vs-modern.stderr
diff --git a/src/test/ui/macros/assert-as-macro.rs b/tests/ui/macros/assert-as-macro.rs
index 23c054808..23c054808 100644
--- a/src/test/ui/macros/assert-as-macro.rs
+++ b/tests/ui/macros/assert-as-macro.rs
diff --git a/src/test/ui/macros/assert-eq-macro-msg.rs b/tests/ui/macros/assert-eq-macro-msg.rs
index accbd2d1e..accbd2d1e 100644
--- a/src/test/ui/macros/assert-eq-macro-msg.rs
+++ b/tests/ui/macros/assert-eq-macro-msg.rs
diff --git a/src/test/ui/macros/assert-eq-macro-panic.rs b/tests/ui/macros/assert-eq-macro-panic.rs
index 5e505c30b..5e505c30b 100644
--- a/src/test/ui/macros/assert-eq-macro-panic.rs
+++ b/tests/ui/macros/assert-eq-macro-panic.rs
diff --git a/src/test/ui/macros/assert-eq-macro-success.rs b/tests/ui/macros/assert-eq-macro-success.rs
index 57858b348..57858b348 100644
--- a/src/test/ui/macros/assert-eq-macro-success.rs
+++ b/tests/ui/macros/assert-eq-macro-success.rs
diff --git a/src/test/ui/macros/assert-eq-macro-unsized.rs b/tests/ui/macros/assert-eq-macro-unsized.rs
index 00823216b..00823216b 100644
--- a/src/test/ui/macros/assert-eq-macro-unsized.rs
+++ b/tests/ui/macros/assert-eq-macro-unsized.rs
diff --git a/src/test/ui/macros/assert-format-lazy.rs b/tests/ui/macros/assert-format-lazy.rs
index c7f05d763..c7f05d763 100644
--- a/src/test/ui/macros/assert-format-lazy.rs
+++ b/tests/ui/macros/assert-format-lazy.rs
diff --git a/src/test/ui/macros/assert-macro-explicit.rs b/tests/ui/macros/assert-macro-explicit.rs
index 578ef5632..578ef5632 100644
--- a/src/test/ui/macros/assert-macro-explicit.rs
+++ b/tests/ui/macros/assert-macro-explicit.rs
diff --git a/src/test/ui/macros/assert-macro-fmt.rs b/tests/ui/macros/assert-macro-fmt.rs
index b8d319d85..b8d319d85 100644
--- a/src/test/ui/macros/assert-macro-fmt.rs
+++ b/tests/ui/macros/assert-macro-fmt.rs
diff --git a/src/test/ui/macros/assert-macro-owned.rs b/tests/ui/macros/assert-macro-owned.rs
index 753675872..753675872 100644
--- a/src/test/ui/macros/assert-macro-owned.rs
+++ b/tests/ui/macros/assert-macro-owned.rs
diff --git a/src/test/ui/macros/assert-macro-static.rs b/tests/ui/macros/assert-macro-static.rs
index dc5274a7e..dc5274a7e 100644
--- a/src/test/ui/macros/assert-macro-static.rs
+++ b/tests/ui/macros/assert-macro-static.rs
diff --git a/src/test/ui/macros/assert-matches-macro-msg.rs b/tests/ui/macros/assert-matches-macro-msg.rs
index fd8cd5a1a..fd8cd5a1a 100644
--- a/src/test/ui/macros/assert-matches-macro-msg.rs
+++ b/tests/ui/macros/assert-matches-macro-msg.rs
diff --git a/src/test/ui/macros/assert-ne-macro-msg.rs b/tests/ui/macros/assert-ne-macro-msg.rs
index fc0472b99..fc0472b99 100644
--- a/src/test/ui/macros/assert-ne-macro-msg.rs
+++ b/tests/ui/macros/assert-ne-macro-msg.rs
diff --git a/src/test/ui/macros/assert-ne-macro-panic.rs b/tests/ui/macros/assert-ne-macro-panic.rs
index 4f507d7b5..4f507d7b5 100644
--- a/src/test/ui/macros/assert-ne-macro-panic.rs
+++ b/tests/ui/macros/assert-ne-macro-panic.rs
diff --git a/src/test/ui/macros/assert-ne-macro-success.rs b/tests/ui/macros/assert-ne-macro-success.rs
index 89b3a4c9d..89b3a4c9d 100644
--- a/src/test/ui/macros/assert-ne-macro-success.rs
+++ b/tests/ui/macros/assert-ne-macro-success.rs
diff --git a/src/test/ui/macros/assert-ne-macro-unsized.rs b/tests/ui/macros/assert-ne-macro-unsized.rs
index e8a86e3da..e8a86e3da 100644
--- a/src/test/ui/macros/assert-ne-macro-unsized.rs
+++ b/tests/ui/macros/assert-ne-macro-unsized.rs
diff --git a/src/test/ui/macros/assert-trailing-junk.rs b/tests/ui/macros/assert-trailing-junk.rs
index da725e19e..da725e19e 100644
--- a/src/test/ui/macros/assert-trailing-junk.rs
+++ b/tests/ui/macros/assert-trailing-junk.rs
diff --git a/src/test/ui/macros/assert-trailing-junk.with-generic-asset.stderr b/tests/ui/macros/assert-trailing-junk.with-generic-asset.stderr
index 1e73320e4..1e73320e4 100644
--- a/src/test/ui/macros/assert-trailing-junk.with-generic-asset.stderr
+++ b/tests/ui/macros/assert-trailing-junk.with-generic-asset.stderr
diff --git a/src/test/ui/macros/assert-trailing-junk.without-generic-asset.stderr b/tests/ui/macros/assert-trailing-junk.without-generic-asset.stderr
index 1e73320e4..1e73320e4 100644
--- a/src/test/ui/macros/assert-trailing-junk.without-generic-asset.stderr
+++ b/tests/ui/macros/assert-trailing-junk.without-generic-asset.stderr
diff --git a/src/test/ui/macros/assert.rs b/tests/ui/macros/assert.rs
index a314db907..a314db907 100644
--- a/src/test/ui/macros/assert.rs
+++ b/tests/ui/macros/assert.rs
diff --git a/src/test/ui/macros/assert.with-generic-asset.stderr b/tests/ui/macros/assert.with-generic-asset.stderr
index 51d8f28a3..51d8f28a3 100644
--- a/src/test/ui/macros/assert.with-generic-asset.stderr
+++ b/tests/ui/macros/assert.with-generic-asset.stderr
diff --git a/src/test/ui/macros/assert.without-generic-asset.stderr b/tests/ui/macros/assert.without-generic-asset.stderr
index 51d8f28a3..51d8f28a3 100644
--- a/src/test/ui/macros/assert.without-generic-asset.stderr
+++ b/tests/ui/macros/assert.without-generic-asset.stderr
diff --git a/src/test/ui/macros/attr-empty-expr.rs b/tests/ui/macros/attr-empty-expr.rs
index d4d1a3ee7..d4d1a3ee7 100644
--- a/src/test/ui/macros/attr-empty-expr.rs
+++ b/tests/ui/macros/attr-empty-expr.rs
diff --git a/src/test/ui/macros/attr-empty-expr.stderr b/tests/ui/macros/attr-empty-expr.stderr
index 53721053b..53721053b 100644
--- a/src/test/ui/macros/attr-empty-expr.stderr
+++ b/tests/ui/macros/attr-empty-expr.stderr
diff --git a/src/test/ui/macros/attr-from-macro.rs b/tests/ui/macros/attr-from-macro.rs
index bb3a5c94d..bb3a5c94d 100644
--- a/src/test/ui/macros/attr-from-macro.rs
+++ b/tests/ui/macros/attr-from-macro.rs
diff --git a/src/test/ui/macros/auxiliary/attr-from-macro.rs b/tests/ui/macros/auxiliary/attr-from-macro.rs
index 9b388675c..9b388675c 100644
--- a/src/test/ui/macros/auxiliary/attr-from-macro.rs
+++ b/tests/ui/macros/auxiliary/attr-from-macro.rs
diff --git a/src/test/ui/macros/auxiliary/define-macro.rs b/tests/ui/macros/auxiliary/define-macro.rs
index 4956907c5..4956907c5 100644
--- a/src/test/ui/macros/auxiliary/define-macro.rs
+++ b/tests/ui/macros/auxiliary/define-macro.rs
diff --git a/src/test/ui/macros/auxiliary/deprecated-macros.rs b/tests/ui/macros/auxiliary/deprecated-macros.rs
index 657a7252a..657a7252a 100644
--- a/src/test/ui/macros/auxiliary/deprecated-macros.rs
+++ b/tests/ui/macros/auxiliary/deprecated-macros.rs
diff --git a/src/test/ui/macros/auxiliary/dollar-crate-nested-encoding.rs b/tests/ui/macros/auxiliary/dollar-crate-nested-encoding.rs
index bbe6a48c5..bbe6a48c5 100644
--- a/src/test/ui/macros/auxiliary/dollar-crate-nested-encoding.rs
+++ b/tests/ui/macros/auxiliary/dollar-crate-nested-encoding.rs
diff --git a/src/test/ui/macros/auxiliary/foreign-crate-macro-pat.rs b/tests/ui/macros/auxiliary/foreign-crate-macro-pat.rs
index 26d4c96d5..26d4c96d5 100644
--- a/src/test/ui/macros/auxiliary/foreign-crate-macro-pat.rs
+++ b/tests/ui/macros/auxiliary/foreign-crate-macro-pat.rs
diff --git a/src/test/ui/macros/auxiliary/issue-100199.rs b/tests/ui/macros/auxiliary/issue-100199.rs
index 9e190b542..9e190b542 100644
--- a/src/test/ui/macros/auxiliary/issue-100199.rs
+++ b/tests/ui/macros/auxiliary/issue-100199.rs
diff --git a/src/test/ui/macros/auxiliary/issue-19163.rs b/tests/ui/macros/auxiliary/issue-19163.rs
index 0c0d9e43c..0c0d9e43c 100644
--- a/src/test/ui/macros/auxiliary/issue-19163.rs
+++ b/tests/ui/macros/auxiliary/issue-19163.rs
diff --git a/src/test/ui/macros/auxiliary/issue-40469.rs b/tests/ui/macros/auxiliary/issue-40469.rs
index 4f2f41f2c..4f2f41f2c 100644
--- a/src/test/ui/macros/auxiliary/issue-40469.rs
+++ b/tests/ui/macros/auxiliary/issue-40469.rs
diff --git a/src/test/ui/macros/auxiliary/issue-75982.rs b/tests/ui/macros/auxiliary/issue-75982.rs
index 1e1a6126a..1e1a6126a 100644
--- a/src/test/ui/macros/auxiliary/issue-75982.rs
+++ b/tests/ui/macros/auxiliary/issue-75982.rs
diff --git a/src/test/ui/macros/auxiliary/macro-comma-support.rs b/tests/ui/macros/auxiliary/macro-comma-support.rs
index 6a452c185..6a452c185 100644
--- a/src/test/ui/macros/auxiliary/macro-comma-support.rs
+++ b/tests/ui/macros/auxiliary/macro-comma-support.rs
diff --git a/src/test/ui/macros/auxiliary/macro-def-site-super.rs b/tests/ui/macros/auxiliary/macro-def-site-super.rs
index cab747c2c..cab747c2c 100644
--- a/src/test/ui/macros/auxiliary/macro-def-site-super.rs
+++ b/tests/ui/macros/auxiliary/macro-def-site-super.rs
diff --git a/src/test/ui/macros/auxiliary/macro-in-other-crate.rs b/tests/ui/macros/auxiliary/macro-in-other-crate.rs
index db8e92018..db8e92018 100644
--- a/src/test/ui/macros/auxiliary/macro-in-other-crate.rs
+++ b/tests/ui/macros/auxiliary/macro-in-other-crate.rs
diff --git a/src/test/ui/macros/auxiliary/macro-include-items-expr.rs b/tests/ui/macros/auxiliary/macro-include-items-expr.rs
index 7394f194b..7394f194b 100644
--- a/src/test/ui/macros/auxiliary/macro-include-items-expr.rs
+++ b/tests/ui/macros/auxiliary/macro-include-items-expr.rs
diff --git a/src/test/ui/macros/auxiliary/macro-include-items-item.rs b/tests/ui/macros/auxiliary/macro-include-items-item.rs
index 7d54745e0..7d54745e0 100644
--- a/src/test/ui/macros/auxiliary/macro-include-items-item.rs
+++ b/tests/ui/macros/auxiliary/macro-include-items-item.rs
diff --git a/src/test/ui/macros/auxiliary/macro_crate_def_only.rs b/tests/ui/macros/auxiliary/macro_crate_def_only.rs
index c267eefde..c267eefde 100644
--- a/src/test/ui/macros/auxiliary/macro_crate_def_only.rs
+++ b/tests/ui/macros/auxiliary/macro_crate_def_only.rs
diff --git a/src/test/ui/macros/auxiliary/macro_crate_nonterminal.rs b/tests/ui/macros/auxiliary/macro_crate_nonterminal.rs
index 2e2440462..2e2440462 100644
--- a/src/test/ui/macros/auxiliary/macro_crate_nonterminal.rs
+++ b/tests/ui/macros/auxiliary/macro_crate_nonterminal.rs
diff --git a/src/test/ui/macros/auxiliary/macro_export_inner_module.rs b/tests/ui/macros/auxiliary/macro_export_inner_module.rs
index d71af9ee6..d71af9ee6 100644
--- a/src/test/ui/macros/auxiliary/macro_export_inner_module.rs
+++ b/tests/ui/macros/auxiliary/macro_export_inner_module.rs
diff --git a/src/test/ui/macros/auxiliary/macro_with_super_1.rs b/tests/ui/macros/auxiliary/macro_with_super_1.rs
index b015500df..b015500df 100644
--- a/src/test/ui/macros/auxiliary/macro_with_super_1.rs
+++ b/tests/ui/macros/auxiliary/macro_with_super_1.rs
diff --git a/src/test/ui/macros/auxiliary/or-pattern.rs b/tests/ui/macros/auxiliary/or-pattern.rs
index a319c405e..a319c405e 100644
--- a/src/test/ui/macros/auxiliary/or-pattern.rs
+++ b/tests/ui/macros/auxiliary/or-pattern.rs
diff --git a/src/test/ui/macros/auxiliary/proc_macro_def.rs b/tests/ui/macros/auxiliary/proc_macro_def.rs
index 0497e4ae0..0497e4ae0 100644
--- a/src/test/ui/macros/auxiliary/proc_macro_def.rs
+++ b/tests/ui/macros/auxiliary/proc_macro_def.rs
diff --git a/src/test/ui/macros/auxiliary/proc_macro_sequence.rs b/tests/ui/macros/auxiliary/proc_macro_sequence.rs
index 1331480d8..1331480d8 100644
--- a/src/test/ui/macros/auxiliary/proc_macro_sequence.rs
+++ b/tests/ui/macros/auxiliary/proc_macro_sequence.rs
diff --git a/src/test/ui/macros/auxiliary/two_macros-rpass.rs b/tests/ui/macros/auxiliary/two_macros-rpass.rs
index 441a978dd..441a978dd 100644
--- a/src/test/ui/macros/auxiliary/two_macros-rpass.rs
+++ b/tests/ui/macros/auxiliary/two_macros-rpass.rs
diff --git a/src/test/ui/macros/auxiliary/two_macros.rs b/tests/ui/macros/auxiliary/two_macros.rs
index 2330c75c8..2330c75c8 100644
--- a/src/test/ui/macros/auxiliary/two_macros.rs
+++ b/tests/ui/macros/auxiliary/two_macros.rs
diff --git a/src/test/ui/macros/auxiliary/unstable-macros.rs b/tests/ui/macros/auxiliary/unstable-macros.rs
index 3aadd4b0c..3aadd4b0c 100644
--- a/src/test/ui/macros/auxiliary/unstable-macros.rs
+++ b/tests/ui/macros/auxiliary/unstable-macros.rs
diff --git a/src/test/ui/macros/auxiliary/use-macro-self.rs b/tests/ui/macros/auxiliary/use-macro-self.rs
index f1307411a..f1307411a 100644
--- a/src/test/ui/macros/auxiliary/use-macro-self.rs
+++ b/tests/ui/macros/auxiliary/use-macro-self.rs
diff --git a/src/test/ui/macros/bad-concat.rs b/tests/ui/macros/bad-concat.rs
index 263cd074d..263cd074d 100644
--- a/src/test/ui/macros/bad-concat.rs
+++ b/tests/ui/macros/bad-concat.rs
diff --git a/src/test/ui/macros/bad-concat.stderr b/tests/ui/macros/bad-concat.stderr
index 4316fd312..4316fd312 100644
--- a/src/test/ui/macros/bad-concat.stderr
+++ b/tests/ui/macros/bad-concat.stderr
diff --git a/src/test/ui/macros/bad_hello.rs b/tests/ui/macros/bad_hello.rs
index aaa9e243a..aaa9e243a 100644
--- a/src/test/ui/macros/bad_hello.rs
+++ b/tests/ui/macros/bad_hello.rs
diff --git a/src/test/ui/macros/bad_hello.stderr b/tests/ui/macros/bad_hello.stderr
index fc9bb82b7..fc9bb82b7 100644
--- a/src/test/ui/macros/bad_hello.stderr
+++ b/tests/ui/macros/bad_hello.stderr
diff --git a/src/test/ui/macros/bang-after-name.fixed b/tests/ui/macros/bang-after-name.fixed
index c107ddd5d..c107ddd5d 100644
--- a/src/test/ui/macros/bang-after-name.fixed
+++ b/tests/ui/macros/bang-after-name.fixed
diff --git a/src/test/ui/macros/bang-after-name.rs b/tests/ui/macros/bang-after-name.rs
index 7654d8c44..7654d8c44 100644
--- a/src/test/ui/macros/bang-after-name.rs
+++ b/tests/ui/macros/bang-after-name.rs
diff --git a/src/test/ui/macros/bang-after-name.stderr b/tests/ui/macros/bang-after-name.stderr
index f609c4943..f609c4943 100644
--- a/src/test/ui/macros/bang-after-name.stderr
+++ b/tests/ui/macros/bang-after-name.stderr
diff --git a/tests/ui/macros/best-failure.rs b/tests/ui/macros/best-failure.rs
new file mode 100644
index 000000000..bbdd465d5
--- /dev/null
+++ b/tests/ui/macros/best-failure.rs
@@ -0,0 +1,11 @@
+macro_rules! number {
+    (neg false, $self:ident) => { $self };
+    ($signed:tt => $ty:ty;) => {
+        number!(neg $signed, $self);
+        //~^ ERROR no rules expected the token `$`
+    };
+}
+
+number! { false => u8; }
+
+fn main() {}
diff --git a/tests/ui/macros/best-failure.stderr b/tests/ui/macros/best-failure.stderr
new file mode 100644
index 000000000..a52fc5e3d
--- /dev/null
+++ b/tests/ui/macros/best-failure.stderr
@@ -0,0 +1,21 @@
+error: no rules expected the token `$`
+  --> $DIR/best-failure.rs:4:30
+   |
+LL | macro_rules! number {
+   | ------------------- when calling this macro
+...
+LL |         number!(neg $signed, $self);
+   |                              ^^^^^ no rules expected this token in macro call
+...
+LL | number! { false => u8; }
+   | ------------------------ in this macro invocation
+   |
+note: while trying to match meta-variable `$self:ident`
+  --> $DIR/best-failure.rs:2:17
+   |
+LL |     (neg false, $self:ident) => { $self };
+   |                 ^^^^^^^^^^^
+   = note: this error originates in the macro `number` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/macros/builtin-prelude-no-accidents.rs b/tests/ui/macros/builtin-prelude-no-accidents.rs
index 01691a82d..01691a82d 100644
--- a/src/test/ui/macros/builtin-prelude-no-accidents.rs
+++ b/tests/ui/macros/builtin-prelude-no-accidents.rs
diff --git a/src/test/ui/macros/builtin-prelude-no-accidents.stderr b/tests/ui/macros/builtin-prelude-no-accidents.stderr
index 56af618d4..56af618d4 100644
--- a/src/test/ui/macros/builtin-prelude-no-accidents.stderr
+++ b/tests/ui/macros/builtin-prelude-no-accidents.stderr
diff --git a/src/test/ui/macros/builtin-std-paths-fail.rs b/tests/ui/macros/builtin-std-paths-fail.rs
index c1a4e32a6..c1a4e32a6 100644
--- a/src/test/ui/macros/builtin-std-paths-fail.rs
+++ b/tests/ui/macros/builtin-std-paths-fail.rs
diff --git a/src/test/ui/macros/builtin-std-paths-fail.stderr b/tests/ui/macros/builtin-std-paths-fail.stderr
index ba6261011..ba6261011 100644
--- a/src/test/ui/macros/builtin-std-paths-fail.stderr
+++ b/tests/ui/macros/builtin-std-paths-fail.stderr
diff --git a/src/test/ui/macros/builtin-std-paths.rs b/tests/ui/macros/builtin-std-paths.rs
index 2083f9ba3..2083f9ba3 100644
--- a/src/test/ui/macros/builtin-std-paths.rs
+++ b/tests/ui/macros/builtin-std-paths.rs
diff --git a/src/test/ui/macros/cfg.rs b/tests/ui/macros/cfg.rs
index 2aac50a9d..2aac50a9d 100644
--- a/src/test/ui/macros/cfg.rs
+++ b/tests/ui/macros/cfg.rs
diff --git a/src/test/ui/macros/cfg.stderr b/tests/ui/macros/cfg.stderr
index 2633d5f72..2633d5f72 100644
--- a/src/test/ui/macros/cfg.stderr
+++ b/tests/ui/macros/cfg.stderr
diff --git a/src/test/ui/macros/colorful-write-macros.rs b/tests/ui/macros/colorful-write-macros.rs
index eb1872cc7..eb1872cc7 100644
--- a/src/test/ui/macros/colorful-write-macros.rs
+++ b/tests/ui/macros/colorful-write-macros.rs
diff --git a/src/test/ui/macros/concat-bytes-error.rs b/tests/ui/macros/concat-bytes-error.rs
index db5d3cab0..db5d3cab0 100644
--- a/src/test/ui/macros/concat-bytes-error.rs
+++ b/tests/ui/macros/concat-bytes-error.rs
diff --git a/src/test/ui/macros/concat-bytes-error.stderr b/tests/ui/macros/concat-bytes-error.stderr
index d6cd1a3d1..d6cd1a3d1 100644
--- a/src/test/ui/macros/concat-bytes-error.stderr
+++ b/tests/ui/macros/concat-bytes-error.stderr
diff --git a/src/test/ui/macros/concat-bytes.rs b/tests/ui/macros/concat-bytes.rs
index fd8f99417..fd8f99417 100644
--- a/src/test/ui/macros/concat-bytes.rs
+++ b/tests/ui/macros/concat-bytes.rs
diff --git a/src/test/ui/macros/concat-rpass.rs b/tests/ui/macros/concat-rpass.rs
index 0c30a39d6..0c30a39d6 100644
--- a/src/test/ui/macros/concat-rpass.rs
+++ b/tests/ui/macros/concat-rpass.rs
diff --git a/src/test/ui/macros/concat.rs b/tests/ui/macros/concat.rs
index d7ab7d626..d7ab7d626 100644
--- a/src/test/ui/macros/concat.rs
+++ b/tests/ui/macros/concat.rs
diff --git a/src/test/ui/macros/concat.stderr b/tests/ui/macros/concat.stderr
index 61fb9de1e..61fb9de1e 100644
--- a/src/test/ui/macros/concat.stderr
+++ b/tests/ui/macros/concat.stderr
diff --git a/src/test/ui/macros/conditional-debug-macro-on.rs b/tests/ui/macros/conditional-debug-macro-on.rs
index 8665da897..8665da897 100644
--- a/src/test/ui/macros/conditional-debug-macro-on.rs
+++ b/tests/ui/macros/conditional-debug-macro-on.rs
diff --git a/src/test/ui/macros/cross-crate-pat-span.rs b/tests/ui/macros/cross-crate-pat-span.rs
index ed67142ce..ed67142ce 100644
--- a/src/test/ui/macros/cross-crate-pat-span.rs
+++ b/tests/ui/macros/cross-crate-pat-span.rs
diff --git a/src/test/ui/macros/derive-in-eager-expansion-hang.rs b/tests/ui/macros/derive-in-eager-expansion-hang.rs
index 0729e14d5..0729e14d5 100644
--- a/src/test/ui/macros/derive-in-eager-expansion-hang.rs
+++ b/tests/ui/macros/derive-in-eager-expansion-hang.rs
diff --git a/src/test/ui/macros/derive-in-eager-expansion-hang.stderr b/tests/ui/macros/derive-in-eager-expansion-hang.stderr
index e0a4f3878..e0a4f3878 100644
--- a/src/test/ui/macros/derive-in-eager-expansion-hang.stderr
+++ b/tests/ui/macros/derive-in-eager-expansion-hang.stderr
diff --git a/src/test/ui/macros/die-macro-2.rs b/tests/ui/macros/die-macro-2.rs
index ebbce528a..ebbce528a 100644
--- a/src/test/ui/macros/die-macro-2.rs
+++ b/tests/ui/macros/die-macro-2.rs
diff --git a/src/test/ui/macros/die-macro-expr.rs b/tests/ui/macros/die-macro-expr.rs
index c4b5f68dd..c4b5f68dd 100644
--- a/src/test/ui/macros/die-macro-expr.rs
+++ b/tests/ui/macros/die-macro-expr.rs
diff --git a/src/test/ui/macros/die-macro-pure.rs b/tests/ui/macros/die-macro-pure.rs
index 588fbe61b..588fbe61b 100644
--- a/src/test/ui/macros/die-macro-pure.rs
+++ b/tests/ui/macros/die-macro-pure.rs
diff --git a/src/test/ui/macros/die-macro.rs b/tests/ui/macros/die-macro.rs
index 2a726efe8..2a726efe8 100644
--- a/src/test/ui/macros/die-macro.rs
+++ b/tests/ui/macros/die-macro.rs
diff --git a/src/test/ui/macros/doc-comment.rs b/tests/ui/macros/doc-comment.rs
index 9de39e9b5..9de39e9b5 100644
--- a/src/test/ui/macros/doc-comment.rs
+++ b/tests/ui/macros/doc-comment.rs
diff --git a/src/test/ui/macros/dollar-crate-nested-encoding.rs b/tests/ui/macros/dollar-crate-nested-encoding.rs
index 5242f7830..5242f7830 100644
--- a/src/test/ui/macros/dollar-crate-nested-encoding.rs
+++ b/tests/ui/macros/dollar-crate-nested-encoding.rs
diff --git a/src/test/ui/macros/duplicate-builtin.rs b/tests/ui/macros/duplicate-builtin.rs
index 35f0f4290..35f0f4290 100644
--- a/src/test/ui/macros/duplicate-builtin.rs
+++ b/tests/ui/macros/duplicate-builtin.rs
diff --git a/src/test/ui/macros/duplicate-builtin.stderr b/tests/ui/macros/duplicate-builtin.stderr
index 58accea27..58accea27 100644
--- a/src/test/ui/macros/duplicate-builtin.stderr
+++ b/tests/ui/macros/duplicate-builtin.stderr
diff --git a/src/test/ui/macros/edition-macro-pats.rs b/tests/ui/macros/edition-macro-pats.rs
index 040894712..040894712 100644
--- a/src/test/ui/macros/edition-macro-pats.rs
+++ b/tests/ui/macros/edition-macro-pats.rs
diff --git a/src/test/ui/macros/empty-trailing-stmt.rs b/tests/ui/macros/empty-trailing-stmt.rs
index 3d78ed4a4..3d78ed4a4 100644
--- a/src/test/ui/macros/empty-trailing-stmt.rs
+++ b/tests/ui/macros/empty-trailing-stmt.rs
diff --git a/src/test/ui/macros/empty-trailing-stmt.stderr b/tests/ui/macros/empty-trailing-stmt.stderr
index 97a2edd39..97a2edd39 100644
--- a/src/test/ui/macros/empty-trailing-stmt.stderr
+++ b/tests/ui/macros/empty-trailing-stmt.stderr
diff --git a/src/test/ui/macros/format-args-temporaries-async.rs b/tests/ui/macros/format-args-temporaries-async.rs
index d959329b9..d959329b9 100644
--- a/src/test/ui/macros/format-args-temporaries-async.rs
+++ b/tests/ui/macros/format-args-temporaries-async.rs
diff --git a/src/test/ui/macros/format-args-temporaries-in-write.rs b/tests/ui/macros/format-args-temporaries-in-write.rs
index 339ccbc33..339ccbc33 100644
--- a/src/test/ui/macros/format-args-temporaries-in-write.rs
+++ b/tests/ui/macros/format-args-temporaries-in-write.rs
diff --git a/tests/ui/macros/format-args-temporaries-in-write.stderr b/tests/ui/macros/format-args-temporaries-in-write.stderr
new file mode 100644
index 000000000..287cd7d67
--- /dev/null
+++ b/tests/ui/macros/format-args-temporaries-in-write.stderr
@@ -0,0 +1,33 @@
+error[E0597]: `mutex` does not live long enough
+  --> $DIR/format-args-temporaries-in-write.rs:41:27
+   |
+LL |         write!(Out, "{}", mutex.lock()) /* no semicolon */
+   |                           ^^^^^^^^^^^^
+   |                           |
+   |                           borrowed value does not live long enough
+   |                           a temporary with access to the borrow is created here ...
+LL |
+LL |     };
+   |     -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `MutexGuard`
+   |     |
+   |     `mutex` dropped here while still borrowed
+   |
+
+error[E0597]: `mutex` does not live long enough
+  --> $DIR/format-args-temporaries-in-write.rs:47:29
+   |
+LL |         writeln!(Out, "{}", mutex.lock()) /* no semicolon */
+   |                             ^^^^^^^^^^^^
+   |                             |
+   |                             borrowed value does not live long enough
+   |                             a temporary with access to the borrow is created here ...
+LL |
+LL |     };
+   |     -- ... and the borrow might be used here, when that temporary is dropped and runs the `Drop` code for type `MutexGuard`
+   |     |
+   |     `mutex` dropped here while still borrowed
+   |
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/macros/format-args-temporaries.rs b/tests/ui/macros/format-args-temporaries.rs
index 59323828b..59323828b 100644
--- a/src/test/ui/macros/format-args-temporaries.rs
+++ b/tests/ui/macros/format-args-temporaries.rs
diff --git a/src/test/ui/macros/format-foreign.rs b/tests/ui/macros/format-foreign.rs
index ac65838f2..ac65838f2 100644
--- a/src/test/ui/macros/format-foreign.rs
+++ b/tests/ui/macros/format-foreign.rs
diff --git a/src/test/ui/macros/format-foreign.stderr b/tests/ui/macros/format-foreign.stderr
index ff5236dc9..7971c2ab2 100644
--- a/src/test/ui/macros/format-foreign.stderr
+++ b/tests/ui/macros/format-foreign.stderr
@@ -8,7 +8,7 @@ LL |     println!("%.*3$s %s!\n", "Hello,", "World", 4);
    |              |               argument never used
    |              multiple missing formatting specifiers
    |
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 help: format specifiers use curly braces
    |
 LL |     println!("{:.2$} {}!\n", "Hello,", "World", 4);
@@ -22,7 +22,7 @@ LL |     println!("%1$*2$.*3$f", 123.456);
    |               |
    |               help: format specifiers use curly braces: `{0:1$.2$}`
    |
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 
 error: multiple unused formatting arguments
   --> $DIR/format-foreign.rs:6:7
@@ -37,7 +37,7 @@ LL | | "###, "Hello,", "World", 4);
    | |____|  argument never used
    |      multiple missing formatting specifiers
    |
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 help: format specifiers use curly braces
    |
 LL ~     println!(r###"{:.2$}
@@ -60,7 +60,7 @@ LL |     println!("Hi there, $NAME.", NAME="Tim");
    |                         |
    |                         help: format specifiers use curly braces: `{NAME}`
    |
-   = note: shell formatting not supported; see the documentation for `std::fmt`
+   = note: shell formatting is not supported; see the documentation for `std::fmt`
 
 error: multiple unused formatting arguments
   --> $DIR/format-foreign.rs:15:32
@@ -72,7 +72,7 @@ LL |     println!("$1 $0 $$ $NAME", 1, 2, NAME=3);
    |              |                 argument never used
    |              multiple missing formatting specifiers
    |
-   = note: shell formatting not supported; see the documentation for `std::fmt`
+   = note: shell formatting is not supported; see the documentation for `std::fmt`
 help: format specifiers use curly braces
    |
 LL |     println!("{1} {0} $$ {NAME}", 1, 2, NAME=3);
diff --git a/src/test/ui/macros/format-parse-errors.rs b/tests/ui/macros/format-parse-errors.rs
index ffa7a2817..ffa7a2817 100644
--- a/src/test/ui/macros/format-parse-errors.rs
+++ b/tests/ui/macros/format-parse-errors.rs
diff --git a/src/test/ui/macros/format-parse-errors.stderr b/tests/ui/macros/format-parse-errors.stderr
index f9ea4c633..f9ea4c633 100644
--- a/src/test/ui/macros/format-parse-errors.stderr
+++ b/tests/ui/macros/format-parse-errors.stderr
diff --git a/src/test/ui/macros/format-unused-lables.rs b/tests/ui/macros/format-unused-lables.rs
index 56382b101..56382b101 100644
--- a/src/test/ui/macros/format-unused-lables.rs
+++ b/tests/ui/macros/format-unused-lables.rs
diff --git a/src/test/ui/macros/format-unused-lables.stderr b/tests/ui/macros/format-unused-lables.stderr
index 7423c7b7c..fad87fa2a 100644
--- a/src/test/ui/macros/format-unused-lables.stderr
+++ b/tests/ui/macros/format-unused-lables.stderr
@@ -44,7 +44,7 @@ LL |        "things"
 LL |              , UNUSED="args");
    |                       ^^^^^^ named argument never used
    |
-   = note: shell formatting not supported; see the documentation for `std::fmt`
+   = note: shell formatting is not supported; see the documentation for `std::fmt`
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/macros/global-asm.rs b/tests/ui/macros/global-asm.rs
index 26e90edce..26e90edce 100644
--- a/src/test/ui/macros/global-asm.rs
+++ b/tests/ui/macros/global-asm.rs
diff --git a/src/test/ui/macros/global-asm.stderr b/tests/ui/macros/global-asm.stderr
index 3c26ec65a..3c26ec65a 100644
--- a/src/test/ui/macros/global-asm.stderr
+++ b/tests/ui/macros/global-asm.stderr
diff --git a/src/test/ui/macros/html-literals.rs b/tests/ui/macros/html-literals.rs
index 26f00fed9..26f00fed9 100644
--- a/src/test/ui/macros/html-literals.rs
+++ b/tests/ui/macros/html-literals.rs
diff --git a/src/test/ui/macros/include-single-expr-helper-1.rs b/tests/ui/macros/include-single-expr-helper-1.rs
index aa6380bd2..aa6380bd2 100644
--- a/src/test/ui/macros/include-single-expr-helper-1.rs
+++ b/tests/ui/macros/include-single-expr-helper-1.rs
diff --git a/src/test/ui/macros/include-single-expr-helper.rs b/tests/ui/macros/include-single-expr-helper.rs
index 84d8b6960..84d8b6960 100644
--- a/src/test/ui/macros/include-single-expr-helper.rs
+++ b/tests/ui/macros/include-single-expr-helper.rs
diff --git a/src/test/ui/macros/include-single-expr.rs b/tests/ui/macros/include-single-expr.rs
index 0f4c29ec0..0f4c29ec0 100644
--- a/src/test/ui/macros/include-single-expr.rs
+++ b/tests/ui/macros/include-single-expr.rs
diff --git a/src/test/ui/macros/include-single-expr.stderr b/tests/ui/macros/include-single-expr.stderr
index 80eecf8f1..80eecf8f1 100644
--- a/src/test/ui/macros/include-single-expr.stderr
+++ b/tests/ui/macros/include-single-expr.stderr
diff --git a/src/test/ui/macros/issue-100199.rs b/tests/ui/macros/issue-100199.rs
index 6e50afa07..6e50afa07 100644
--- a/src/test/ui/macros/issue-100199.rs
+++ b/tests/ui/macros/issue-100199.rs
diff --git a/src/test/ui/macros/issue-100199.stderr b/tests/ui/macros/issue-100199.stderr
index 2cb45dc12..2cb45dc12 100644
--- a/src/test/ui/macros/issue-100199.stderr
+++ b/tests/ui/macros/issue-100199.stderr
diff --git a/src/test/ui/macros/issue-102878.rs b/tests/ui/macros/issue-102878.rs
index aac589193..aac589193 100644
--- a/src/test/ui/macros/issue-102878.rs
+++ b/tests/ui/macros/issue-102878.rs
diff --git a/src/test/ui/macros/issue-102878.stderr b/tests/ui/macros/issue-102878.stderr
index e0b8855a3..e0b8855a3 100644
--- a/src/test/ui/macros/issue-102878.stderr
+++ b/tests/ui/macros/issue-102878.stderr
diff --git a/src/test/ui/macros/issue-103529.rs b/tests/ui/macros/issue-103529.rs
index fa05baed7..fa05baed7 100644
--- a/src/test/ui/macros/issue-103529.rs
+++ b/tests/ui/macros/issue-103529.rs
diff --git a/src/test/ui/macros/issue-103529.stderr b/tests/ui/macros/issue-103529.stderr
index 61e322afc..61e322afc 100644
--- a/src/test/ui/macros/issue-103529.stderr
+++ b/tests/ui/macros/issue-103529.stderr
diff --git a/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.rs b/tests/ui/macros/issue-104769-concat_bytes-invalid-literal.rs
index 24150376e..24150376e 100644
--- a/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.rs
+++ b/tests/ui/macros/issue-104769-concat_bytes-invalid-literal.rs
diff --git a/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr b/tests/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr
index 8d70faa49..8807279c2 100644
--- a/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr
+++ b/tests/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr
@@ -11,6 +11,8 @@ error: integer literal is too large
    |
 LL |     concat_bytes!(888888888888888888888888888888888888888);
    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: value exceeds limit of `340282366920938463463374607431768211455`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/macros/issue-105011.rs b/tests/ui/macros/issue-105011.rs
index da12c3814..da12c3814 100644
--- a/src/test/ui/macros/issue-105011.rs
+++ b/tests/ui/macros/issue-105011.rs
diff --git a/src/test/ui/macros/issue-105011.stderr b/tests/ui/macros/issue-105011.stderr
index e898af7fa..e898af7fa 100644
--- a/src/test/ui/macros/issue-105011.stderr
+++ b/tests/ui/macros/issue-105011.stderr
diff --git a/src/test/ui/issues/issue-10536.rs b/tests/ui/macros/issue-10536.rs
index f536d8f94..f536d8f94 100644
--- a/src/test/ui/issues/issue-10536.rs
+++ b/tests/ui/macros/issue-10536.rs
diff --git a/src/test/ui/issues/issue-10536.stderr b/tests/ui/macros/issue-10536.stderr
index cc0484458..cc0484458 100644
--- a/src/test/ui/issues/issue-10536.stderr
+++ b/tests/ui/macros/issue-10536.stderr
diff --git a/src/test/ui/macros/issue-16098.rs b/tests/ui/macros/issue-16098.rs
index 00acc20fc..00acc20fc 100644
--- a/src/test/ui/macros/issue-16098.rs
+++ b/tests/ui/macros/issue-16098.rs
diff --git a/src/test/ui/macros/issue-16098.stderr b/tests/ui/macros/issue-16098.stderr
index 64280219d..64280219d 100644
--- a/src/test/ui/macros/issue-16098.stderr
+++ b/tests/ui/macros/issue-16098.stderr
diff --git a/src/test/ui/macros/issue-19163.rs b/tests/ui/macros/issue-19163.rs
index d98c5912a..d98c5912a 100644
--- a/src/test/ui/macros/issue-19163.rs
+++ b/tests/ui/macros/issue-19163.rs
diff --git a/src/test/ui/macros/issue-19163.stderr b/tests/ui/macros/issue-19163.stderr
index ae1ae1426..ae1ae1426 100644
--- a/src/test/ui/macros/issue-19163.stderr
+++ b/tests/ui/macros/issue-19163.stderr
diff --git a/src/test/ui/macros/issue-21356.rs b/tests/ui/macros/issue-21356.rs
index ae623929d..ae623929d 100644
--- a/src/test/ui/macros/issue-21356.rs
+++ b/tests/ui/macros/issue-21356.rs
diff --git a/src/test/ui/macros/issue-21356.stderr b/tests/ui/macros/issue-21356.stderr
index 17014c6ce..17014c6ce 100644
--- a/src/test/ui/macros/issue-21356.stderr
+++ b/tests/ui/macros/issue-21356.stderr
diff --git a/src/test/ui/macros/issue-22463.rs b/tests/ui/macros/issue-22463.rs
index fdf5a2fca..fdf5a2fca 100644
--- a/src/test/ui/macros/issue-22463.rs
+++ b/tests/ui/macros/issue-22463.rs
diff --git a/src/test/ui/macros/issue-25274.rs b/tests/ui/macros/issue-25274.rs
index 65b29bba8..65b29bba8 100644
--- a/src/test/ui/macros/issue-25274.rs
+++ b/tests/ui/macros/issue-25274.rs
diff --git a/src/test/ui/issues/issue-25385.rs b/tests/ui/macros/issue-25385.rs
index ea042a6c7..ea042a6c7 100644
--- a/src/test/ui/issues/issue-25385.rs
+++ b/tests/ui/macros/issue-25385.rs
diff --git a/src/test/ui/issues/issue-25385.stderr b/tests/ui/macros/issue-25385.stderr
index 39dbdd753..39dbdd753 100644
--- a/src/test/ui/issues/issue-25385.stderr
+++ b/tests/ui/macros/issue-25385.stderr
diff --git a/src/test/ui/macros/issue-26322.rs b/tests/ui/macros/issue-26322.rs
index c1dc80eb7..c1dc80eb7 100644
--- a/src/test/ui/macros/issue-26322.rs
+++ b/tests/ui/macros/issue-26322.rs
diff --git a/src/test/ui/macros/issue-29084.rs b/tests/ui/macros/issue-29084.rs
index d16252686..d16252686 100644
--- a/src/test/ui/macros/issue-29084.rs
+++ b/tests/ui/macros/issue-29084.rs
diff --git a/src/test/ui/macros/issue-29084.stderr b/tests/ui/macros/issue-29084.stderr
index f83e19213..f83e19213 100644
--- a/src/test/ui/macros/issue-29084.stderr
+++ b/tests/ui/macros/issue-29084.stderr
diff --git a/src/test/ui/macros/issue-30143.rs b/tests/ui/macros/issue-30143.rs
index ac4c1da5c..ac4c1da5c 100644
--- a/src/test/ui/macros/issue-30143.rs
+++ b/tests/ui/macros/issue-30143.rs
diff --git a/src/test/ui/macros/issue-30143.stderr b/tests/ui/macros/issue-30143.stderr
index fd2378dbc..fd2378dbc 100644
--- a/src/test/ui/macros/issue-30143.stderr
+++ b/tests/ui/macros/issue-30143.stderr
diff --git a/src/test/ui/macros/issue-33185.rs b/tests/ui/macros/issue-33185.rs
index 0d6669146..0d6669146 100644
--- a/src/test/ui/macros/issue-33185.rs
+++ b/tests/ui/macros/issue-33185.rs
diff --git a/src/test/ui/macros/issue-34171.rs b/tests/ui/macros/issue-34171.rs
index 157c58c45..157c58c45 100644
--- a/src/test/ui/macros/issue-34171.rs
+++ b/tests/ui/macros/issue-34171.rs
diff --git a/src/test/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.rs b/tests/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.rs
index d78139365..d78139365 100644
--- a/src/test/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.rs
+++ b/tests/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.rs
diff --git a/src/test/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.stderr b/tests/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.stderr
index 00139662d..00139662d 100644
--- a/src/test/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.stderr
+++ b/tests/ui/macros/issue-34421-mac-expr-bad-stmt-good-add-semi.stderr
diff --git a/src/test/ui/macros/issue-35450.rs b/tests/ui/macros/issue-35450.rs
index ac4c16306..ac4c16306 100644
--- a/src/test/ui/macros/issue-35450.rs
+++ b/tests/ui/macros/issue-35450.rs
diff --git a/src/test/ui/macros/issue-35450.stderr b/tests/ui/macros/issue-35450.stderr
index f2065689f..f2065689f 100644
--- a/src/test/ui/macros/issue-35450.stderr
+++ b/tests/ui/macros/issue-35450.stderr
diff --git a/src/test/ui/macros/issue-37175.rs b/tests/ui/macros/issue-37175.rs
index 9ec9d48d1..9ec9d48d1 100644
--- a/src/test/ui/macros/issue-37175.rs
+++ b/tests/ui/macros/issue-37175.rs
diff --git a/src/test/ui/macros/issue-38715.rs b/tests/ui/macros/issue-38715.rs
index 85ed97663..85ed97663 100644
--- a/src/test/ui/macros/issue-38715.rs
+++ b/tests/ui/macros/issue-38715.rs
diff --git a/src/test/ui/macros/issue-38715.stderr b/tests/ui/macros/issue-38715.stderr
index 828a7f459..828a7f459 100644
--- a/src/test/ui/macros/issue-38715.stderr
+++ b/tests/ui/macros/issue-38715.stderr
diff --git a/src/test/ui/macros/issue-39388.rs b/tests/ui/macros/issue-39388.rs
index a8e31a648..a8e31a648 100644
--- a/src/test/ui/macros/issue-39388.rs
+++ b/tests/ui/macros/issue-39388.rs
diff --git a/src/test/ui/macros/issue-39388.stderr b/tests/ui/macros/issue-39388.stderr
index 62e7dff54..62e7dff54 100644
--- a/src/test/ui/macros/issue-39388.stderr
+++ b/tests/ui/macros/issue-39388.stderr
diff --git a/src/test/ui/macros/issue-39404.rs b/tests/ui/macros/issue-39404.rs
index 2229f2c39..2229f2c39 100644
--- a/src/test/ui/macros/issue-39404.rs
+++ b/tests/ui/macros/issue-39404.rs
diff --git a/src/test/ui/macros/issue-39404.stderr b/tests/ui/macros/issue-39404.stderr
index 3886a70bb..3886a70bb 100644
--- a/src/test/ui/macros/issue-39404.stderr
+++ b/tests/ui/macros/issue-39404.stderr
diff --git a/src/test/ui/macros/issue-40469.rs b/tests/ui/macros/issue-40469.rs
index 25e08ef85..25e08ef85 100644
--- a/src/test/ui/macros/issue-40469.rs
+++ b/tests/ui/macros/issue-40469.rs
diff --git a/src/test/ui/macros/issue-40770.rs b/tests/ui/macros/issue-40770.rs
index c9713c157..c9713c157 100644
--- a/src/test/ui/macros/issue-40770.rs
+++ b/tests/ui/macros/issue-40770.rs
diff --git a/src/test/ui/macros/issue-41776.rs b/tests/ui/macros/issue-41776.rs
index 24696d86d..24696d86d 100644
--- a/src/test/ui/macros/issue-41776.rs
+++ b/tests/ui/macros/issue-41776.rs
diff --git a/src/test/ui/macros/issue-41776.stderr b/tests/ui/macros/issue-41776.stderr
index e06873b50..e06873b50 100644
--- a/src/test/ui/macros/issue-41776.stderr
+++ b/tests/ui/macros/issue-41776.stderr
diff --git a/src/test/ui/macros/issue-41803.rs b/tests/ui/macros/issue-41803.rs
index bccfdc611..bccfdc611 100644
--- a/src/test/ui/macros/issue-41803.rs
+++ b/tests/ui/macros/issue-41803.rs
diff --git a/src/test/ui/issues/issue-42954.fixed b/tests/ui/macros/issue-42954.fixed
index a73054c92..a73054c92 100644
--- a/src/test/ui/issues/issue-42954.fixed
+++ b/tests/ui/macros/issue-42954.fixed
diff --git a/src/test/ui/issues/issue-42954.rs b/tests/ui/macros/issue-42954.rs
index 5f9b0e31d..5f9b0e31d 100644
--- a/src/test/ui/issues/issue-42954.rs
+++ b/tests/ui/macros/issue-42954.rs
diff --git a/src/test/ui/issues/issue-42954.stderr b/tests/ui/macros/issue-42954.stderr
index 396a91994..396a91994 100644
--- a/src/test/ui/issues/issue-42954.stderr
+++ b/tests/ui/macros/issue-42954.stderr
diff --git a/src/test/ui/macros/issue-44127.rs b/tests/ui/macros/issue-44127.rs
index 21b2e6826..21b2e6826 100644
--- a/src/test/ui/macros/issue-44127.rs
+++ b/tests/ui/macros/issue-44127.rs
diff --git a/src/test/ui/macros/issue-5060.rs b/tests/ui/macros/issue-5060.rs
index c4760bc02..c4760bc02 100644
--- a/src/test/ui/macros/issue-5060.rs
+++ b/tests/ui/macros/issue-5060.rs
diff --git a/src/test/ui/issues/issue-51848.rs b/tests/ui/macros/issue-51848.rs
index 4792bdd64..4792bdd64 100644
--- a/src/test/ui/issues/issue-51848.rs
+++ b/tests/ui/macros/issue-51848.rs
diff --git a/src/test/ui/issues/issue-51848.stderr b/tests/ui/macros/issue-51848.stderr
index c25bedf37..c25bedf37 100644
--- a/src/test/ui/issues/issue-51848.stderr
+++ b/tests/ui/macros/issue-51848.stderr
diff --git a/src/test/ui/macros/issue-52169.rs b/tests/ui/macros/issue-52169.rs
index f178cd30c..f178cd30c 100644
--- a/src/test/ui/macros/issue-52169.rs
+++ b/tests/ui/macros/issue-52169.rs
diff --git a/src/test/ui/macros/issue-54441.rs b/tests/ui/macros/issue-54441.rs
index b24d7e1f6..b24d7e1f6 100644
--- a/src/test/ui/macros/issue-54441.rs
+++ b/tests/ui/macros/issue-54441.rs
diff --git a/src/test/ui/macros/issue-54441.stderr b/tests/ui/macros/issue-54441.stderr
index bbbca211b..bbbca211b 100644
--- a/src/test/ui/macros/issue-54441.stderr
+++ b/tests/ui/macros/issue-54441.stderr
diff --git a/src/test/ui/macros/issue-57597.rs b/tests/ui/macros/issue-57597.rs
index ebeb3fe07..ebeb3fe07 100644
--- a/src/test/ui/macros/issue-57597.rs
+++ b/tests/ui/macros/issue-57597.rs
diff --git a/src/test/ui/macros/issue-57597.stderr b/tests/ui/macros/issue-57597.stderr
index 0a02ac8c4..0a02ac8c4 100644
--- a/src/test/ui/macros/issue-57597.stderr
+++ b/tests/ui/macros/issue-57597.stderr
diff --git a/src/test/ui/macros/issue-58490.rs b/tests/ui/macros/issue-58490.rs
index 97e71c9a1..97e71c9a1 100644
--- a/src/test/ui/macros/issue-58490.rs
+++ b/tests/ui/macros/issue-58490.rs
diff --git a/src/test/ui/macros/issue-58490.stderr b/tests/ui/macros/issue-58490.stderr
index b1f0896f3..b1f0896f3 100644
--- a/src/test/ui/macros/issue-58490.stderr
+++ b/tests/ui/macros/issue-58490.stderr
diff --git a/src/test/ui/macros/issue-61033-1.rs b/tests/ui/macros/issue-61033-1.rs
index 18df3f6ee..18df3f6ee 100644
--- a/src/test/ui/macros/issue-61033-1.rs
+++ b/tests/ui/macros/issue-61033-1.rs
diff --git a/src/test/ui/macros/issue-61033-1.stderr b/tests/ui/macros/issue-61033-1.stderr
index 18205c343..18205c343 100644
--- a/src/test/ui/macros/issue-61033-1.stderr
+++ b/tests/ui/macros/issue-61033-1.stderr
diff --git a/src/test/ui/macros/issue-61033-2.rs b/tests/ui/macros/issue-61033-2.rs
index 1760ba158..1760ba158 100644
--- a/src/test/ui/macros/issue-61033-2.rs
+++ b/tests/ui/macros/issue-61033-2.rs
diff --git a/src/test/ui/macros/issue-61033-2.stderr b/tests/ui/macros/issue-61033-2.stderr
index cdfe7934a..cdfe7934a 100644
--- a/src/test/ui/macros/issue-61033-2.stderr
+++ b/tests/ui/macros/issue-61033-2.stderr
diff --git a/src/test/ui/macros/issue-61053-different-kleene.rs b/tests/ui/macros/issue-61053-different-kleene.rs
index 9b7babdbb..9b7babdbb 100644
--- a/src/test/ui/macros/issue-61053-different-kleene.rs
+++ b/tests/ui/macros/issue-61053-different-kleene.rs
diff --git a/src/test/ui/macros/issue-61053-different-kleene.stderr b/tests/ui/macros/issue-61053-different-kleene.stderr
index aa8bac13b..aa8bac13b 100644
--- a/src/test/ui/macros/issue-61053-different-kleene.stderr
+++ b/tests/ui/macros/issue-61053-different-kleene.stderr
diff --git a/src/test/ui/macros/issue-61053-duplicate-binder.rs b/tests/ui/macros/issue-61053-duplicate-binder.rs
index 34aa571c1..34aa571c1 100644
--- a/src/test/ui/macros/issue-61053-duplicate-binder.rs
+++ b/tests/ui/macros/issue-61053-duplicate-binder.rs
diff --git a/src/test/ui/macros/issue-61053-duplicate-binder.stderr b/tests/ui/macros/issue-61053-duplicate-binder.stderr
index 5a2af45d0..5a2af45d0 100644
--- a/src/test/ui/macros/issue-61053-duplicate-binder.stderr
+++ b/tests/ui/macros/issue-61053-duplicate-binder.stderr
diff --git a/src/test/ui/macros/issue-61053-missing-repetition.rs b/tests/ui/macros/issue-61053-missing-repetition.rs
index 6b36c730b..6b36c730b 100644
--- a/src/test/ui/macros/issue-61053-missing-repetition.rs
+++ b/tests/ui/macros/issue-61053-missing-repetition.rs
diff --git a/src/test/ui/macros/issue-61053-missing-repetition.stderr b/tests/ui/macros/issue-61053-missing-repetition.stderr
index 738f711f0..738f711f0 100644
--- a/src/test/ui/macros/issue-61053-missing-repetition.stderr
+++ b/tests/ui/macros/issue-61053-missing-repetition.stderr
diff --git a/src/test/ui/macros/issue-61053-unbound.rs b/tests/ui/macros/issue-61053-unbound.rs
index b75cdce0c..b75cdce0c 100644
--- a/src/test/ui/macros/issue-61053-unbound.rs
+++ b/tests/ui/macros/issue-61053-unbound.rs
diff --git a/src/test/ui/macros/issue-61053-unbound.stderr b/tests/ui/macros/issue-61053-unbound.stderr
index 0d64effc9..0d64effc9 100644
--- a/src/test/ui/macros/issue-61053-unbound.stderr
+++ b/tests/ui/macros/issue-61053-unbound.stderr
diff --git a/src/test/ui/macros/issue-63102.rs b/tests/ui/macros/issue-63102.rs
index 6af5b1868..6af5b1868 100644
--- a/src/test/ui/macros/issue-63102.rs
+++ b/tests/ui/macros/issue-63102.rs
diff --git a/src/test/ui/macros/issue-6596-1.rs b/tests/ui/macros/issue-6596-1.rs
index 25f1d6500..25f1d6500 100644
--- a/src/test/ui/macros/issue-6596-1.rs
+++ b/tests/ui/macros/issue-6596-1.rs
diff --git a/src/test/ui/macros/issue-6596-1.stderr b/tests/ui/macros/issue-6596-1.stderr
index 7ab3685c5..7ab3685c5 100644
--- a/src/test/ui/macros/issue-6596-1.stderr
+++ b/tests/ui/macros/issue-6596-1.stderr
diff --git a/src/test/ui/macros/issue-68058.rs b/tests/ui/macros/issue-68058.rs
index 24da2620c..24da2620c 100644
--- a/src/test/ui/macros/issue-68058.rs
+++ b/tests/ui/macros/issue-68058.rs
diff --git a/src/test/ui/macros/issue-68060.rs b/tests/ui/macros/issue-68060.rs
index fb40cd538..fb40cd538 100644
--- a/src/test/ui/macros/issue-68060.rs
+++ b/tests/ui/macros/issue-68060.rs
diff --git a/src/test/ui/macros/issue-68060.stderr b/tests/ui/macros/issue-68060.stderr
index 52e6ed92e..52e6ed92e 100644
--- a/src/test/ui/macros/issue-68060.stderr
+++ b/tests/ui/macros/issue-68060.stderr
diff --git a/src/test/ui/macros/issue-69838-dir/bar.rs b/tests/ui/macros/issue-69838-dir/bar.rs
index ec12f8c5c..ec12f8c5c 100644
--- a/src/test/ui/macros/issue-69838-dir/bar.rs
+++ b/tests/ui/macros/issue-69838-dir/bar.rs
diff --git a/src/test/ui/macros/issue-69838-dir/included.rs b/tests/ui/macros/issue-69838-dir/included.rs
index 9900b8fd5..9900b8fd5 100644
--- a/src/test/ui/macros/issue-69838-dir/included.rs
+++ b/tests/ui/macros/issue-69838-dir/included.rs
diff --git a/src/test/ui/macros/issue-69838-mods-relative-to-included-path.rs b/tests/ui/macros/issue-69838-mods-relative-to-included-path.rs
index 2a4e97f0e..2a4e97f0e 100644
--- a/src/test/ui/macros/issue-69838-mods-relative-to-included-path.rs
+++ b/tests/ui/macros/issue-69838-mods-relative-to-included-path.rs
diff --git a/src/test/ui/macros/issue-70446.rs b/tests/ui/macros/issue-70446.rs
index 407094d55..407094d55 100644
--- a/src/test/ui/macros/issue-70446.rs
+++ b/tests/ui/macros/issue-70446.rs
diff --git a/src/test/ui/macros/issue-75982-foreign-macro-weird-mod.rs b/tests/ui/macros/issue-75982-foreign-macro-weird-mod.rs
index e76b09d4b..e76b09d4b 100644
--- a/src/test/ui/macros/issue-75982-foreign-macro-weird-mod.rs
+++ b/tests/ui/macros/issue-75982-foreign-macro-weird-mod.rs
diff --git a/src/test/ui/macros/issue-77475.rs b/tests/ui/macros/issue-77475.rs
index 7b32a33ea..7b32a33ea 100644
--- a/src/test/ui/macros/issue-77475.rs
+++ b/tests/ui/macros/issue-77475.rs
diff --git a/src/test/ui/macros/issue-78325-inconsistent-resolution.rs b/tests/ui/macros/issue-78325-inconsistent-resolution.rs
index 919eca4f9..919eca4f9 100644
--- a/src/test/ui/macros/issue-78325-inconsistent-resolution.rs
+++ b/tests/ui/macros/issue-78325-inconsistent-resolution.rs
diff --git a/src/test/ui/macros/issue-78325-inconsistent-resolution.stderr b/tests/ui/macros/issue-78325-inconsistent-resolution.stderr
index 53a0a0793..53a0a0793 100644
--- a/src/test/ui/macros/issue-78325-inconsistent-resolution.stderr
+++ b/tests/ui/macros/issue-78325-inconsistent-resolution.stderr
diff --git a/src/test/ui/macros/issue-78333.rs b/tests/ui/macros/issue-78333.rs
index c376f2067..c376f2067 100644
--- a/src/test/ui/macros/issue-78333.rs
+++ b/tests/ui/macros/issue-78333.rs
diff --git a/src/test/ui/macros/issue-78892-substitution-in-statement-attr.rs b/tests/ui/macros/issue-78892-substitution-in-statement-attr.rs
index 9d1fae7a2..9d1fae7a2 100644
--- a/src/test/ui/macros/issue-78892-substitution-in-statement-attr.rs
+++ b/tests/ui/macros/issue-78892-substitution-in-statement-attr.rs
diff --git a/src/test/ui/macros/issue-81006.rs b/tests/ui/macros/issue-81006.rs
index 602eb5974..602eb5974 100644
--- a/src/test/ui/macros/issue-81006.rs
+++ b/tests/ui/macros/issue-81006.rs
diff --git a/src/test/ui/macros/issue-81006.stderr b/tests/ui/macros/issue-81006.stderr
index 14a8cbe01..14a8cbe01 100644
--- a/src/test/ui/macros/issue-81006.stderr
+++ b/tests/ui/macros/issue-81006.stderr
diff --git a/src/test/ui/macros/issue-83340.rs b/tests/ui/macros/issue-83340.rs
index d26200295..d26200295 100644
--- a/src/test/ui/macros/issue-83340.rs
+++ b/tests/ui/macros/issue-83340.rs
diff --git a/src/test/ui/macros/issue-83340.stderr b/tests/ui/macros/issue-83340.stderr
index 1935de02b..1935de02b 100644
--- a/src/test/ui/macros/issue-83340.stderr
+++ b/tests/ui/macros/issue-83340.stderr
diff --git a/src/test/ui/macros/issue-83344.rs b/tests/ui/macros/issue-83344.rs
index c5f7f7235..c5f7f7235 100644
--- a/src/test/ui/macros/issue-83344.rs
+++ b/tests/ui/macros/issue-83344.rs
diff --git a/src/test/ui/macros/issue-83344.stderr b/tests/ui/macros/issue-83344.stderr
index 1ef70f87a..1ef70f87a 100644
--- a/src/test/ui/macros/issue-83344.stderr
+++ b/tests/ui/macros/issue-83344.stderr
diff --git a/src/test/ui/macros/issue-84195-lint-anon-const.rs b/tests/ui/macros/issue-84195-lint-anon-const.rs
index 71c768320..71c768320 100644
--- a/src/test/ui/macros/issue-84195-lint-anon-const.rs
+++ b/tests/ui/macros/issue-84195-lint-anon-const.rs
diff --git a/tests/ui/macros/issue-84195-lint-anon-const.stderr b/tests/ui/macros/issue-84195-lint-anon-const.stderr
new file mode 100644
index 000000000..29ccd17e0
--- /dev/null
+++ b/tests/ui/macros/issue-84195-lint-anon-const.stderr
@@ -0,0 +1,39 @@
+error: trailing semicolon in macro used in expression position
+  --> $DIR/issue-84195-lint-anon-const.rs:8:14
+   |
+LL |     () => { 0; };
+   |              ^
+...
+LL |     let val: [u8; len!()] = [];
+   |                   ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/issue-84195-lint-anon-const.rs:5:9
+   |
+LL | #![deny(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this error originates in the macro `len` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error
+
+Future incompatibility report: Future breakage diagnostic:
+error: trailing semicolon in macro used in expression position
+  --> $DIR/issue-84195-lint-anon-const.rs:8:14
+   |
+LL |     () => { 0; };
+   |              ^
+...
+LL |     let val: [u8; len!()] = [];
+   |                   ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/issue-84195-lint-anon-const.rs:5:9
+   |
+LL | #![deny(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this error originates in the macro `len` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/macros/issue-84429-matches-edition.rs b/tests/ui/macros/issue-84429-matches-edition.rs
index 53f134c26..53f134c26 100644
--- a/src/test/ui/macros/issue-84429-matches-edition.rs
+++ b/tests/ui/macros/issue-84429-matches-edition.rs
diff --git a/src/test/ui/macros/issue-84632-eager-expansion-recursion-limit.rs b/tests/ui/macros/issue-84632-eager-expansion-recursion-limit.rs
index 7a1e62d49..7a1e62d49 100644
--- a/src/test/ui/macros/issue-84632-eager-expansion-recursion-limit.rs
+++ b/tests/ui/macros/issue-84632-eager-expansion-recursion-limit.rs
diff --git a/src/test/ui/macros/issue-84632-eager-expansion-recursion-limit.stderr b/tests/ui/macros/issue-84632-eager-expansion-recursion-limit.stderr
index e266617bd..e266617bd 100644
--- a/src/test/ui/macros/issue-84632-eager-expansion-recursion-limit.stderr
+++ b/tests/ui/macros/issue-84632-eager-expansion-recursion-limit.stderr
diff --git a/src/test/ui/macros/issue-86082-option-env-invalid-char.rs b/tests/ui/macros/issue-86082-option-env-invalid-char.rs
index b556b24d6..b556b24d6 100644
--- a/src/test/ui/macros/issue-86082-option-env-invalid-char.rs
+++ b/tests/ui/macros/issue-86082-option-env-invalid-char.rs
diff --git a/src/test/ui/macros/issue-86865.rs b/tests/ui/macros/issue-86865.rs
index 01e0a20a5..01e0a20a5 100644
--- a/src/test/ui/macros/issue-86865.rs
+++ b/tests/ui/macros/issue-86865.rs
diff --git a/src/test/ui/macros/issue-86865.stderr b/tests/ui/macros/issue-86865.stderr
index eed755366..eed755366 100644
--- a/src/test/ui/macros/issue-86865.stderr
+++ b/tests/ui/macros/issue-86865.stderr
diff --git a/src/test/ui/macros/issue-8709.rs b/tests/ui/macros/issue-8709.rs
index ea7525d44..ea7525d44 100644
--- a/src/test/ui/macros/issue-8709.rs
+++ b/tests/ui/macros/issue-8709.rs
diff --git a/src/test/ui/macros/issue-87877.rs b/tests/ui/macros/issue-87877.rs
index a40e2c5f9..a40e2c5f9 100644
--- a/src/test/ui/macros/issue-87877.rs
+++ b/tests/ui/macros/issue-87877.rs
diff --git a/src/test/ui/macros/issue-88206.rs b/tests/ui/macros/issue-88206.rs
index 14e2f6606..14e2f6606 100644
--- a/src/test/ui/macros/issue-88206.rs
+++ b/tests/ui/macros/issue-88206.rs
diff --git a/src/test/ui/macros/issue-88206.stderr b/tests/ui/macros/issue-88206.stderr
index f7f5b5648..f7f5b5648 100644
--- a/src/test/ui/macros/issue-88206.stderr
+++ b/tests/ui/macros/issue-88206.stderr
diff --git a/src/test/ui/macros/issue-88228.rs b/tests/ui/macros/issue-88228.rs
index cbdef5f0d..60ba2eab7 100644
--- a/src/test/ui/macros/issue-88228.rs
+++ b/tests/ui/macros/issue-88228.rs
@@ -8,7 +8,7 @@ mod hey {
 
 #[derive(Bla)]
 //~^ ERROR cannot find derive macro `Bla`
-//~| NOTE consider importing this derive macro
+//~| HELP consider importing this derive macro
 struct A;
 
 #[derive(println)]
@@ -19,5 +19,5 @@ struct B;
 fn main() {
     bla!();
     //~^ ERROR cannot find macro `bla`
-    //~| NOTE consider importing this macro
+    //~| HELP consider importing this macro
 }
diff --git a/src/test/ui/macros/issue-88228.stderr b/tests/ui/macros/issue-88228.stderr
index 62afa67a7..fe8a1deae 100644
--- a/src/test/ui/macros/issue-88228.stderr
+++ b/tests/ui/macros/issue-88228.stderr
@@ -4,7 +4,7 @@ error: cannot find macro `bla` in this scope
 LL |     bla!();
    |     ^^^
    |
-   = note: consider importing this macro:
+   = help: consider importing this macro:
            crate::hey::bla
 
 error: cannot find derive macro `println` in this scope
@@ -21,7 +21,7 @@ error: cannot find derive macro `Bla` in this scope
 LL | #[derive(Bla)]
    |          ^^^
    |
-   = note: consider importing this derive macro:
+   = help: consider importing this derive macro:
            crate::hey::Bla
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/macros/issue-8851.rs b/tests/ui/macros/issue-8851.rs
index faacfe5f8..faacfe5f8 100644
--- a/src/test/ui/macros/issue-8851.rs
+++ b/tests/ui/macros/issue-8851.rs
diff --git a/src/test/ui/macros/issue-92267.rs b/tests/ui/macros/issue-92267.rs
index f1daaeb74..f1daaeb74 100644
--- a/src/test/ui/macros/issue-92267.rs
+++ b/tests/ui/macros/issue-92267.rs
diff --git a/src/test/ui/macros/issue-92267.stderr b/tests/ui/macros/issue-92267.stderr
index d2d66c811..5359f68cd 100644
--- a/src/test/ui/macros/issue-92267.stderr
+++ b/tests/ui/macros/issue-92267.stderr
@@ -10,7 +10,7 @@ note: format specifiers use curly braces, and the conversion specifier `
    |
 LL | pub fn main() { println!("🦀%%%", 0) }
    |                               ^^
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/issue-95267.rs b/tests/ui/macros/issue-95267.rs
index a2fe402bc..a2fe402bc 100644
--- a/src/test/ui/macros/issue-95267.rs
+++ b/tests/ui/macros/issue-95267.rs
diff --git a/src/test/ui/macros/issue-95533.rs b/tests/ui/macros/issue-95533.rs
index 905c14dc5..905c14dc5 100644
--- a/src/test/ui/macros/issue-95533.rs
+++ b/tests/ui/macros/issue-95533.rs
diff --git a/src/test/ui/macros/issue-98466-allow.rs b/tests/ui/macros/issue-98466-allow.rs
index c260148c1..c260148c1 100644
--- a/src/test/ui/macros/issue-98466-allow.rs
+++ b/tests/ui/macros/issue-98466-allow.rs
diff --git a/src/test/ui/macros/issue-98466.fixed b/tests/ui/macros/issue-98466.fixed
index e46e22f00..e46e22f00 100644
--- a/src/test/ui/macros/issue-98466.fixed
+++ b/tests/ui/macros/issue-98466.fixed
diff --git a/src/test/ui/macros/issue-98466.rs b/tests/ui/macros/issue-98466.rs
index 2c3b099af..2c3b099af 100644
--- a/src/test/ui/macros/issue-98466.rs
+++ b/tests/ui/macros/issue-98466.rs
diff --git a/src/test/ui/macros/issue-98466.stderr b/tests/ui/macros/issue-98466.stderr
index c93451c76..c93451c76 100644
--- a/src/test/ui/macros/issue-98466.stderr
+++ b/tests/ui/macros/issue-98466.stderr
diff --git a/src/test/ui/macros/issue-99261.rs b/tests/ui/macros/issue-99261.rs
index 40d26d08c..40d26d08c 100644
--- a/src/test/ui/macros/issue-99261.rs
+++ b/tests/ui/macros/issue-99261.rs
diff --git a/src/test/ui/macros/issue-99265.fixed b/tests/ui/macros/issue-99265.fixed
index f3be9c628..f3be9c628 100644
--- a/src/test/ui/macros/issue-99265.fixed
+++ b/tests/ui/macros/issue-99265.fixed
diff --git a/src/test/ui/macros/issue-99265.rs b/tests/ui/macros/issue-99265.rs
index e7cf60876..e7cf60876 100644
--- a/src/test/ui/macros/issue-99265.rs
+++ b/tests/ui/macros/issue-99265.rs
diff --git a/src/test/ui/macros/issue-99265.stderr b/tests/ui/macros/issue-99265.stderr
index 9185dbff6..9185dbff6 100644
--- a/src/test/ui/macros/issue-99265.stderr
+++ b/tests/ui/macros/issue-99265.stderr
diff --git a/src/test/ui/macros/issue-99907.fixed b/tests/ui/macros/issue-99907.fixed
index 9e0e1b80e..9e0e1b80e 100644
--- a/src/test/ui/macros/issue-99907.fixed
+++ b/tests/ui/macros/issue-99907.fixed
diff --git a/src/test/ui/macros/issue-99907.rs b/tests/ui/macros/issue-99907.rs
index eebcfc2ef..eebcfc2ef 100644
--- a/src/test/ui/macros/issue-99907.rs
+++ b/tests/ui/macros/issue-99907.rs
diff --git a/src/test/ui/macros/issue-99907.stderr b/tests/ui/macros/issue-99907.stderr
index eefb28dee..eefb28dee 100644
--- a/src/test/ui/macros/issue-99907.stderr
+++ b/tests/ui/macros/issue-99907.stderr
diff --git a/src/test/ui/macros/lint-trailing-macro-call.rs b/tests/ui/macros/lint-trailing-macro-call.rs
index f8e847563..f8e847563 100644
--- a/src/test/ui/macros/lint-trailing-macro-call.rs
+++ b/tests/ui/macros/lint-trailing-macro-call.rs
diff --git a/tests/ui/macros/lint-trailing-macro-call.stderr b/tests/ui/macros/lint-trailing-macro-call.stderr
new file mode 100644
index 000000000..13cecc3a3
--- /dev/null
+++ b/tests/ui/macros/lint-trailing-macro-call.stderr
@@ -0,0 +1,35 @@
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/lint-trailing-macro-call.rs:9:25
+   |
+LL |         #[cfg(FALSE)] 25;
+   |                         ^
+...
+LL |     expand_it!()
+   |     ------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `expand_it`
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `expand_it` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: 1 warning emitted
+
+Future incompatibility report: Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/lint-trailing-macro-call.rs:9:25
+   |
+LL |         #[cfg(FALSE)] 25;
+   |                         ^
+...
+LL |     expand_it!()
+   |     ------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `expand_it`
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `expand_it` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/macros/local-ambiguity-multiple-parsing-options.rs b/tests/ui/macros/local-ambiguity-multiple-parsing-options.rs
index 396748109..396748109 100644
--- a/src/test/ui/macros/local-ambiguity-multiple-parsing-options.rs
+++ b/tests/ui/macros/local-ambiguity-multiple-parsing-options.rs
diff --git a/src/test/ui/macros/local-ambiguity-multiple-parsing-options.stderr b/tests/ui/macros/local-ambiguity-multiple-parsing-options.stderr
index 68b278fd3..68b278fd3 100644
--- a/src/test/ui/macros/local-ambiguity-multiple-parsing-options.stderr
+++ b/tests/ui/macros/local-ambiguity-multiple-parsing-options.stderr
diff --git a/src/test/ui/macros/log_syntax-trace_macros-macro-locations.rs b/tests/ui/macros/log_syntax-trace_macros-macro-locations.rs
index 2d78ae6f9..2d78ae6f9 100644
--- a/src/test/ui/macros/log_syntax-trace_macros-macro-locations.rs
+++ b/tests/ui/macros/log_syntax-trace_macros-macro-locations.rs
diff --git a/src/test/ui/macros/log_syntax-trace_macros-macro-locations.stdout b/tests/ui/macros/log_syntax-trace_macros-macro-locations.stdout
index b28b04f64..b28b04f64 100644
--- a/src/test/ui/macros/log_syntax-trace_macros-macro-locations.stdout
+++ b/tests/ui/macros/log_syntax-trace_macros-macro-locations.stdout
diff --git a/src/test/ui/macros/macro-2.rs b/tests/ui/macros/macro-2.rs
index a315981b6..a315981b6 100644
--- a/src/test/ui/macros/macro-2.rs
+++ b/tests/ui/macros/macro-2.rs
diff --git a/src/test/ui/macros/macro-as-fn-body.rs b/tests/ui/macros/macro-as-fn-body.rs
index 6781c9a9e..6781c9a9e 100644
--- a/src/test/ui/macros/macro-as-fn-body.rs
+++ b/tests/ui/macros/macro-as-fn-body.rs
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015-rpass.rs b/tests/ui/macros/macro-at-most-once-rep-2015-rpass.rs
index 66597c0ac..66597c0ac 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2015-rpass.rs
+++ b/tests/ui/macros/macro-at-most-once-rep-2015-rpass.rs
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015.rs b/tests/ui/macros/macro-at-most-once-rep-2015.rs
index f68100d45..f68100d45 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2015.rs
+++ b/tests/ui/macros/macro-at-most-once-rep-2015.rs
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2015.stderr b/tests/ui/macros/macro-at-most-once-rep-2015.stderr
index 7c45b85bc..7c45b85bc 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2015.stderr
+++ b/tests/ui/macros/macro-at-most-once-rep-2015.stderr
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018-rpass.rs b/tests/ui/macros/macro-at-most-once-rep-2018-rpass.rs
index b37f38530..b37f38530 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2018-rpass.rs
+++ b/tests/ui/macros/macro-at-most-once-rep-2018-rpass.rs
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018.rs b/tests/ui/macros/macro-at-most-once-rep-2018.rs
index 886a25bbc..886a25bbc 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2018.rs
+++ b/tests/ui/macros/macro-at-most-once-rep-2018.rs
diff --git a/src/test/ui/macros/macro-at-most-once-rep-2018.stderr b/tests/ui/macros/macro-at-most-once-rep-2018.stderr
index 696520b28..696520b28 100644
--- a/src/test/ui/macros/macro-at-most-once-rep-2018.stderr
+++ b/tests/ui/macros/macro-at-most-once-rep-2018.stderr
diff --git a/src/test/ui/macros/macro-attribute-expansion.rs b/tests/ui/macros/macro-attribute-expansion.rs
index f01e5c44a..f01e5c44a 100644
--- a/src/test/ui/macros/macro-attribute-expansion.rs
+++ b/tests/ui/macros/macro-attribute-expansion.rs
diff --git a/src/test/ui/macros/macro-attribute.rs b/tests/ui/macros/macro-attribute.rs
index 88834a967..88834a967 100644
--- a/src/test/ui/macros/macro-attribute.rs
+++ b/tests/ui/macros/macro-attribute.rs
diff --git a/src/test/ui/macros/macro-attribute.stderr b/tests/ui/macros/macro-attribute.stderr
index 3316d3872..3316d3872 100644
--- a/src/test/ui/macros/macro-attribute.stderr
+++ b/tests/ui/macros/macro-attribute.stderr
diff --git a/src/test/ui/macros/macro-attributes.rs b/tests/ui/macros/macro-attributes.rs
index d382e8b71..d382e8b71 100644
--- a/src/test/ui/macros/macro-attributes.rs
+++ b/tests/ui/macros/macro-attributes.rs
diff --git a/src/test/ui/macros/macro-backtrace-invalid-internals.rs b/tests/ui/macros/macro-backtrace-invalid-internals.rs
index 9501e7cd0..9501e7cd0 100644
--- a/src/test/ui/macros/macro-backtrace-invalid-internals.rs
+++ b/tests/ui/macros/macro-backtrace-invalid-internals.rs
diff --git a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr b/tests/ui/macros/macro-backtrace-invalid-internals.stderr
index aa8f06a0d..aa8f06a0d 100644
--- a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
+++ b/tests/ui/macros/macro-backtrace-invalid-internals.stderr
diff --git a/src/test/ui/macros/macro-backtrace-nested.rs b/tests/ui/macros/macro-backtrace-nested.rs
index 13d80163d..13d80163d 100644
--- a/src/test/ui/macros/macro-backtrace-nested.rs
+++ b/tests/ui/macros/macro-backtrace-nested.rs
diff --git a/src/test/ui/macros/macro-backtrace-nested.stderr b/tests/ui/macros/macro-backtrace-nested.stderr
index dadedfbe8..dadedfbe8 100644
--- a/src/test/ui/macros/macro-backtrace-nested.stderr
+++ b/tests/ui/macros/macro-backtrace-nested.stderr
diff --git a/src/test/ui/macros/macro-backtrace-println.rs b/tests/ui/macros/macro-backtrace-println.rs
index 859dd019d..859dd019d 100644
--- a/src/test/ui/macros/macro-backtrace-println.rs
+++ b/tests/ui/macros/macro-backtrace-println.rs
diff --git a/src/test/ui/macros/macro-backtrace-println.stderr b/tests/ui/macros/macro-backtrace-println.stderr
index b4e2883e8..b4e2883e8 100644
--- a/src/test/ui/macros/macro-backtrace-println.stderr
+++ b/tests/ui/macros/macro-backtrace-println.stderr
diff --git a/src/test/ui/macros/macro-block-nonterminal.rs b/tests/ui/macros/macro-block-nonterminal.rs
index a6c9dd6e1..a6c9dd6e1 100644
--- a/src/test/ui/macros/macro-block-nonterminal.rs
+++ b/tests/ui/macros/macro-block-nonterminal.rs
diff --git a/src/test/ui/macros/macro-comma-behavior-rpass.rs b/tests/ui/macros/macro-comma-behavior-rpass.rs
index 8406b4e78..8406b4e78 100644
--- a/src/test/ui/macros/macro-comma-behavior-rpass.rs
+++ b/tests/ui/macros/macro-comma-behavior-rpass.rs
diff --git a/src/test/ui/macros/macro-comma-behavior.core.stderr b/tests/ui/macros/macro-comma-behavior.core.stderr
index ac15e9fa8..ac15e9fa8 100644
--- a/src/test/ui/macros/macro-comma-behavior.core.stderr
+++ b/tests/ui/macros/macro-comma-behavior.core.stderr
diff --git a/src/test/ui/macros/macro-comma-behavior.rs b/tests/ui/macros/macro-comma-behavior.rs
index 27d50ff3d..27d50ff3d 100644
--- a/src/test/ui/macros/macro-comma-behavior.rs
+++ b/tests/ui/macros/macro-comma-behavior.rs
diff --git a/src/test/ui/macros/macro-comma-behavior.std.stderr b/tests/ui/macros/macro-comma-behavior.std.stderr
index 7fd060e22..7fd060e22 100644
--- a/src/test/ui/macros/macro-comma-behavior.std.stderr
+++ b/tests/ui/macros/macro-comma-behavior.std.stderr
diff --git a/src/test/ui/macros/macro-comma-support-rpass.rs b/tests/ui/macros/macro-comma-support-rpass.rs
index 25b8c3cc6..25b8c3cc6 100644
--- a/src/test/ui/macros/macro-comma-support-rpass.rs
+++ b/tests/ui/macros/macro-comma-support-rpass.rs
diff --git a/src/test/ui/macros/macro-comma-support.rs b/tests/ui/macros/macro-comma-support.rs
index 7df5b6233..7df5b6233 100644
--- a/src/test/ui/macros/macro-comma-support.rs
+++ b/tests/ui/macros/macro-comma-support.rs
diff --git a/src/test/ui/macros/macro-comma-support.stderr b/tests/ui/macros/macro-comma-support.stderr
index 874efccd3..874efccd3 100644
--- a/src/test/ui/macros/macro-comma-support.stderr
+++ b/tests/ui/macros/macro-comma-support.stderr
diff --git a/src/test/ui/macros/macro-context.rs b/tests/ui/macros/macro-context.rs
index d09fdf118..d09fdf118 100644
--- a/src/test/ui/macros/macro-context.rs
+++ b/tests/ui/macros/macro-context.rs
diff --git a/src/test/ui/macros/macro-context.stderr b/tests/ui/macros/macro-context.stderr
index f597c398b..7785f4159 100644
--- a/src/test/ui/macros/macro-context.stderr
+++ b/tests/ui/macros/macro-context.stderr
@@ -82,3 +82,18 @@ error: aborting due to 6 previous errors; 1 warning emitted
 
 Some errors have detailed explanations: E0412, E0425.
 For more information about an error, try `rustc --explain E0412`.
+Future incompatibility report: Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/macro-context.rs:3:15
+   |
+LL |     () => ( i ; typeof );
+   |               ^
+...
+LL |     let i = m!();
+   |             ---- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/macros/macro-crate-def-only.rs b/tests/ui/macros/macro-crate-def-only.rs
index 514b33e38..514b33e38 100644
--- a/src/test/ui/macros/macro-crate-def-only.rs
+++ b/tests/ui/macros/macro-crate-def-only.rs
diff --git a/src/test/ui/macros/macro-crate-nonterminal-non-root.rs b/tests/ui/macros/macro-crate-nonterminal-non-root.rs
index 67899556f..67899556f 100644
--- a/src/test/ui/macros/macro-crate-nonterminal-non-root.rs
+++ b/tests/ui/macros/macro-crate-nonterminal-non-root.rs
diff --git a/src/test/ui/macros/macro-crate-nonterminal-non-root.stderr b/tests/ui/macros/macro-crate-nonterminal-non-root.stderr
index 1eca0186d..1eca0186d 100644
--- a/src/test/ui/macros/macro-crate-nonterminal-non-root.stderr
+++ b/tests/ui/macros/macro-crate-nonterminal-non-root.stderr
diff --git a/src/test/ui/macros/macro-crate-nonterminal-renamed.rs b/tests/ui/macros/macro-crate-nonterminal-renamed.rs
index 87bd397f0..87bd397f0 100644
--- a/src/test/ui/macros/macro-crate-nonterminal-renamed.rs
+++ b/tests/ui/macros/macro-crate-nonterminal-renamed.rs
diff --git a/src/test/ui/macros/macro-crate-nonterminal.rs b/tests/ui/macros/macro-crate-nonterminal.rs
index 4b1056fc7..4b1056fc7 100644
--- a/src/test/ui/macros/macro-crate-nonterminal.rs
+++ b/tests/ui/macros/macro-crate-nonterminal.rs
diff --git a/src/test/ui/macros/macro-crate-use.rs b/tests/ui/macros/macro-crate-use.rs
index 5c37cac96..5c37cac96 100644
--- a/src/test/ui/macros/macro-crate-use.rs
+++ b/tests/ui/macros/macro-crate-use.rs
diff --git a/src/test/ui/macros/macro-deep_expansion.rs b/tests/ui/macros/macro-deep_expansion.rs
index e13d8e1fc..e13d8e1fc 100644
--- a/src/test/ui/macros/macro-deep_expansion.rs
+++ b/tests/ui/macros/macro-deep_expansion.rs
diff --git a/src/test/ui/macros/macro-def-site-super.rs b/tests/ui/macros/macro-def-site-super.rs
index 716a8ced5..716a8ced5 100644
--- a/src/test/ui/macros/macro-def-site-super.rs
+++ b/tests/ui/macros/macro-def-site-super.rs
diff --git a/src/test/ui/macros/macro-delimiter-significance.rs b/tests/ui/macros/macro-delimiter-significance.rs
index 89f222b05..89f222b05 100644
--- a/src/test/ui/macros/macro-delimiter-significance.rs
+++ b/tests/ui/macros/macro-delimiter-significance.rs
diff --git a/src/test/ui/macros/macro-deprecation.rs b/tests/ui/macros/macro-deprecation.rs
index a7f327cf5..a7f327cf5 100644
--- a/src/test/ui/macros/macro-deprecation.rs
+++ b/tests/ui/macros/macro-deprecation.rs
diff --git a/src/test/ui/macros/macro-deprecation.stderr b/tests/ui/macros/macro-deprecation.stderr
index 07849d7ce..07849d7ce 100644
--- a/src/test/ui/macros/macro-deprecation.stderr
+++ b/tests/ui/macros/macro-deprecation.stderr
diff --git a/src/test/ui/macros/macro-doc-comments.rs b/tests/ui/macros/macro-doc-comments.rs
index fcc64cc06..fcc64cc06 100644
--- a/src/test/ui/macros/macro-doc-comments.rs
+++ b/tests/ui/macros/macro-doc-comments.rs
diff --git a/src/test/ui/macros/macro-doc-escapes.rs b/tests/ui/macros/macro-doc-escapes.rs
index ff5a5793b..ff5a5793b 100644
--- a/src/test/ui/macros/macro-doc-escapes.rs
+++ b/tests/ui/macros/macro-doc-escapes.rs
diff --git a/src/test/ui/macros/macro-doc-raw-str-hashes.rs b/tests/ui/macros/macro-doc-raw-str-hashes.rs
index a003bff3c..a003bff3c 100644
--- a/src/test/ui/macros/macro-doc-raw-str-hashes.rs
+++ b/tests/ui/macros/macro-doc-raw-str-hashes.rs
diff --git a/src/test/ui/macros/macro-error.rs b/tests/ui/macros/macro-error.rs
index 59ed79e91..59ed79e91 100644
--- a/src/test/ui/macros/macro-error.rs
+++ b/tests/ui/macros/macro-error.rs
diff --git a/src/test/ui/macros/macro-error.stderr b/tests/ui/macros/macro-error.stderr
index 2539a6d51..2539a6d51 100644
--- a/src/test/ui/macros/macro-error.stderr
+++ b/tests/ui/macros/macro-error.stderr
diff --git a/src/test/ui/macros/macro-expanded-include/file.txt b/tests/ui/macros/macro-expanded-include/file.txt
index e69de29bb..e69de29bb 100644
--- a/src/test/ui/macros/macro-expanded-include/file.txt
+++ b/tests/ui/macros/macro-expanded-include/file.txt
diff --git a/src/test/ui/macros/macro-expanded-include/foo/mod.rs b/tests/ui/macros/macro-expanded-include/foo/mod.rs
index cff110470..cff110470 100644
--- a/src/test/ui/macros/macro-expanded-include/foo/mod.rs
+++ b/tests/ui/macros/macro-expanded-include/foo/mod.rs
diff --git a/src/test/ui/macros/macro-expanded-include/test.rs b/tests/ui/macros/macro-expanded-include/test.rs
index 20da58a7e..20da58a7e 100644
--- a/src/test/ui/macros/macro-expanded-include/test.rs
+++ b/tests/ui/macros/macro-expanded-include/test.rs
diff --git a/src/test/ui/macros/macro-expansion-tests.rs b/tests/ui/macros/macro-expansion-tests.rs
index 38f4937c1..38f4937c1 100644
--- a/src/test/ui/macros/macro-expansion-tests.rs
+++ b/tests/ui/macros/macro-expansion-tests.rs
diff --git a/src/test/ui/macros/macro-expansion-tests.stderr b/tests/ui/macros/macro-expansion-tests.stderr
index 8b3f7ca88..8b3f7ca88 100644
--- a/src/test/ui/macros/macro-expansion-tests.stderr
+++ b/tests/ui/macros/macro-expansion-tests.stderr
diff --git a/src/test/ui/macros/macro-export-inner-module.rs b/tests/ui/macros/macro-export-inner-module.rs
index 1f23e90b6..1f23e90b6 100644
--- a/src/test/ui/macros/macro-export-inner-module.rs
+++ b/tests/ui/macros/macro-export-inner-module.rs
diff --git a/src/test/ui/macros/macro-first-set.rs b/tests/ui/macros/macro-first-set.rs
index eeb1ddd84..eeb1ddd84 100644
--- a/src/test/ui/macros/macro-first-set.rs
+++ b/tests/ui/macros/macro-first-set.rs
diff --git a/src/test/ui/macros/macro-follow-rpass.rs b/tests/ui/macros/macro-follow-rpass.rs
index ca9365563..ca9365563 100644
--- a/src/test/ui/macros/macro-follow-rpass.rs
+++ b/tests/ui/macros/macro-follow-rpass.rs
diff --git a/src/test/ui/macros/macro-follow.rs b/tests/ui/macros/macro-follow.rs
index 8054418d9..8054418d9 100644
--- a/src/test/ui/macros/macro-follow.rs
+++ b/tests/ui/macros/macro-follow.rs
diff --git a/src/test/ui/macros/macro-follow.stderr b/tests/ui/macros/macro-follow.stderr
index 61ae79d23..61ae79d23 100644
--- a/src/test/ui/macros/macro-follow.stderr
+++ b/tests/ui/macros/macro-follow.stderr
diff --git a/src/test/ui/macros/macro-followed-by-seq-bad.rs b/tests/ui/macros/macro-followed-by-seq-bad.rs
index b73742f77..b73742f77 100644
--- a/src/test/ui/macros/macro-followed-by-seq-bad.rs
+++ b/tests/ui/macros/macro-followed-by-seq-bad.rs
diff --git a/src/test/ui/macros/macro-followed-by-seq-bad.stderr b/tests/ui/macros/macro-followed-by-seq-bad.stderr
index 7097979ae..7097979ae 100644
--- a/src/test/ui/macros/macro-followed-by-seq-bad.stderr
+++ b/tests/ui/macros/macro-followed-by-seq-bad.stderr
diff --git a/src/test/ui/macros/macro-followed-by-seq.rs b/tests/ui/macros/macro-followed-by-seq.rs
index 71d59d8d3..71d59d8d3 100644
--- a/src/test/ui/macros/macro-followed-by-seq.rs
+++ b/tests/ui/macros/macro-followed-by-seq.rs
diff --git a/src/test/ui/macros/macro-in-expression-context-2.rs b/tests/ui/macros/macro-in-expression-context-2.rs
index 9423f0a35..9423f0a35 100644
--- a/src/test/ui/macros/macro-in-expression-context-2.rs
+++ b/tests/ui/macros/macro-in-expression-context-2.rs
diff --git a/src/test/ui/macros/macro-in-expression-context-2.stderr b/tests/ui/macros/macro-in-expression-context-2.stderr
index d0312c485..d0312c485 100644
--- a/src/test/ui/macros/macro-in-expression-context-2.stderr
+++ b/tests/ui/macros/macro-in-expression-context-2.stderr
diff --git a/src/test/ui/macros/macro-in-expression-context.fixed b/tests/ui/macros/macro-in-expression-context.fixed
index f22caf279..f22caf279 100644
--- a/src/test/ui/macros/macro-in-expression-context.fixed
+++ b/tests/ui/macros/macro-in-expression-context.fixed
diff --git a/src/test/ui/macros/macro-in-expression-context.rs b/tests/ui/macros/macro-in-expression-context.rs
index 1a056e582..1a056e582 100644
--- a/src/test/ui/macros/macro-in-expression-context.rs
+++ b/tests/ui/macros/macro-in-expression-context.rs
diff --git a/tests/ui/macros/macro-in-expression-context.stderr b/tests/ui/macros/macro-in-expression-context.stderr
new file mode 100644
index 000000000..3f492b141
--- /dev/null
+++ b/tests/ui/macros/macro-in-expression-context.stderr
@@ -0,0 +1,50 @@
+error: macro expansion ignores token `assert_eq` and any following
+  --> $DIR/macro-in-expression-context.rs:12:9
+   |
+LL |         assert_eq!("B", "B");
+   |         ^^^^^^^^^
+...
+LL |     foo!()
+   |     ------ caused by the macro expansion here
+   |
+   = note: the usage of `foo!` is likely invalid in expression context
+help: you might be missing a semicolon here
+   |
+LL |     foo!();
+   |           +
+
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/macro-in-expression-context.rs:5:29
+   |
+LL |         assert_eq!("A", "A");
+   |                             ^
+...
+LL |     foo!()
+   |     ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error; 1 warning emitted
+
+Future incompatibility report: Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/macro-in-expression-context.rs:5:29
+   |
+LL |         assert_eq!("A", "A");
+   |                             ^
+...
+LL |     foo!()
+   |     ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/macros/macro-in-fn.rs b/tests/ui/macros/macro-in-fn.rs
index d354fe4a7..d354fe4a7 100644
--- a/src/test/ui/macros/macro-in-fn.rs
+++ b/tests/ui/macros/macro-in-fn.rs
diff --git a/src/test/ui/macros/macro-include-items.rs b/tests/ui/macros/macro-include-items.rs
index 332bf59c9..332bf59c9 100644
--- a/src/test/ui/macros/macro-include-items.rs
+++ b/tests/ui/macros/macro-include-items.rs
diff --git a/src/test/ui/macros/macro-inner-attributes.rs b/tests/ui/macros/macro-inner-attributes.rs
index a8cda2307..a8cda2307 100644
--- a/src/test/ui/macros/macro-inner-attributes.rs
+++ b/tests/ui/macros/macro-inner-attributes.rs
diff --git a/src/test/ui/macros/macro-inner-attributes.stderr b/tests/ui/macros/macro-inner-attributes.stderr
index 77b648615..77b648615 100644
--- a/src/test/ui/macros/macro-inner-attributes.stderr
+++ b/tests/ui/macros/macro-inner-attributes.stderr
diff --git a/src/test/ui/macros/macro-input-future-proofing.rs b/tests/ui/macros/macro-input-future-proofing.rs
index 9a5bdb08a..9a5bdb08a 100644
--- a/src/test/ui/macros/macro-input-future-proofing.rs
+++ b/tests/ui/macros/macro-input-future-proofing.rs
diff --git a/src/test/ui/macros/macro-input-future-proofing.stderr b/tests/ui/macros/macro-input-future-proofing.stderr
index 542486927..542486927 100644
--- a/src/test/ui/macros/macro-input-future-proofing.stderr
+++ b/tests/ui/macros/macro-input-future-proofing.stderr
diff --git a/src/test/ui/macros/macro-interpolation.rs b/tests/ui/macros/macro-interpolation.rs
index 35003a79a..35003a79a 100644
--- a/src/test/ui/macros/macro-interpolation.rs
+++ b/tests/ui/macros/macro-interpolation.rs
diff --git a/src/test/ui/macros/macro-invalid-fragment-spec.rs b/tests/ui/macros/macro-invalid-fragment-spec.rs
index dc4d75096..dc4d75096 100644
--- a/src/test/ui/macros/macro-invalid-fragment-spec.rs
+++ b/tests/ui/macros/macro-invalid-fragment-spec.rs
diff --git a/src/test/ui/macros/macro-invalid-fragment-spec.stderr b/tests/ui/macros/macro-invalid-fragment-spec.stderr
index b04734482..b04734482 100644
--- a/src/test/ui/macros/macro-invalid-fragment-spec.stderr
+++ b/tests/ui/macros/macro-invalid-fragment-spec.stderr
diff --git a/src/test/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs b/tests/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
index 8f9dcb947..8f9dcb947 100644
--- a/src/test/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
+++ b/tests/ui/macros/macro-invocation-in-count-expr-fixed-array-type.rs
diff --git a/src/test/ui/macros/macro-lifetime-used-with-bound.rs b/tests/ui/macros/macro-lifetime-used-with-bound.rs
index ea3f74c9a..ea3f74c9a 100644
--- a/src/test/ui/macros/macro-lifetime-used-with-bound.rs
+++ b/tests/ui/macros/macro-lifetime-used-with-bound.rs
diff --git a/src/test/ui/macros/macro-lifetime-used-with-labels.rs b/tests/ui/macros/macro-lifetime-used-with-labels.rs
index 59017da3b..59017da3b 100644
--- a/src/test/ui/macros/macro-lifetime-used-with-labels.rs
+++ b/tests/ui/macros/macro-lifetime-used-with-labels.rs
diff --git a/src/test/ui/macros/macro-lifetime-used-with-static.rs b/tests/ui/macros/macro-lifetime-used-with-static.rs
index 8552c4b81..8552c4b81 100644
--- a/src/test/ui/macros/macro-lifetime-used-with-static.rs
+++ b/tests/ui/macros/macro-lifetime-used-with-static.rs
diff --git a/src/test/ui/macros/macro-lifetime.rs b/tests/ui/macros/macro-lifetime.rs
index 5931fe009..5931fe009 100644
--- a/src/test/ui/macros/macro-lifetime.rs
+++ b/tests/ui/macros/macro-lifetime.rs
diff --git a/src/test/ui/macros/macro-literal.rs b/tests/ui/macros/macro-literal.rs
index 3c2e71f9c..3c2e71f9c 100644
--- a/src/test/ui/macros/macro-literal.rs
+++ b/tests/ui/macros/macro-literal.rs
diff --git a/src/test/ui/macros/macro-local-data-key-priv.rs b/tests/ui/macros/macro-local-data-key-priv.rs
index 2e4f88f9a..2e4f88f9a 100644
--- a/src/test/ui/macros/macro-local-data-key-priv.rs
+++ b/tests/ui/macros/macro-local-data-key-priv.rs
diff --git a/src/test/ui/macros/macro-local-data-key-priv.stderr b/tests/ui/macros/macro-local-data-key-priv.stderr
index fb8cab279..fb8cab279 100644
--- a/src/test/ui/macros/macro-local-data-key-priv.stderr
+++ b/tests/ui/macros/macro-local-data-key-priv.stderr
diff --git a/src/test/ui/macros/macro-match-nonterminal.rs b/tests/ui/macros/macro-match-nonterminal.rs
index 5d9eb55fe..5d9eb55fe 100644
--- a/src/test/ui/macros/macro-match-nonterminal.rs
+++ b/tests/ui/macros/macro-match-nonterminal.rs
diff --git a/src/test/ui/macros/macro-match-nonterminal.stderr b/tests/ui/macros/macro-match-nonterminal.stderr
index ef7261c02..ef7261c02 100644
--- a/src/test/ui/macros/macro-match-nonterminal.stderr
+++ b/tests/ui/macros/macro-match-nonterminal.stderr
diff --git a/src/test/ui/macros/macro-meta-items-modern.rs b/tests/ui/macros/macro-meta-items-modern.rs
index bc6938d4a..bc6938d4a 100644
--- a/src/test/ui/macros/macro-meta-items-modern.rs
+++ b/tests/ui/macros/macro-meta-items-modern.rs
diff --git a/src/test/ui/macros/macro-meta-items.rs b/tests/ui/macros/macro-meta-items.rs
index 4cbc252ae..4cbc252ae 100644
--- a/src/test/ui/macros/macro-meta-items.rs
+++ b/tests/ui/macros/macro-meta-items.rs
diff --git a/src/test/ui/macros/macro-method-issue-4621.rs b/tests/ui/macros/macro-method-issue-4621.rs
index 342fad5f6..342fad5f6 100644
--- a/src/test/ui/macros/macro-method-issue-4621.rs
+++ b/tests/ui/macros/macro-method-issue-4621.rs
diff --git a/src/test/ui/macros/macro-missing-delimiters.rs b/tests/ui/macros/macro-missing-delimiters.rs
index 290d7615e..290d7615e 100644
--- a/src/test/ui/macros/macro-missing-delimiters.rs
+++ b/tests/ui/macros/macro-missing-delimiters.rs
diff --git a/src/test/ui/macros/macro-missing-delimiters.stderr b/tests/ui/macros/macro-missing-delimiters.stderr
index e7c37c8dd..e7c37c8dd 100644
--- a/src/test/ui/macros/macro-missing-delimiters.stderr
+++ b/tests/ui/macros/macro-missing-delimiters.stderr
diff --git a/src/test/ui/macros/macro-missing-fragment-deduplication.rs b/tests/ui/macros/macro-missing-fragment-deduplication.rs
index c1e6ba746..c1e6ba746 100644
--- a/src/test/ui/macros/macro-missing-fragment-deduplication.rs
+++ b/tests/ui/macros/macro-missing-fragment-deduplication.rs
diff --git a/src/test/ui/macros/macro-missing-fragment-deduplication.stderr b/tests/ui/macros/macro-missing-fragment-deduplication.stderr
index 3b9e716e1..3b9e716e1 100644
--- a/src/test/ui/macros/macro-missing-fragment-deduplication.stderr
+++ b/tests/ui/macros/macro-missing-fragment-deduplication.stderr
diff --git a/src/test/ui/macros/macro-missing-fragment.rs b/tests/ui/macros/macro-missing-fragment.rs
index 210c85ebb..210c85ebb 100644
--- a/src/test/ui/macros/macro-missing-fragment.rs
+++ b/tests/ui/macros/macro-missing-fragment.rs
diff --git a/src/test/ui/macros/macro-missing-fragment.stderr b/tests/ui/macros/macro-missing-fragment.stderr
index 2aa1e58f6..2aa1e58f6 100644
--- a/src/test/ui/macros/macro-missing-fragment.stderr
+++ b/tests/ui/macros/macro-missing-fragment.stderr
diff --git a/src/test/ui/macros/macro-multiple-items.rs b/tests/ui/macros/macro-multiple-items.rs
index 3b6dfd9bc..3b6dfd9bc 100644
--- a/src/test/ui/macros/macro-multiple-items.rs
+++ b/tests/ui/macros/macro-multiple-items.rs
diff --git a/src/test/ui/macros/macro-multiple-matcher-bindings.rs b/tests/ui/macros/macro-multiple-matcher-bindings.rs
index 7d39dc0a5..7d39dc0a5 100644
--- a/src/test/ui/macros/macro-multiple-matcher-bindings.rs
+++ b/tests/ui/macros/macro-multiple-matcher-bindings.rs
diff --git a/src/test/ui/macros/macro-multiple-matcher-bindings.stderr b/tests/ui/macros/macro-multiple-matcher-bindings.stderr
index 3ad1297ff..3ad1297ff 100644
--- a/src/test/ui/macros/macro-multiple-matcher-bindings.stderr
+++ b/tests/ui/macros/macro-multiple-matcher-bindings.stderr
diff --git a/src/test/ui/macros/macro-name-typo.rs b/tests/ui/macros/macro-name-typo.rs
index 1ddc419d3..1ddc419d3 100644
--- a/src/test/ui/macros/macro-name-typo.rs
+++ b/tests/ui/macros/macro-name-typo.rs
diff --git a/tests/ui/macros/macro-name-typo.stderr b/tests/ui/macros/macro-name-typo.stderr
new file mode 100644
index 000000000..d7c8aaae2
--- /dev/null
+++ b/tests/ui/macros/macro-name-typo.stderr
@@ -0,0 +1,11 @@
+error: cannot find macro `printlx` in this scope
+  --> $DIR/macro-name-typo.rs:2:5
+   |
+LL |     printlx!("oh noes!");
+   |     ^^^^^^^ help: a macro with a similar name exists: `println`
+  --> $SRC_DIR/std/src/macros.rs:LL:COL
+   |
+   = note: similarly named macro `println` defined here
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/macros/macro-named-default.rs b/tests/ui/macros/macro-named-default.rs
index 9b6cd1916..9b6cd1916 100644
--- a/src/test/ui/macros/macro-named-default.rs
+++ b/tests/ui/macros/macro-named-default.rs
diff --git a/src/test/ui/macros/macro-nested_definition_issue-31946.rs b/tests/ui/macros/macro-nested_definition_issue-31946.rs
index a83c5b2e4..a83c5b2e4 100644
--- a/src/test/ui/macros/macro-nested_definition_issue-31946.rs
+++ b/tests/ui/macros/macro-nested_definition_issue-31946.rs
diff --git a/src/test/ui/macros/macro-nested_expr.rs b/tests/ui/macros/macro-nested_expr.rs
index f1433cbf4..f1433cbf4 100644
--- a/src/test/ui/macros/macro-nested_expr.rs
+++ b/tests/ui/macros/macro-nested_expr.rs
diff --git a/src/test/ui/macros/macro-nested_stmt_macros.rs b/tests/ui/macros/macro-nested_stmt_macros.rs
index 5d4758a0c..5d4758a0c 100644
--- a/src/test/ui/macros/macro-nested_stmt_macros.rs
+++ b/tests/ui/macros/macro-nested_stmt_macros.rs
diff --git a/src/test/ui/macros/macro-non-lifetime.rs b/tests/ui/macros/macro-non-lifetime.rs
index 26e1f2afa..26e1f2afa 100644
--- a/src/test/ui/macros/macro-non-lifetime.rs
+++ b/tests/ui/macros/macro-non-lifetime.rs
diff --git a/src/test/ui/macros/macro-non-lifetime.stderr b/tests/ui/macros/macro-non-lifetime.stderr
index e1ed87f94..e1ed87f94 100644
--- a/src/test/ui/macros/macro-non-lifetime.stderr
+++ b/tests/ui/macros/macro-non-lifetime.stderr
diff --git a/src/test/ui/macros/macro-nt-list.rs b/tests/ui/macros/macro-nt-list.rs
index 36aa74f08..36aa74f08 100644
--- a/src/test/ui/macros/macro-nt-list.rs
+++ b/tests/ui/macros/macro-nt-list.rs
diff --git a/src/test/ui/macros/macro-of-higher-order.rs b/tests/ui/macros/macro-of-higher-order.rs
index ec551d6cd..ec551d6cd 100644
--- a/src/test/ui/macros/macro-of-higher-order.rs
+++ b/tests/ui/macros/macro-of-higher-order.rs
diff --git a/src/test/ui/macros/macro-or-patterns-back-compat.fixed b/tests/ui/macros/macro-or-patterns-back-compat.fixed
index b0d56e9bb..b0d56e9bb 100644
--- a/src/test/ui/macros/macro-or-patterns-back-compat.fixed
+++ b/tests/ui/macros/macro-or-patterns-back-compat.fixed
diff --git a/src/test/ui/macros/macro-or-patterns-back-compat.rs b/tests/ui/macros/macro-or-patterns-back-compat.rs
index 9e24b5106..9e24b5106 100644
--- a/src/test/ui/macros/macro-or-patterns-back-compat.rs
+++ b/tests/ui/macros/macro-or-patterns-back-compat.rs
diff --git a/src/test/ui/macros/macro-or-patterns-back-compat.stderr b/tests/ui/macros/macro-or-patterns-back-compat.stderr
index e04dfefa4..e04dfefa4 100644
--- a/src/test/ui/macros/macro-or-patterns-back-compat.stderr
+++ b/tests/ui/macros/macro-or-patterns-back-compat.stderr
diff --git a/src/test/ui/macros/macro-outer-attributes.rs b/tests/ui/macros/macro-outer-attributes.rs
index 0752f7e31..0752f7e31 100644
--- a/src/test/ui/macros/macro-outer-attributes.rs
+++ b/tests/ui/macros/macro-outer-attributes.rs
diff --git a/src/test/ui/macros/macro-outer-attributes.stderr b/tests/ui/macros/macro-outer-attributes.stderr
index 4ea760ab8..4ea760ab8 100644
--- a/src/test/ui/macros/macro-outer-attributes.stderr
+++ b/tests/ui/macros/macro-outer-attributes.stderr
diff --git a/src/test/ui/macros/macro-parameter-span.rs b/tests/ui/macros/macro-parameter-span.rs
index 5609f84e1..5609f84e1 100644
--- a/src/test/ui/macros/macro-parameter-span.rs
+++ b/tests/ui/macros/macro-parameter-span.rs
diff --git a/src/test/ui/macros/macro-parameter-span.stderr b/tests/ui/macros/macro-parameter-span.stderr
index 24e3e89ea..24e3e89ea 100644
--- a/src/test/ui/macros/macro-parameter-span.stderr
+++ b/tests/ui/macros/macro-parameter-span.stderr
diff --git a/src/test/ui/macros/macro-pat-follow-2018.rs b/tests/ui/macros/macro-pat-follow-2018.rs
index ce2911de9..ce2911de9 100644
--- a/src/test/ui/macros/macro-pat-follow-2018.rs
+++ b/tests/ui/macros/macro-pat-follow-2018.rs
diff --git a/src/test/ui/macros/macro-pat-follow.rs b/tests/ui/macros/macro-pat-follow.rs
index 8e02789fd..8e02789fd 100644
--- a/src/test/ui/macros/macro-pat-follow.rs
+++ b/tests/ui/macros/macro-pat-follow.rs
diff --git a/src/test/ui/macros/macro-pat-neg-lit.rs b/tests/ui/macros/macro-pat-neg-lit.rs
index 79c68fd25..79c68fd25 100644
--- a/src/test/ui/macros/macro-pat-neg-lit.rs
+++ b/tests/ui/macros/macro-pat-neg-lit.rs
diff --git a/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs b/tests/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs
index f5a97eca2..f5a97eca2 100644
--- a/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs
+++ b/tests/ui/macros/macro-pat-pattern-followed-by-or-in-2021.rs
diff --git a/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.stderr b/tests/ui/macros/macro-pat-pattern-followed-by-or-in-2021.stderr
index a06487be3..a06487be3 100644
--- a/src/test/ui/macros/macro-pat-pattern-followed-by-or-in-2021.stderr
+++ b/tests/ui/macros/macro-pat-pattern-followed-by-or-in-2021.stderr
diff --git a/src/test/ui/macros/macro-pat-pattern-followed-by-or.rs b/tests/ui/macros/macro-pat-pattern-followed-by-or.rs
index 54bd13d7e..54bd13d7e 100644
--- a/src/test/ui/macros/macro-pat-pattern-followed-by-or.rs
+++ b/tests/ui/macros/macro-pat-pattern-followed-by-or.rs
diff --git a/src/test/ui/macros/macro-pat.rs b/tests/ui/macros/macro-pat.rs
index baf816e53..baf816e53 100644
--- a/src/test/ui/macros/macro-pat.rs
+++ b/tests/ui/macros/macro-pat.rs
diff --git a/src/test/ui/macros/macro-pat2021-pattern-followed-by-or.rs b/tests/ui/macros/macro-pat2021-pattern-followed-by-or.rs
index b4be03aad..b4be03aad 100644
--- a/src/test/ui/macros/macro-pat2021-pattern-followed-by-or.rs
+++ b/tests/ui/macros/macro-pat2021-pattern-followed-by-or.rs
diff --git a/src/test/ui/macros/macro-pat2021-pattern-followed-by-or.stderr b/tests/ui/macros/macro-pat2021-pattern-followed-by-or.stderr
index c3754dde0..c3754dde0 100644
--- a/src/test/ui/macros/macro-pat2021-pattern-followed-by-or.stderr
+++ b/tests/ui/macros/macro-pat2021-pattern-followed-by-or.stderr
diff --git a/src/test/ui/macros/macro-path-prelude-fail-1.rs b/tests/ui/macros/macro-path-prelude-fail-1.rs
index d93792bdf..d93792bdf 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-1.rs
+++ b/tests/ui/macros/macro-path-prelude-fail-1.rs
diff --git a/src/test/ui/macros/macro-path-prelude-fail-1.stderr b/tests/ui/macros/macro-path-prelude-fail-1.stderr
index f8377ffb3..f8377ffb3 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-1.stderr
+++ b/tests/ui/macros/macro-path-prelude-fail-1.stderr
diff --git a/src/test/ui/macros/macro-path-prelude-fail-2.rs b/tests/ui/macros/macro-path-prelude-fail-2.rs
index 816a3c4cc..816a3c4cc 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-2.rs
+++ b/tests/ui/macros/macro-path-prelude-fail-2.rs
diff --git a/src/test/ui/macros/macro-path-prelude-fail-2.stderr b/tests/ui/macros/macro-path-prelude-fail-2.stderr
index 9574b7a1e..9574b7a1e 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-2.stderr
+++ b/tests/ui/macros/macro-path-prelude-fail-2.stderr
diff --git a/src/test/ui/macros/macro-path-prelude-fail-3.rs b/tests/ui/macros/macro-path-prelude-fail-3.rs
index 68eb350a9..68eb350a9 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-3.rs
+++ b/tests/ui/macros/macro-path-prelude-fail-3.rs
diff --git a/tests/ui/macros/macro-path-prelude-fail-3.stderr b/tests/ui/macros/macro-path-prelude-fail-3.stderr
new file mode 100644
index 000000000..f1c3512bc
--- /dev/null
+++ b/tests/ui/macros/macro-path-prelude-fail-3.stderr
@@ -0,0 +1,13 @@
+error: cannot find macro `inline` in this scope
+  --> $DIR/macro-path-prelude-fail-3.rs:2:5
+   |
+LL |     inline!();
+   |     ^^^^^^ help: a macro with a similar name exists: `line`
+  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
+   |
+   = note: similarly named macro `line` defined here
+   |
+   = note: `inline` is in scope, but it is an attribute: `#[inline]`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/macros/macro-path-prelude-fail-4.rs b/tests/ui/macros/macro-path-prelude-fail-4.rs
index 0f93fcdaa..0f93fcdaa 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-4.rs
+++ b/tests/ui/macros/macro-path-prelude-fail-4.rs
diff --git a/src/test/ui/macros/macro-path-prelude-fail-4.stderr b/tests/ui/macros/macro-path-prelude-fail-4.stderr
index dfd6818b6..dfd6818b6 100644
--- a/src/test/ui/macros/macro-path-prelude-fail-4.stderr
+++ b/tests/ui/macros/macro-path-prelude-fail-4.stderr
diff --git a/src/test/ui/macros/macro-path-prelude-pass.rs b/tests/ui/macros/macro-path-prelude-pass.rs
index 7cf346286..7cf346286 100644
--- a/src/test/ui/macros/macro-path-prelude-pass.rs
+++ b/tests/ui/macros/macro-path-prelude-pass.rs
diff --git a/src/test/ui/macros/macro-path-prelude-shadowing.rs b/tests/ui/macros/macro-path-prelude-shadowing.rs
index d71812000..d71812000 100644
--- a/src/test/ui/macros/macro-path-prelude-shadowing.rs
+++ b/tests/ui/macros/macro-path-prelude-shadowing.rs
diff --git a/src/test/ui/macros/macro-path-prelude-shadowing.stderr b/tests/ui/macros/macro-path-prelude-shadowing.stderr
index 4a864c2e9..4a864c2e9 100644
--- a/src/test/ui/macros/macro-path-prelude-shadowing.stderr
+++ b/tests/ui/macros/macro-path-prelude-shadowing.stderr
diff --git a/src/test/ui/macros/macro-path.rs b/tests/ui/macros/macro-path.rs
index 6c011c897..6c011c897 100644
--- a/src/test/ui/macros/macro-path.rs
+++ b/tests/ui/macros/macro-path.rs
diff --git a/src/test/ui/macros/macro-pub-matcher.rs b/tests/ui/macros/macro-pub-matcher.rs
index 7b02a70be..7b02a70be 100644
--- a/src/test/ui/macros/macro-pub-matcher.rs
+++ b/tests/ui/macros/macro-pub-matcher.rs
diff --git a/src/test/ui/macros/macro-reexport-removed.rs b/tests/ui/macros/macro-reexport-removed.rs
index 874c94d08..874c94d08 100644
--- a/src/test/ui/macros/macro-reexport-removed.rs
+++ b/tests/ui/macros/macro-reexport-removed.rs
diff --git a/src/test/ui/macros/macro-reexport-removed.stderr b/tests/ui/macros/macro-reexport-removed.stderr
index 475a586dd..475a586dd 100644
--- a/src/test/ui/macros/macro-reexport-removed.stderr
+++ b/tests/ui/macros/macro-reexport-removed.stderr
diff --git a/src/test/ui/macros/macro-seq-followed-by-seq.rs b/tests/ui/macros/macro-seq-followed-by-seq.rs
index 8f0f4fd4a..8f0f4fd4a 100644
--- a/src/test/ui/macros/macro-seq-followed-by-seq.rs
+++ b/tests/ui/macros/macro-seq-followed-by-seq.rs
diff --git a/src/test/ui/macros/macro-shadowing-relaxed.rs b/tests/ui/macros/macro-shadowing-relaxed.rs
index b2a639218..b2a639218 100644
--- a/src/test/ui/macros/macro-shadowing-relaxed.rs
+++ b/tests/ui/macros/macro-shadowing-relaxed.rs
diff --git a/src/test/ui/macros/macro-shadowing.rs b/tests/ui/macros/macro-shadowing.rs
index 7f956dd7d..7f956dd7d 100644
--- a/src/test/ui/macros/macro-shadowing.rs
+++ b/tests/ui/macros/macro-shadowing.rs
diff --git a/src/test/ui/macros/macro-shadowing.stderr b/tests/ui/macros/macro-shadowing.stderr
index a052b43ac..a052b43ac 100644
--- a/src/test/ui/macros/macro-shadowing.stderr
+++ b/tests/ui/macros/macro-shadowing.stderr
diff --git a/src/test/ui/macros/macro-stability-rpass.rs b/tests/ui/macros/macro-stability-rpass.rs
index 2d02b9528..2d02b9528 100644
--- a/src/test/ui/macros/macro-stability-rpass.rs
+++ b/tests/ui/macros/macro-stability-rpass.rs
diff --git a/src/test/ui/macros/macro-stability.rs b/tests/ui/macros/macro-stability.rs
index ed7618a67..ed7618a67 100644
--- a/src/test/ui/macros/macro-stability.rs
+++ b/tests/ui/macros/macro-stability.rs
diff --git a/src/test/ui/macros/macro-stability.stderr b/tests/ui/macros/macro-stability.stderr
index 2cfdb52b1..2cfdb52b1 100644
--- a/src/test/ui/macros/macro-stability.stderr
+++ b/tests/ui/macros/macro-stability.stderr
diff --git a/src/test/ui/macros/macro-stmt-matchers.rs b/tests/ui/macros/macro-stmt-matchers.rs
index a643e50e9..a643e50e9 100644
--- a/src/test/ui/macros/macro-stmt-matchers.rs
+++ b/tests/ui/macros/macro-stmt-matchers.rs
diff --git a/src/test/ui/macros/macro-stmt.rs b/tests/ui/macros/macro-stmt.rs
index c9a0b879a..c9a0b879a 100644
--- a/src/test/ui/macros/macro-stmt.rs
+++ b/tests/ui/macros/macro-stmt.rs
diff --git a/src/test/ui/macros/macro-stmt_macro_in_expr_macro.rs b/tests/ui/macros/macro-stmt_macro_in_expr_macro.rs
index 528d0b28b..528d0b28b 100644
--- a/src/test/ui/macros/macro-stmt_macro_in_expr_macro.rs
+++ b/tests/ui/macros/macro-stmt_macro_in_expr_macro.rs
diff --git a/src/test/ui/macros/macro-tt-followed-by-seq.rs b/tests/ui/macros/macro-tt-followed-by-seq.rs
index 080dbcfdd..080dbcfdd 100644
--- a/src/test/ui/macros/macro-tt-followed-by-seq.rs
+++ b/tests/ui/macros/macro-tt-followed-by-seq.rs
diff --git a/src/test/ui/macros/macro-tt-matchers.rs b/tests/ui/macros/macro-tt-matchers.rs
index 2ee41b088..2ee41b088 100644
--- a/src/test/ui/macros/macro-tt-matchers.rs
+++ b/tests/ui/macros/macro-tt-matchers.rs
diff --git a/src/test/ui/macros/macro-use-all-and-none.rs b/tests/ui/macros/macro-use-all-and-none.rs
index c8bd44008..c8bd44008 100644
--- a/src/test/ui/macros/macro-use-all-and-none.rs
+++ b/tests/ui/macros/macro-use-all-and-none.rs
diff --git a/src/test/ui/macros/macro-use-all-and-none.stderr b/tests/ui/macros/macro-use-all-and-none.stderr
index 00b10dccd..00b10dccd 100644
--- a/src/test/ui/macros/macro-use-all-and-none.stderr
+++ b/tests/ui/macros/macro-use-all-and-none.stderr
diff --git a/src/test/ui/macros/macro-use-all.rs b/tests/ui/macros/macro-use-all.rs
index 48c7b77e5..48c7b77e5 100644
--- a/src/test/ui/macros/macro-use-all.rs
+++ b/tests/ui/macros/macro-use-all.rs
diff --git a/src/test/ui/macros/macro-use-bad-args-1.rs b/tests/ui/macros/macro-use-bad-args-1.rs
index ec0b64a10..ec0b64a10 100644
--- a/src/test/ui/macros/macro-use-bad-args-1.rs
+++ b/tests/ui/macros/macro-use-bad-args-1.rs
diff --git a/src/test/ui/macros/macro-use-bad-args-1.stderr b/tests/ui/macros/macro-use-bad-args-1.stderr
index 4e5482a51..4e5482a51 100644
--- a/src/test/ui/macros/macro-use-bad-args-1.stderr
+++ b/tests/ui/macros/macro-use-bad-args-1.stderr
diff --git a/src/test/ui/macros/macro-use-bad-args-2.rs b/tests/ui/macros/macro-use-bad-args-2.rs
index c5f8f62c1..c5f8f62c1 100644
--- a/src/test/ui/macros/macro-use-bad-args-2.rs
+++ b/tests/ui/macros/macro-use-bad-args-2.rs
diff --git a/src/test/ui/macros/macro-use-bad-args-2.stderr b/tests/ui/macros/macro-use-bad-args-2.stderr
index c958104ea..c958104ea 100644
--- a/src/test/ui/macros/macro-use-bad-args-2.stderr
+++ b/tests/ui/macros/macro-use-bad-args-2.stderr
diff --git a/src/test/ui/macros/macro-use-both.rs b/tests/ui/macros/macro-use-both.rs
index ed5d1312f..ed5d1312f 100644
--- a/src/test/ui/macros/macro-use-both.rs
+++ b/tests/ui/macros/macro-use-both.rs
diff --git a/src/test/ui/macros/macro-use-one.rs b/tests/ui/macros/macro-use-one.rs
index f74795e68..f74795e68 100644
--- a/src/test/ui/macros/macro-use-one.rs
+++ b/tests/ui/macros/macro-use-one.rs
diff --git a/src/test/ui/macros/macro-use-scope.rs b/tests/ui/macros/macro-use-scope.rs
index 5e58fc9c1..5e58fc9c1 100644
--- a/src/test/ui/macros/macro-use-scope.rs
+++ b/tests/ui/macros/macro-use-scope.rs
diff --git a/src/test/ui/macros/macro-use-undef.rs b/tests/ui/macros/macro-use-undef.rs
index ae3054e7b..ae3054e7b 100644
--- a/src/test/ui/macros/macro-use-undef.rs
+++ b/tests/ui/macros/macro-use-undef.rs
diff --git a/src/test/ui/macros/macro-use-undef.stderr b/tests/ui/macros/macro-use-undef.stderr
index 85b86e221..85b86e221 100644
--- a/src/test/ui/macros/macro-use-undef.stderr
+++ b/tests/ui/macros/macro-use-undef.stderr
diff --git a/src/test/ui/macros/macro-use-wrong-name.rs b/tests/ui/macros/macro-use-wrong-name.rs
index d142b5800..d142b5800 100644
--- a/src/test/ui/macros/macro-use-wrong-name.rs
+++ b/tests/ui/macros/macro-use-wrong-name.rs
diff --git a/src/test/ui/macros/macro-use-wrong-name.stderr b/tests/ui/macros/macro-use-wrong-name.stderr
index 326001fc1..ca5f0f190 100644
--- a/src/test/ui/macros/macro-use-wrong-name.stderr
+++ b/tests/ui/macros/macro-use-wrong-name.stderr
@@ -9,7 +9,7 @@ LL |     macro_two!();
 LL | macro_rules! macro_one { () => ("one") }
    | ---------------------- similarly named macro `macro_one` defined here
    |
-   = note: consider importing this macro:
+   = help: consider importing this macro:
            two_macros::macro_two
 
 error: aborting due to previous error
diff --git a/src/test/ui/macros/macro-with-attrs1.rs b/tests/ui/macros/macro-with-attrs1.rs
index 4e943b224..4e943b224 100644
--- a/src/test/ui/macros/macro-with-attrs1.rs
+++ b/tests/ui/macros/macro-with-attrs1.rs
diff --git a/src/test/ui/macros/macro-with-attrs2.rs b/tests/ui/macros/macro-with-attrs2.rs
index 78c408102..78c408102 100644
--- a/src/test/ui/macros/macro-with-attrs2.rs
+++ b/tests/ui/macros/macro-with-attrs2.rs
diff --git a/src/test/ui/macros/macro-with-braces-in-expr-position.rs b/tests/ui/macros/macro-with-braces-in-expr-position.rs
index f7d87434d..f7d87434d 100644
--- a/src/test/ui/macros/macro-with-braces-in-expr-position.rs
+++ b/tests/ui/macros/macro-with-braces-in-expr-position.rs
diff --git a/src/test/ui/macros/macro_path_as_generic_bound.rs b/tests/ui/macros/macro_path_as_generic_bound.rs
index 663f85688..663f85688 100644
--- a/src/test/ui/macros/macro_path_as_generic_bound.rs
+++ b/tests/ui/macros/macro_path_as_generic_bound.rs
diff --git a/src/test/ui/macros/macro_path_as_generic_bound.stderr b/tests/ui/macros/macro_path_as_generic_bound.stderr
index 00d954d24..00d954d24 100644
--- a/src/test/ui/macros/macro_path_as_generic_bound.stderr
+++ b/tests/ui/macros/macro_path_as_generic_bound.stderr
diff --git a/src/test/ui/macros/macro_rules-unmatchable-literals.rs b/tests/ui/macros/macro_rules-unmatchable-literals.rs
index bde0fe1a0..bde0fe1a0 100644
--- a/src/test/ui/macros/macro_rules-unmatchable-literals.rs
+++ b/tests/ui/macros/macro_rules-unmatchable-literals.rs
diff --git a/src/test/ui/macros/macro_rules-unmatchable-literals.stderr b/tests/ui/macros/macro_rules-unmatchable-literals.stderr
index 956a66979..956a66979 100644
--- a/src/test/ui/macros/macro_rules-unmatchable-literals.stderr
+++ b/tests/ui/macros/macro_rules-unmatchable-literals.stderr
diff --git a/src/test/ui/macros/macro_undefined.rs b/tests/ui/macros/macro_undefined.rs
index 6ca1eb568..6ca1eb568 100644
--- a/src/test/ui/macros/macro_undefined.rs
+++ b/tests/ui/macros/macro_undefined.rs
diff --git a/src/test/ui/macros/macro_undefined.stderr b/tests/ui/macros/macro_undefined.stderr
index 4ab16bd10..4ab16bd10 100644
--- a/src/test/ui/macros/macro_undefined.stderr
+++ b/tests/ui/macros/macro_undefined.stderr
diff --git a/src/test/ui/macros/macro_with_super_2.rs b/tests/ui/macros/macro_with_super_2.rs
index 2901a74f6..2901a74f6 100644
--- a/src/test/ui/macros/macro_with_super_2.rs
+++ b/tests/ui/macros/macro_with_super_2.rs
diff --git a/src/test/ui/macros/macros-in-extern.rs b/tests/ui/macros/macros-in-extern.rs
index 568ae3a85..568ae3a85 100644
--- a/src/test/ui/macros/macros-in-extern.rs
+++ b/tests/ui/macros/macros-in-extern.rs
diff --git a/src/test/ui/macros/macros-nonfatal-errors.rs b/tests/ui/macros/macros-nonfatal-errors.rs
index ab14c3589..ab14c3589 100644
--- a/src/test/ui/macros/macros-nonfatal-errors.rs
+++ b/tests/ui/macros/macros-nonfatal-errors.rs
diff --git a/src/test/ui/macros/macros-nonfatal-errors.stderr b/tests/ui/macros/macros-nonfatal-errors.stderr
index d42f6c179..d42f6c179 100644
--- a/src/test/ui/macros/macros-nonfatal-errors.stderr
+++ b/tests/ui/macros/macros-nonfatal-errors.stderr
diff --git a/src/test/ui/macros/malformed_macro_lhs.rs b/tests/ui/macros/malformed_macro_lhs.rs
index f57d2fb4d..f57d2fb4d 100644
--- a/src/test/ui/macros/malformed_macro_lhs.rs
+++ b/tests/ui/macros/malformed_macro_lhs.rs
diff --git a/src/test/ui/macros/malformed_macro_lhs.stderr b/tests/ui/macros/malformed_macro_lhs.stderr
index adf64b089..adf64b089 100644
--- a/src/test/ui/macros/malformed_macro_lhs.stderr
+++ b/tests/ui/macros/malformed_macro_lhs.stderr
diff --git a/src/test/ui/macros/meta-item-absolute-path.rs b/tests/ui/macros/meta-item-absolute-path.rs
index 8ed911cbc..8ed911cbc 100644
--- a/src/test/ui/macros/meta-item-absolute-path.rs
+++ b/tests/ui/macros/meta-item-absolute-path.rs
diff --git a/src/test/ui/macros/meta-item-absolute-path.stderr b/tests/ui/macros/meta-item-absolute-path.stderr
index c53971e24..c53971e24 100644
--- a/src/test/ui/macros/meta-item-absolute-path.stderr
+++ b/tests/ui/macros/meta-item-absolute-path.stderr
diff --git a/src/test/ui/macros/meta-variable-depth-outside-repeat.rs b/tests/ui/macros/meta-variable-depth-outside-repeat.rs
index b7fb94785..b7fb94785 100644
--- a/src/test/ui/macros/meta-variable-depth-outside-repeat.rs
+++ b/tests/ui/macros/meta-variable-depth-outside-repeat.rs
diff --git a/src/test/ui/macros/meta-variable-depth-outside-repeat.stderr b/tests/ui/macros/meta-variable-depth-outside-repeat.stderr
index fad150cad..fad150cad 100644
--- a/src/test/ui/macros/meta-variable-depth-outside-repeat.stderr
+++ b/tests/ui/macros/meta-variable-depth-outside-repeat.stderr
diff --git a/src/test/ui/macros/meta-variable-misuse.rs b/tests/ui/macros/meta-variable-misuse.rs
index 99a2f9401..99a2f9401 100644
--- a/src/test/ui/macros/meta-variable-misuse.rs
+++ b/tests/ui/macros/meta-variable-misuse.rs
diff --git a/src/test/ui/macros/missing-bang-in-decl.fixed b/tests/ui/macros/missing-bang-in-decl.fixed
index b1aa3298b..b1aa3298b 100644
--- a/src/test/ui/macros/missing-bang-in-decl.fixed
+++ b/tests/ui/macros/missing-bang-in-decl.fixed
diff --git a/src/test/ui/macros/missing-bang-in-decl.rs b/tests/ui/macros/missing-bang-in-decl.rs
index 8393f15fc..8393f15fc 100644
--- a/src/test/ui/macros/missing-bang-in-decl.rs
+++ b/tests/ui/macros/missing-bang-in-decl.rs
diff --git a/src/test/ui/macros/missing-bang-in-decl.stderr b/tests/ui/macros/missing-bang-in-decl.stderr
index dfabafb0a..dfabafb0a 100644
--- a/src/test/ui/macros/missing-bang-in-decl.stderr
+++ b/tests/ui/macros/missing-bang-in-decl.stderr
diff --git a/src/test/ui/macros/missing-comma.rs b/tests/ui/macros/missing-comma.rs
index 92f8a7795..92f8a7795 100644
--- a/src/test/ui/macros/missing-comma.rs
+++ b/tests/ui/macros/missing-comma.rs
diff --git a/src/test/ui/macros/missing-comma.stderr b/tests/ui/macros/missing-comma.stderr
index 81877a29e..81877a29e 100644
--- a/src/test/ui/macros/missing-comma.stderr
+++ b/tests/ui/macros/missing-comma.stderr
diff --git a/src/test/ui/macros/must-use-in-macro-55516.rs b/tests/ui/macros/must-use-in-macro-55516.rs
index e7c346286..e7c346286 100644
--- a/src/test/ui/macros/must-use-in-macro-55516.rs
+++ b/tests/ui/macros/must-use-in-macro-55516.rs
diff --git a/src/test/ui/macros/must-use-in-macro-55516.stderr b/tests/ui/macros/must-use-in-macro-55516.stderr
index 8878b0eea..8878b0eea 100644
--- a/src/test/ui/macros/must-use-in-macro-55516.stderr
+++ b/tests/ui/macros/must-use-in-macro-55516.stderr
diff --git a/src/test/ui/macros/no-std-macros.rs b/tests/ui/macros/no-std-macros.rs
index ada643c7a..ada643c7a 100644
--- a/src/test/ui/macros/no-std-macros.rs
+++ b/tests/ui/macros/no-std-macros.rs
diff --git a/src/test/ui/macros/none-delim-lookahead.rs b/tests/ui/macros/none-delim-lookahead.rs
index bf4fddea1..bf4fddea1 100644
--- a/src/test/ui/macros/none-delim-lookahead.rs
+++ b/tests/ui/macros/none-delim-lookahead.rs
diff --git a/src/test/ui/macros/nonterminal-matching.rs b/tests/ui/macros/nonterminal-matching.rs
index 84fffe44d..84fffe44d 100644
--- a/src/test/ui/macros/nonterminal-matching.rs
+++ b/tests/ui/macros/nonterminal-matching.rs
diff --git a/src/test/ui/macros/nonterminal-matching.stderr b/tests/ui/macros/nonterminal-matching.stderr
index 5bbd54390..5bbd54390 100644
--- a/src/test/ui/macros/nonterminal-matching.stderr
+++ b/tests/ui/macros/nonterminal-matching.stderr
diff --git a/src/test/ui/macros/not-utf8.bin b/tests/ui/macros/not-utf8.bin
index 4148e5b88..4148e5b88 100644
--- a/src/test/ui/macros/not-utf8.bin
+++ b/tests/ui/macros/not-utf8.bin
diff --git a/src/test/ui/macros/not-utf8.rs b/tests/ui/macros/not-utf8.rs
index 1cb1fdcb8..1cb1fdcb8 100644
--- a/src/test/ui/macros/not-utf8.rs
+++ b/tests/ui/macros/not-utf8.rs
diff --git a/src/test/ui/macros/not-utf8.stderr b/tests/ui/macros/not-utf8.stderr
index 7e1f2dcad..7e1f2dcad 100644
--- a/src/test/ui/macros/not-utf8.stderr
+++ b/tests/ui/macros/not-utf8.stderr
diff --git a/src/test/ui/macros/out-of-order-shadowing.rs b/tests/ui/macros/out-of-order-shadowing.rs
index a0d1a9737..a0d1a9737 100644
--- a/src/test/ui/macros/out-of-order-shadowing.rs
+++ b/tests/ui/macros/out-of-order-shadowing.rs
diff --git a/src/test/ui/macros/out-of-order-shadowing.stderr b/tests/ui/macros/out-of-order-shadowing.stderr
index dedefac5c..dedefac5c 100644
--- a/src/test/ui/macros/out-of-order-shadowing.stderr
+++ b/tests/ui/macros/out-of-order-shadowing.stderr
diff --git a/src/test/ui/macros/parse-complex-macro-invoc-op.rs b/tests/ui/macros/parse-complex-macro-invoc-op.rs
index 8fef9b0ed..8fef9b0ed 100644
--- a/src/test/ui/macros/parse-complex-macro-invoc-op.rs
+++ b/tests/ui/macros/parse-complex-macro-invoc-op.rs
diff --git a/src/test/ui/macros/paths-in-macro-invocations.rs b/tests/ui/macros/paths-in-macro-invocations.rs
index 622818a92..622818a92 100644
--- a/src/test/ui/macros/paths-in-macro-invocations.rs
+++ b/tests/ui/macros/paths-in-macro-invocations.rs
diff --git a/src/test/ui/macros/proc_macro.rs b/tests/ui/macros/proc_macro.rs
index 66f9cdc55..66f9cdc55 100644
--- a/src/test/ui/macros/proc_macro.rs
+++ b/tests/ui/macros/proc_macro.rs
diff --git a/src/test/ui/macros/pub-item-inside-macro.rs b/tests/ui/macros/pub-item-inside-macro.rs
index d07681453..d07681453 100644
--- a/src/test/ui/macros/pub-item-inside-macro.rs
+++ b/tests/ui/macros/pub-item-inside-macro.rs
diff --git a/src/test/ui/macros/pub-method-inside-macro.rs b/tests/ui/macros/pub-method-inside-macro.rs
index bc918c7a4..bc918c7a4 100644
--- a/src/test/ui/macros/pub-method-inside-macro.rs
+++ b/tests/ui/macros/pub-method-inside-macro.rs
diff --git a/src/test/ui/macros/recovery-allowed.rs b/tests/ui/macros/recovery-allowed.rs
index ebf65f1cc..ebf65f1cc 100644
--- a/src/test/ui/macros/recovery-allowed.rs
+++ b/tests/ui/macros/recovery-allowed.rs
diff --git a/src/test/ui/macros/recovery-allowed.stderr b/tests/ui/macros/recovery-allowed.stderr
index ec036e8b1..ec036e8b1 100644
--- a/src/test/ui/macros/recovery-allowed.stderr
+++ b/tests/ui/macros/recovery-allowed.stderr
diff --git a/src/test/ui/macros/recovery-forbidden.rs b/tests/ui/macros/recovery-forbidden.rs
index 5dd261933..5dd261933 100644
--- a/src/test/ui/macros/recovery-forbidden.rs
+++ b/tests/ui/macros/recovery-forbidden.rs
diff --git a/src/test/ui/macros/restricted-shadowing-legacy.rs b/tests/ui/macros/restricted-shadowing-legacy.rs
index f5cac2dfb..f5cac2dfb 100644
--- a/src/test/ui/macros/restricted-shadowing-legacy.rs
+++ b/tests/ui/macros/restricted-shadowing-legacy.rs
diff --git a/src/test/ui/macros/restricted-shadowing-legacy.stderr b/tests/ui/macros/restricted-shadowing-legacy.stderr
index b8865112e..b8865112e 100644
--- a/src/test/ui/macros/restricted-shadowing-legacy.stderr
+++ b/tests/ui/macros/restricted-shadowing-legacy.stderr
diff --git a/src/test/ui/macros/restricted-shadowing-modern.rs b/tests/ui/macros/restricted-shadowing-modern.rs
index 1151a829e..1151a829e 100644
--- a/src/test/ui/macros/restricted-shadowing-modern.rs
+++ b/tests/ui/macros/restricted-shadowing-modern.rs
diff --git a/src/test/ui/macros/restricted-shadowing-modern.stderr b/tests/ui/macros/restricted-shadowing-modern.stderr
index 27665bfc3..27665bfc3 100644
--- a/src/test/ui/macros/restricted-shadowing-modern.stderr
+++ b/tests/ui/macros/restricted-shadowing-modern.stderr
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
index b8b6f0846..b8b6f0846 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs
index d46f396ee..d46f396ee 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
index 6a1435f79..6a1435f79 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/assert-without-captures-does-not-create-unnecessary-code.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-without-captures-does-not-create-unnecessary-code.rs
index 1f5a29ab5..1f5a29ab5 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/assert-without-captures-does-not-create-unnecessary-code.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/assert-without-captures-does-not-create-unnecessary-code.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/auxiliary/common.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/auxiliary/common.rs
index 903ed507c..903ed507c 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/auxiliary/common.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/auxiliary/common.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
index 01860adaa..01860adaa 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/feature-gate-generic_assert.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.rs b/tests/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.rs
index 5ec84b08f..5ec84b08f 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.rs
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.rs
diff --git a/src/test/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.stdout b/tests/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.stdout
index 90f858f80..90f858f80 100644
--- a/src/test/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.stdout
+++ b/tests/ui/macros/rfc-2011-nicer-assert-messages/non-consuming-methods-have-optimized-codegen.stdout
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/count-and-length-are-distinct.rs b/tests/ui/macros/rfc-3086-metavar-expr/count-and-length-are-distinct.rs
index ab8d95a41..ab8d95a41 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/count-and-length-are-distinct.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/count-and-length-are-distinct.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/dollar-dollar-has-correct-behavior.rs b/tests/ui/macros/rfc-3086-metavar-expr/dollar-dollar-has-correct-behavior.rs
index ed94c27cf..ed94c27cf 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/dollar-dollar-has-correct-behavior.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/dollar-dollar-has-correct-behavior.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/feature-gate-macro_metavar_expr.rs b/tests/ui/macros/rfc-3086-metavar-expr/feature-gate-macro_metavar_expr.rs
index d05cd1b31..d05cd1b31 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/feature-gate-macro_metavar_expr.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/feature-gate-macro_metavar_expr.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/macro-expansion.rs b/tests/ui/macros/rfc-3086-metavar-expr/macro-expansion.rs
index b954967c4..b954967c4 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/macro-expansion.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/macro-expansion.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.rs b/tests/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.rs
index 6a0d68bd6..6a0d68bd6 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.stderr b/tests/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.stderr
index 236122b64..236122b64 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.stderr
+++ b/tests/ui/macros/rfc-3086-metavar-expr/out-of-bounds-arguments.stderr
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/required-feature.rs b/tests/ui/macros/rfc-3086-metavar-expr/required-feature.rs
index b4fef11f1..b4fef11f1 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/required-feature.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/required-feature.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/required-feature.stderr b/tests/ui/macros/rfc-3086-metavar-expr/required-feature.stderr
index ecf598b10..ecf598b10 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/required-feature.stderr
+++ b/tests/ui/macros/rfc-3086-metavar-expr/required-feature.stderr
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/syntax-errors.rs b/tests/ui/macros/rfc-3086-metavar-expr/syntax-errors.rs
index fdf16442d..fdf16442d 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/syntax-errors.rs
+++ b/tests/ui/macros/rfc-3086-metavar-expr/syntax-errors.rs
diff --git a/src/test/ui/macros/rfc-3086-metavar-expr/syntax-errors.stderr b/tests/ui/macros/rfc-3086-metavar-expr/syntax-errors.stderr
index a6cff95fd..a6cff95fd 100644
--- a/src/test/ui/macros/rfc-3086-metavar-expr/syntax-errors.stderr
+++ b/tests/ui/macros/rfc-3086-metavar-expr/syntax-errors.stderr
diff --git a/src/test/ui/macros/same-sequence-span.rs b/tests/ui/macros/same-sequence-span.rs
index e0bb4d985..e0bb4d985 100644
--- a/src/test/ui/macros/same-sequence-span.rs
+++ b/tests/ui/macros/same-sequence-span.rs
diff --git a/src/test/ui/macros/same-sequence-span.stderr b/tests/ui/macros/same-sequence-span.stderr
index bdd191e8e..bdd191e8e 100644
--- a/src/test/ui/macros/same-sequence-span.stderr
+++ b/tests/ui/macros/same-sequence-span.stderr
diff --git a/src/test/ui/macros/semi-after-macro-ty.rs b/tests/ui/macros/semi-after-macro-ty.rs
index f83ace8fa..f83ace8fa 100644
--- a/src/test/ui/macros/semi-after-macro-ty.rs
+++ b/tests/ui/macros/semi-after-macro-ty.rs
diff --git a/src/test/ui/macros/span-covering-argument-1.rs b/tests/ui/macros/span-covering-argument-1.rs
index 9b9506c80..9b9506c80 100644
--- a/src/test/ui/macros/span-covering-argument-1.rs
+++ b/tests/ui/macros/span-covering-argument-1.rs
diff --git a/src/test/ui/macros/span-covering-argument-1.stderr b/tests/ui/macros/span-covering-argument-1.stderr
index ce3424a8b..e57347b36 100644
--- a/src/test/ui/macros/span-covering-argument-1.stderr
+++ b/tests/ui/macros/span-covering-argument-1.stderr
@@ -1,8 +1,6 @@
 error[E0596]: cannot borrow `foo` as mutable, as it is not declared as mutable
   --> $DIR/span-covering-argument-1.rs:5:14
    |
-LL |             let $s = 0;
-   |                 -- help: consider changing this to be mutable: `mut foo`
 LL |             *&mut $s = 0;
    |              ^^^^^^^ cannot borrow as mutable
 ...
@@ -10,6 +8,10 @@ LL |     bad!(foo whatever);
    |     ------------------ in this macro invocation
    |
    = note: this error originates in the macro `bad` (in Nightly builds, run with -Z macro-backtrace for more info)
+help: consider changing this to be mutable
+   |
+LL |             let mut $s = 0;
+   |                 +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/stmt_expr_attr_macro_parse.rs b/tests/ui/macros/stmt_expr_attr_macro_parse.rs
index 570191d2c..570191d2c 100644
--- a/src/test/ui/macros/stmt_expr_attr_macro_parse.rs
+++ b/tests/ui/macros/stmt_expr_attr_macro_parse.rs
diff --git a/src/test/ui/macros/stringify.rs b/tests/ui/macros/stringify.rs
index bc0d44881..5cd217df6 100644
--- a/src/test/ui/macros/stringify.rs
+++ b/tests/ui/macros/stringify.rs
@@ -801,7 +801,7 @@ fn test_ty() {
     assert_eq!(stringify_ty!(*const T), "*const T");
     assert_eq!(stringify_ty!(*mut T), "*mut T");
 
-    // TyKind::Rptr
+    // TyKind::Ref
     assert_eq!(stringify_ty!(&T), "&T");
     assert_eq!(stringify_ty!(&mut T), "&mut T");
     assert_eq!(stringify_ty!(&'a T), "&'a T");
diff --git a/src/test/ui/macros/syntax-error-recovery.rs b/tests/ui/macros/syntax-error-recovery.rs
index ae6de3c50..ae6de3c50 100644
--- a/src/test/ui/macros/syntax-error-recovery.rs
+++ b/tests/ui/macros/syntax-error-recovery.rs
diff --git a/src/test/ui/macros/syntax-error-recovery.stderr b/tests/ui/macros/syntax-error-recovery.stderr
index c42ee9b29..c42ee9b29 100644
--- a/src/test/ui/macros/syntax-error-recovery.stderr
+++ b/tests/ui/macros/syntax-error-recovery.stderr
diff --git a/src/test/ui/macros/syntax-extension-cfg.rs b/tests/ui/macros/syntax-extension-cfg.rs
index 2e929fc1d..2e929fc1d 100644
--- a/src/test/ui/macros/syntax-extension-cfg.rs
+++ b/tests/ui/macros/syntax-extension-cfg.rs
diff --git a/src/test/ui/macros/syntax-extension-source-utils-files/includeme.fragment b/tests/ui/macros/syntax-extension-source-utils-files/includeme.fragment
index d752015a4..d752015a4 100644
--- a/src/test/ui/macros/syntax-extension-source-utils-files/includeme.fragment
+++ b/tests/ui/macros/syntax-extension-source-utils-files/includeme.fragment
diff --git a/src/test/ui/macros/syntax-extension-source-utils.rs b/tests/ui/macros/syntax-extension-source-utils.rs
index 7e46260d5..7e46260d5 100644
--- a/src/test/ui/macros/syntax-extension-source-utils.rs
+++ b/tests/ui/macros/syntax-extension-source-utils.rs
diff --git a/src/test/ui/macros/trace-macro.rs b/tests/ui/macros/trace-macro.rs
index 576120811..576120811 100644
--- a/src/test/ui/macros/trace-macro.rs
+++ b/tests/ui/macros/trace-macro.rs
diff --git a/src/test/ui/macros/trace-macro.stderr b/tests/ui/macros/trace-macro.stderr
index 43272248c..43272248c 100644
--- a/src/test/ui/macros/trace-macro.stderr
+++ b/tests/ui/macros/trace-macro.stderr
diff --git a/src/test/ui/macros/trace_faulty_macros.rs b/tests/ui/macros/trace_faulty_macros.rs
index b2fdd2e19..b2fdd2e19 100644
--- a/src/test/ui/macros/trace_faulty_macros.rs
+++ b/tests/ui/macros/trace_faulty_macros.rs
diff --git a/src/test/ui/macros/trace_faulty_macros.stderr b/tests/ui/macros/trace_faulty_macros.stderr
index 21e47da07..21e47da07 100644
--- a/src/test/ui/macros/trace_faulty_macros.stderr
+++ b/tests/ui/macros/trace_faulty_macros.stderr
diff --git a/src/test/ui/macros/trace_macros-format.rs b/tests/ui/macros/trace_macros-format.rs
index afca45ca0..afca45ca0 100644
--- a/src/test/ui/macros/trace_macros-format.rs
+++ b/tests/ui/macros/trace_macros-format.rs
diff --git a/src/test/ui/macros/trace_macros-format.stderr b/tests/ui/macros/trace_macros-format.stderr
index c32027086..c32027086 100644
--- a/src/test/ui/macros/trace_macros-format.stderr
+++ b/tests/ui/macros/trace_macros-format.stderr
diff --git a/src/test/ui/macros/try-macro.rs b/tests/ui/macros/try-macro.rs
index 824c77d9d..824c77d9d 100644
--- a/src/test/ui/macros/try-macro.rs
+++ b/tests/ui/macros/try-macro.rs
diff --git a/src/test/ui/macros/two-macro-use.rs b/tests/ui/macros/two-macro-use.rs
index 07022bb01..07022bb01 100644
--- a/src/test/ui/macros/two-macro-use.rs
+++ b/tests/ui/macros/two-macro-use.rs
diff --git a/src/test/ui/macros/type-macros-hlist.rs b/tests/ui/macros/type-macros-hlist.rs
index 946b5bd5d..946b5bd5d 100644
--- a/src/test/ui/macros/type-macros-hlist.rs
+++ b/tests/ui/macros/type-macros-hlist.rs
diff --git a/src/test/ui/macros/type-macros-simple.rs b/tests/ui/macros/type-macros-simple.rs
index dd3ad2ef0..dd3ad2ef0 100644
--- a/src/test/ui/macros/type-macros-simple.rs
+++ b/tests/ui/macros/type-macros-simple.rs
diff --git a/src/test/ui/macros/typeck-macro-interaction-issue-8852.rs b/tests/ui/macros/typeck-macro-interaction-issue-8852.rs
index f2b089b74..f2b089b74 100644
--- a/src/test/ui/macros/typeck-macro-interaction-issue-8852.rs
+++ b/tests/ui/macros/typeck-macro-interaction-issue-8852.rs
diff --git a/src/test/ui/macros/unimplemented-macro-panic.rs b/tests/ui/macros/unimplemented-macro-panic.rs
index e7169903f..e7169903f 100644
--- a/src/test/ui/macros/unimplemented-macro-panic.rs
+++ b/tests/ui/macros/unimplemented-macro-panic.rs
diff --git a/src/test/ui/macros/unknown-builtin.rs b/tests/ui/macros/unknown-builtin.rs
index 16f9139e6..16f9139e6 100644
--- a/src/test/ui/macros/unknown-builtin.rs
+++ b/tests/ui/macros/unknown-builtin.rs
diff --git a/src/test/ui/macros/unknown-builtin.stderr b/tests/ui/macros/unknown-builtin.stderr
index 8f9dba165..22f54e04e 100644
--- a/src/test/ui/macros/unknown-builtin.stderr
+++ b/tests/ui/macros/unknown-builtin.stderr
@@ -7,9 +7,6 @@ LL | macro_rules! unknown { () => () }
 error[E0773]: attempted to define built-in macro more than once
   --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
    |
-LL |     macro_rules! line {
-   |     ^^^^^^^^^^^^^^^^^
-   |
 note: previously defined here
   --> $DIR/unknown-builtin.rs:9:1
    |
diff --git a/src/test/ui/macros/unreachable-arg.edition_2021.stderr b/tests/ui/macros/unreachable-arg.edition_2021.stderr
index d70ef31ee..d70ef31ee 100644
--- a/src/test/ui/macros/unreachable-arg.edition_2021.stderr
+++ b/tests/ui/macros/unreachable-arg.edition_2021.stderr
diff --git a/src/test/ui/macros/unreachable-arg.rs b/tests/ui/macros/unreachable-arg.rs
index 4024bd20b..4024bd20b 100644
--- a/src/test/ui/macros/unreachable-arg.rs
+++ b/tests/ui/macros/unreachable-arg.rs
diff --git a/src/test/ui/macros/unreachable-fmt-msg.rs b/tests/ui/macros/unreachable-fmt-msg.rs
index eb17ed927..eb17ed927 100644
--- a/src/test/ui/macros/unreachable-fmt-msg.rs
+++ b/tests/ui/macros/unreachable-fmt-msg.rs
diff --git a/src/test/ui/macros/unreachable-format-arg.rs b/tests/ui/macros/unreachable-format-arg.rs
index ff059ad9e..ff059ad9e 100644
--- a/src/test/ui/macros/unreachable-format-arg.rs
+++ b/tests/ui/macros/unreachable-format-arg.rs
diff --git a/src/test/ui/macros/unreachable-format-args.edition_2015.stderr b/tests/ui/macros/unreachable-format-args.edition_2015.stderr
index 2cc2e134b..2cc2e134b 100644
--- a/src/test/ui/macros/unreachable-format-args.edition_2015.stderr
+++ b/tests/ui/macros/unreachable-format-args.edition_2015.stderr
diff --git a/src/test/ui/macros/unreachable-format-args.rs b/tests/ui/macros/unreachable-format-args.rs
index 04a31fc1b..04a31fc1b 100644
--- a/src/test/ui/macros/unreachable-format-args.rs
+++ b/tests/ui/macros/unreachable-format-args.rs
diff --git a/src/test/ui/macros/unreachable-macro-panic.rs b/tests/ui/macros/unreachable-macro-panic.rs
index 55e2102e2..55e2102e2 100644
--- a/src/test/ui/macros/unreachable-macro-panic.rs
+++ b/tests/ui/macros/unreachable-macro-panic.rs
diff --git a/src/test/ui/macros/unreachable-static-msg.rs b/tests/ui/macros/unreachable-static-msg.rs
index 55edf3af7..55edf3af7 100644
--- a/src/test/ui/macros/unreachable-static-msg.rs
+++ b/tests/ui/macros/unreachable-static-msg.rs
diff --git a/src/test/ui/macros/unreachable.rs b/tests/ui/macros/unreachable.rs
index 55e2102e2..55e2102e2 100644
--- a/src/test/ui/macros/unreachable.rs
+++ b/tests/ui/macros/unreachable.rs
diff --git a/src/test/ui/macros/use-macro-self.rs b/tests/ui/macros/use-macro-self.rs
index 06464ab0b..06464ab0b 100644
--- a/src/test/ui/macros/use-macro-self.rs
+++ b/tests/ui/macros/use-macro-self.rs
diff --git a/src/test/ui/macros/vec-macro-in-pattern.rs b/tests/ui/macros/vec-macro-in-pattern.rs
index ce4298b8b..ce4298b8b 100644
--- a/src/test/ui/macros/vec-macro-in-pattern.rs
+++ b/tests/ui/macros/vec-macro-in-pattern.rs
diff --git a/src/test/ui/macros/vec-macro-in-pattern.stderr b/tests/ui/macros/vec-macro-in-pattern.stderr
index 7060f5d8b..7060f5d8b 100644
--- a/src/test/ui/macros/vec-macro-in-pattern.stderr
+++ b/tests/ui/macros/vec-macro-in-pattern.stderr