713 files changed, 784 insertions, 37 deletions

diff --git a/src/test/ui/lint-unknown-lints-at-crate-level.rs b/tests/ui/lint-unknown-lints-at-crate-level.rs
index 61d27f1ef..61d27f1ef 100644
--- a/src/test/ui/lint-unknown-lints-at-crate-level.rs
+++ b/tests/ui/lint-unknown-lints-at-crate-level.rs
diff --git a/src/test/ui/lint/auxiliary/add-impl.rs b/tests/ui/lint/auxiliary/add-impl.rs
index 9d0e3068a..9d0e3068a 100644
--- a/src/test/ui/lint/auxiliary/add-impl.rs
+++ b/tests/ui/lint/auxiliary/add-impl.rs
diff --git a/src/test/ui/lint/auxiliary/external_extern_fn.rs b/tests/ui/lint/auxiliary/external_extern_fn.rs
index c2a8cadc6..c2a8cadc6 100644
--- a/src/test/ui/lint/auxiliary/external_extern_fn.rs
+++ b/tests/ui/lint/auxiliary/external_extern_fn.rs
diff --git a/src/test/ui/lint/auxiliary/inherited_stability.rs b/tests/ui/lint/auxiliary/inherited_stability.rs
index 62100e5cc..62100e5cc 100644
--- a/src/test/ui/lint/auxiliary/inherited_stability.rs
+++ b/tests/ui/lint/auxiliary/inherited_stability.rs
diff --git a/src/test/ui/lint/auxiliary/lint_output_format.rs b/tests/ui/lint/auxiliary/lint_output_format.rs
index 4e3547250..4e3547250 100644
--- a/src/test/ui/lint/auxiliary/lint_output_format.rs
+++ b/tests/ui/lint/auxiliary/lint_output_format.rs
diff --git a/src/test/ui/lint/auxiliary/lint_stability.rs b/tests/ui/lint/auxiliary/lint_stability.rs
index 99c29dcdd..99c29dcdd 100644
--- a/src/test/ui/lint/auxiliary/lint_stability.rs
+++ b/tests/ui/lint/auxiliary/lint_stability.rs
diff --git a/src/test/ui/lint/auxiliary/lint_stability_fields.rs b/tests/ui/lint/auxiliary/lint_stability_fields.rs
index e72a501e1..e72a501e1 100644
--- a/src/test/ui/lint/auxiliary/lint_stability_fields.rs
+++ b/tests/ui/lint/auxiliary/lint_stability_fields.rs
diff --git a/src/test/ui/lint/auxiliary/lints-in-foreign-macros.rs b/tests/ui/lint/auxiliary/lints-in-foreign-macros.rs
index b969d9dba..b969d9dba 100644
--- a/src/test/ui/lint/auxiliary/lints-in-foreign-macros.rs
+++ b/tests/ui/lint/auxiliary/lints-in-foreign-macros.rs
diff --git a/src/test/ui/lint/auxiliary/stability-cfg2.rs b/tests/ui/lint/auxiliary/stability-cfg2.rs
index c995038e5..c995038e5 100644
--- a/src/test/ui/lint/auxiliary/stability-cfg2.rs
+++ b/tests/ui/lint/auxiliary/stability-cfg2.rs
diff --git a/src/test/ui/lint/auxiliary/stability_cfg1.rs b/tests/ui/lint/auxiliary/stability_cfg1.rs
index 2e027cc27..2e027cc27 100644
--- a/src/test/ui/lint/auxiliary/stability_cfg1.rs
+++ b/tests/ui/lint/auxiliary/stability_cfg1.rs
diff --git a/src/test/ui/lint/auxiliary/stability_cfg2.rs b/tests/ui/lint/auxiliary/stability_cfg2.rs
index c995038e5..c995038e5 100644
--- a/src/test/ui/lint/auxiliary/stability_cfg2.rs
+++ b/tests/ui/lint/auxiliary/stability_cfg2.rs
diff --git a/src/test/ui/lint/auxiliary/trivial-cast-ice.rs b/tests/ui/lint/auxiliary/trivial-cast-ice.rs
index ab2332d06..ab2332d06 100644
--- a/src/test/ui/lint/auxiliary/trivial-cast-ice.rs
+++ b/tests/ui/lint/auxiliary/trivial-cast-ice.rs
diff --git a/src/test/ui/lint/auxiliary/unaligned_references_external_crate.rs b/tests/ui/lint/auxiliary/unaligned_references_external_crate.rs
index fb486c6b5..fb486c6b5 100644
--- a/src/test/ui/lint/auxiliary/unaligned_references_external_crate.rs
+++ b/tests/ui/lint/auxiliary/unaligned_references_external_crate.rs
diff --git a/src/test/ui/lint/bad-lint-cap.rs b/tests/ui/lint/bad-lint-cap.rs
index e65c8319d..e65c8319d 100644
--- a/src/test/ui/lint/bad-lint-cap.rs
+++ b/tests/ui/lint/bad-lint-cap.rs
diff --git a/src/test/ui/lint/bad-lint-cap.stderr b/tests/ui/lint/bad-lint-cap.stderr
index f284dbf84..f284dbf84 100644
--- a/src/test/ui/lint/bad-lint-cap.stderr
+++ b/tests/ui/lint/bad-lint-cap.stderr
diff --git a/src/test/ui/lint/bad-lint-cap2.rs b/tests/ui/lint/bad-lint-cap2.rs
index 8bc8aca20..8bc8aca20 100644
--- a/src/test/ui/lint/bad-lint-cap2.rs
+++ b/tests/ui/lint/bad-lint-cap2.rs
diff --git a/src/test/ui/lint/bad-lint-cap2.stderr b/tests/ui/lint/bad-lint-cap2.stderr
index 3f3affe5a..3f3affe5a 100644
--- a/src/test/ui/lint/bad-lint-cap2.stderr
+++ b/tests/ui/lint/bad-lint-cap2.stderr
diff --git a/src/test/ui/lint/bad-lint-cap3.rs b/tests/ui/lint/bad-lint-cap3.rs
index c38105870..c38105870 100644
--- a/src/test/ui/lint/bad-lint-cap3.rs
+++ b/tests/ui/lint/bad-lint-cap3.rs
diff --git a/src/test/ui/lint/bad-lint-cap3.stderr b/tests/ui/lint/bad-lint-cap3.stderr
index 0fb65322f..0fb65322f 100644
--- a/src/test/ui/lint/bad-lint-cap3.stderr
+++ b/tests/ui/lint/bad-lint-cap3.stderr
diff --git a/src/test/ui/lint/bare-trait-objects-path.rs b/tests/ui/lint/bare-trait-objects-path.rs
index 0e2294715..0e2294715 100644
--- a/src/test/ui/lint/bare-trait-objects-path.rs
+++ b/tests/ui/lint/bare-trait-objects-path.rs
diff --git a/src/test/ui/lint/bare-trait-objects-path.stderr b/tests/ui/lint/bare-trait-objects-path.stderr
index 8ed303ca6..a19f4963c 100644
--- a/src/test/ui/lint/bare-trait-objects-path.stderr
+++ b/tests/ui/lint/bare-trait-objects-path.stderr
@@ -16,7 +16,7 @@ error[E0223]: ambiguous associated type
   --> $DIR/bare-trait-objects-path.rs:23:12
    |
 LL |     let _: Dyn::Ty;
-   |            ^^^^^^^ help: use fully-qualified syntax: `<dyn Dyn as Trait>::Ty`
+   |            ^^^^^^^ help: use the fully-qualified path: `<dyn Dyn as Assoc>::Ty`
 
 warning: trait objects without an explicit `dyn` are deprecated
   --> $DIR/bare-trait-objects-path.rs:14:5
diff --git a/src/test/ui/lint/clashing-extern-fn-recursion.rs b/tests/ui/lint/clashing-extern-fn-recursion.rs
index ab0fd0a2e..ab0fd0a2e 100644
--- a/src/test/ui/lint/clashing-extern-fn-recursion.rs
+++ b/tests/ui/lint/clashing-extern-fn-recursion.rs
diff --git a/src/test/ui/lint/clashing-extern-fn-wasm.rs b/tests/ui/lint/clashing-extern-fn-wasm.rs
index eeb2b8eae..eeb2b8eae 100644
--- a/src/test/ui/lint/clashing-extern-fn-wasm.rs
+++ b/tests/ui/lint/clashing-extern-fn-wasm.rs
diff --git a/src/test/ui/lint/clashing-extern-fn.rs b/tests/ui/lint/clashing-extern-fn.rs
index 809e06026..809e06026 100644
--- a/src/test/ui/lint/clashing-extern-fn.rs
+++ b/tests/ui/lint/clashing-extern-fn.rs
diff --git a/src/test/ui/lint/clashing-extern-fn.stderr b/tests/ui/lint/clashing-extern-fn.stderr
index 217eed6c9..217eed6c9 100644
--- a/src/test/ui/lint/clashing-extern-fn.stderr
+++ b/tests/ui/lint/clashing-extern-fn.stderr
diff --git a/src/test/ui/lint/cli-lint-override.forbid_warn.stderr b/tests/ui/lint/cli-lint-override.forbid_warn.stderr
index d1c66a81c..d1c66a81c 100644
--- a/src/test/ui/lint/cli-lint-override.forbid_warn.stderr
+++ b/tests/ui/lint/cli-lint-override.forbid_warn.stderr
diff --git a/src/test/ui/lint/cli-lint-override.force_warn_deny.stderr b/tests/ui/lint/cli-lint-override.force_warn_deny.stderr
index 779c24c93..779c24c93 100644
--- a/src/test/ui/lint/cli-lint-override.force_warn_deny.stderr
+++ b/tests/ui/lint/cli-lint-override.force_warn_deny.stderr
diff --git a/src/test/ui/lint/cli-lint-override.rs b/tests/ui/lint/cli-lint-override.rs
index a0e853fc3..a0e853fc3 100644
--- a/src/test/ui/lint/cli-lint-override.rs
+++ b/tests/ui/lint/cli-lint-override.rs
diff --git a/src/test/ui/lint/cli-lint-override.warn_deny.stderr b/tests/ui/lint/cli-lint-override.warn_deny.stderr
index f034cfa93..f034cfa93 100644
--- a/src/test/ui/lint/cli-lint-override.warn_deny.stderr
+++ b/tests/ui/lint/cli-lint-override.warn_deny.stderr
diff --git a/src/test/ui/lint/cli-unknown-force-warn.rs b/tests/ui/lint/cli-unknown-force-warn.rs
index f3dea87a6..f3dea87a6 100644
--- a/src/test/ui/lint/cli-unknown-force-warn.rs
+++ b/tests/ui/lint/cli-unknown-force-warn.rs
diff --git a/src/test/ui/lint/cli-unknown-force-warn.stderr b/tests/ui/lint/cli-unknown-force-warn.stderr
index 9ce9f405a..9ce9f405a 100644
--- a/src/test/ui/lint/cli-unknown-force-warn.stderr
+++ b/tests/ui/lint/cli-unknown-force-warn.stderr
diff --git a/src/test/ui/lint/command-line-lint-group-allow.rs b/tests/ui/lint/command-line-lint-group-allow.rs
index 21c0df028..21c0df028 100644
--- a/src/test/ui/lint/command-line-lint-group-allow.rs
+++ b/tests/ui/lint/command-line-lint-group-allow.rs
diff --git a/src/test/ui/lint/command-line-lint-group-deny.rs b/tests/ui/lint/command-line-lint-group-deny.rs
index da999f33e..da999f33e 100644
--- a/src/test/ui/lint/command-line-lint-group-deny.rs
+++ b/tests/ui/lint/command-line-lint-group-deny.rs
diff --git a/src/test/ui/lint/command-line-lint-group-deny.stderr b/tests/ui/lint/command-line-lint-group-deny.stderr
index 04c3f6f26..04c3f6f26 100644
--- a/src/test/ui/lint/command-line-lint-group-deny.stderr
+++ b/tests/ui/lint/command-line-lint-group-deny.stderr
diff --git a/src/test/ui/lint/command-line-lint-group-forbid.rs b/tests/ui/lint/command-line-lint-group-forbid.rs
index 4e5c2aca5..4e5c2aca5 100644
--- a/src/test/ui/lint/command-line-lint-group-forbid.rs
+++ b/tests/ui/lint/command-line-lint-group-forbid.rs
diff --git a/src/test/ui/lint/command-line-lint-group-forbid.stderr b/tests/ui/lint/command-line-lint-group-forbid.stderr
index 736782140..736782140 100644
--- a/src/test/ui/lint/command-line-lint-group-forbid.stderr
+++ b/tests/ui/lint/command-line-lint-group-forbid.stderr
diff --git a/src/test/ui/lint/command-line-lint-group-warn.rs b/tests/ui/lint/command-line-lint-group-warn.rs
index f4536f9c9..f4536f9c9 100644
--- a/src/test/ui/lint/command-line-lint-group-warn.rs
+++ b/tests/ui/lint/command-line-lint-group-warn.rs
diff --git a/src/test/ui/lint/command-line-lint-group-warn.stderr b/tests/ui/lint/command-line-lint-group-warn.stderr
index e9c80b4ef..e9c80b4ef 100644
--- a/src/test/ui/lint/command-line-lint-group-warn.stderr
+++ b/tests/ui/lint/command-line-lint-group-warn.stderr
diff --git a/src/test/ui/lint/command-line-register-lint-tool.rs b/tests/ui/lint/command-line-register-lint-tool.rs
index d6e95fd3e..d6e95fd3e 100644
--- a/src/test/ui/lint/command-line-register-lint-tool.rs
+++ b/tests/ui/lint/command-line-register-lint-tool.rs
diff --git a/src/test/ui/lint/command-line-register-unknown-lint-tool.rs b/tests/ui/lint/command-line-register-unknown-lint-tool.rs
index 59fc02000..59fc02000 100644
--- a/src/test/ui/lint/command-line-register-unknown-lint-tool.rs
+++ b/tests/ui/lint/command-line-register-unknown-lint-tool.rs
diff --git a/src/test/ui/lint/command-line-register-unknown-lint-tool.stderr b/tests/ui/lint/command-line-register-unknown-lint-tool.stderr
index c9a2aff21..c9a2aff21 100644
--- a/src/test/ui/lint/command-line-register-unknown-lint-tool.stderr
+++ b/tests/ui/lint/command-line-register-unknown-lint-tool.stderr
diff --git a/src/test/ui/lint/crate_level_only_lint.rs b/tests/ui/lint/crate_level_only_lint.rs
index d9673faa2..d9673faa2 100644
--- a/src/test/ui/lint/crate_level_only_lint.rs
+++ b/tests/ui/lint/crate_level_only_lint.rs
diff --git a/src/test/ui/lint/crate_level_only_lint.stderr b/tests/ui/lint/crate_level_only_lint.stderr
index 8fb06df2a..8fb06df2a 100644
--- a/src/test/ui/lint/crate_level_only_lint.stderr
+++ b/tests/ui/lint/crate_level_only_lint.stderr
diff --git a/src/test/ui/lint/dead-code/alias-in-pat.rs b/tests/ui/lint/dead-code/alias-in-pat.rs
index 69d455f3b..69d455f3b 100644
--- a/src/test/ui/lint/dead-code/alias-in-pat.rs
+++ b/tests/ui/lint/dead-code/alias-in-pat.rs
diff --git a/src/test/ui/lint/dead-code/anon-const-in-pat.rs b/tests/ui/lint/dead-code/anon-const-in-pat.rs
index d3e39c0de..d3e39c0de 100644
--- a/src/test/ui/lint/dead-code/anon-const-in-pat.rs
+++ b/tests/ui/lint/dead-code/anon-const-in-pat.rs
diff --git a/src/test/ui/lint/dead-code/associated-type.rs b/tests/ui/lint/dead-code/associated-type.rs
index 1cf66e75a..1cf66e75a 100644
--- a/src/test/ui/lint/dead-code/associated-type.rs
+++ b/tests/ui/lint/dead-code/associated-type.rs
diff --git a/src/test/ui/lint/dead-code/basic.rs b/tests/ui/lint/dead-code/basic.rs
index 3b8ffd58c..3b8ffd58c 100644
--- a/src/test/ui/lint/dead-code/basic.rs
+++ b/tests/ui/lint/dead-code/basic.rs
diff --git a/src/test/ui/lint/dead-code/basic.stderr b/tests/ui/lint/dead-code/basic.stderr
index 7d068cead..7d068cead 100644
--- a/src/test/ui/lint/dead-code/basic.stderr
+++ b/tests/ui/lint/dead-code/basic.stderr
diff --git a/src/test/ui/lint/dead-code/closure-bang.rs b/tests/ui/lint/dead-code/closure-bang.rs
index 8e8636b11..8e8636b11 100644
--- a/src/test/ui/lint/dead-code/closure-bang.rs
+++ b/tests/ui/lint/dead-code/closure-bang.rs
diff --git a/src/test/ui/lint/dead-code/const-and-self.rs b/tests/ui/lint/dead-code/const-and-self.rs
index 5c96e4d0e..5c96e4d0e 100644
--- a/src/test/ui/lint/dead-code/const-and-self.rs
+++ b/tests/ui/lint/dead-code/const-and-self.rs
diff --git a/src/test/ui/lint/dead-code/const-and-self.stderr b/tests/ui/lint/dead-code/const-and-self.stderr
index 9d1d7d6ec..9d1d7d6ec 100644
--- a/src/test/ui/lint/dead-code/const-and-self.stderr
+++ b/tests/ui/lint/dead-code/const-and-self.stderr
diff --git a/src/test/ui/lint/dead-code/empty-unused-enum.rs b/tests/ui/lint/dead-code/empty-unused-enum.rs
index 864501e94..864501e94 100644
--- a/src/test/ui/lint/dead-code/empty-unused-enum.rs
+++ b/tests/ui/lint/dead-code/empty-unused-enum.rs
diff --git a/src/test/ui/lint/dead-code/empty-unused-enum.stderr b/tests/ui/lint/dead-code/empty-unused-enum.stderr
index 6391f0941..6391f0941 100644
--- a/src/test/ui/lint/dead-code/empty-unused-enum.stderr
+++ b/tests/ui/lint/dead-code/empty-unused-enum.stderr
diff --git a/src/test/ui/lint/dead-code/empty-unused-public-enum.rs b/tests/ui/lint/dead-code/empty-unused-public-enum.rs
index 15b04496b..15b04496b 100644
--- a/src/test/ui/lint/dead-code/empty-unused-public-enum.rs
+++ b/tests/ui/lint/dead-code/empty-unused-public-enum.rs
diff --git a/src/test/ui/lint/dead-code/enum-variants.rs b/tests/ui/lint/dead-code/enum-variants.rs
index 91c97232e..91c97232e 100644
--- a/src/test/ui/lint/dead-code/enum-variants.rs
+++ b/tests/ui/lint/dead-code/enum-variants.rs
diff --git a/src/test/ui/lint/dead-code/impl-trait.rs b/tests/ui/lint/dead-code/impl-trait.rs
index 757b8f83e..757b8f83e 100644
--- a/src/test/ui/lint/dead-code/impl-trait.rs
+++ b/tests/ui/lint/dead-code/impl-trait.rs
diff --git a/src/test/ui/lint/dead-code/impl-trait.stderr b/tests/ui/lint/dead-code/impl-trait.stderr
index e35e13a9e..e35e13a9e 100644
--- a/src/test/ui/lint/dead-code/impl-trait.stderr
+++ b/tests/ui/lint/dead-code/impl-trait.stderr
diff --git a/src/test/ui/lint/dead-code/issue-68408-false-positive.rs b/tests/ui/lint/dead-code/issue-68408-false-positive.rs
index 7ee6b5d72..7ee6b5d72 100644
--- a/src/test/ui/lint/dead-code/issue-68408-false-positive.rs
+++ b/tests/ui/lint/dead-code/issue-68408-false-positive.rs
diff --git a/src/test/ui/lint/dead-code/issue-85071-2.rs b/tests/ui/lint/dead-code/issue-85071-2.rs
index f0639931c..f0639931c 100644
--- a/src/test/ui/lint/dead-code/issue-85071-2.rs
+++ b/tests/ui/lint/dead-code/issue-85071-2.rs
diff --git a/src/test/ui/lint/dead-code/issue-85071-2.stderr b/tests/ui/lint/dead-code/issue-85071-2.stderr
index 5e963183d..5e963183d 100644
--- a/src/test/ui/lint/dead-code/issue-85071-2.stderr
+++ b/tests/ui/lint/dead-code/issue-85071-2.stderr
diff --git a/src/test/ui/lint/dead-code/issue-85071.rs b/tests/ui/lint/dead-code/issue-85071.rs
index d6969321c..d6969321c 100644
--- a/src/test/ui/lint/dead-code/issue-85071.rs
+++ b/tests/ui/lint/dead-code/issue-85071.rs
diff --git a/src/test/ui/lint/dead-code/issue-85071.stderr b/tests/ui/lint/dead-code/issue-85071.stderr
index 721fb8148..721fb8148 100644
--- a/src/test/ui/lint/dead-code/issue-85071.stderr
+++ b/tests/ui/lint/dead-code/issue-85071.stderr
diff --git a/src/test/ui/lint/dead-code/issue-85255.rs b/tests/ui/lint/dead-code/issue-85255.rs
index 043f68137..043f68137 100644
--- a/src/test/ui/lint/dead-code/issue-85255.rs
+++ b/tests/ui/lint/dead-code/issue-85255.rs
diff --git a/src/test/ui/lint/dead-code/issue-85255.stderr b/tests/ui/lint/dead-code/issue-85255.stderr
index 3497b952f..3497b952f 100644
--- a/src/test/ui/lint/dead-code/issue-85255.stderr
+++ b/tests/ui/lint/dead-code/issue-85255.stderr
diff --git a/src/test/ui/lint/dead-code/leading-underscore.rs b/tests/ui/lint/dead-code/leading-underscore.rs
index d3582961b..d3582961b 100644
--- a/src/test/ui/lint/dead-code/leading-underscore.rs
+++ b/tests/ui/lint/dead-code/leading-underscore.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-1.rs b/tests/ui/lint/dead-code/lint-dead-code-1.rs
index 8f5a4c41e..8f5a4c41e 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-1.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-1.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-1.stderr b/tests/ui/lint/dead-code/lint-dead-code-1.stderr
index eb728b5b9..eb728b5b9 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-1.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-1.stderr
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-2.rs b/tests/ui/lint/dead-code/lint-dead-code-2.rs
index 6bfa4d96f..6bfa4d96f 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-2.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-2.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-2.stderr b/tests/ui/lint/dead-code/lint-dead-code-2.stderr
index 85af553c9..85af553c9 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-2.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-2.stderr
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-3.rs b/tests/ui/lint/dead-code/lint-dead-code-3.rs
index 293fcdbc5..293fcdbc5 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-3.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-3.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-3.stderr b/tests/ui/lint/dead-code/lint-dead-code-3.stderr
index 26fc13bae..26fc13bae 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-3.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-3.stderr
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-4.rs b/tests/ui/lint/dead-code/lint-dead-code-4.rs
index 0fc6c6156..0fc6c6156 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-4.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-4.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-4.stderr b/tests/ui/lint/dead-code/lint-dead-code-4.stderr
index 668c1dacf..668c1dacf 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-4.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-4.stderr
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-5.rs b/tests/ui/lint/dead-code/lint-dead-code-5.rs
index ed90fb464..ed90fb464 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-5.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-5.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-5.stderr b/tests/ui/lint/dead-code/lint-dead-code-5.stderr
index eaf43e453..eaf43e453 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-5.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-5.stderr
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-6.rs b/tests/ui/lint/dead-code/lint-dead-code-6.rs
index e3074acf1..e3074acf1 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-6.rs
+++ b/tests/ui/lint/dead-code/lint-dead-code-6.rs
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-6.stderr b/tests/ui/lint/dead-code/lint-dead-code-6.stderr
index f9d83308a..f9d83308a 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-6.stderr
+++ b/tests/ui/lint/dead-code/lint-dead-code-6.stderr
diff --git a/src/test/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.rs b/tests/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.rs
index 2003e1e29..2003e1e29 100644
--- a/src/test/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.rs
+++ b/tests/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.rs
diff --git a/src/test/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.stderr b/tests/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.stderr
index 0e5c78a71..0e5c78a71 100644
--- a/src/test/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.stderr
+++ b/tests/ui/lint/dead-code/multiple-dead-codes-in-the-same-struct.stderr
diff --git a/src/test/ui/lint/dead-code/newline-span.rs b/tests/ui/lint/dead-code/newline-span.rs
index 209c3cd93..209c3cd93 100644
--- a/src/test/ui/lint/dead-code/newline-span.rs
+++ b/tests/ui/lint/dead-code/newline-span.rs
diff --git a/src/test/ui/lint/dead-code/newline-span.stderr b/tests/ui/lint/dead-code/newline-span.stderr
index 4eeadccc8..4eeadccc8 100644
--- a/src/test/ui/lint/dead-code/newline-span.stderr
+++ b/tests/ui/lint/dead-code/newline-span.stderr
diff --git a/src/test/ui/lint/dead-code/self-assign.rs b/tests/ui/lint/dead-code/self-assign.rs
index ea7ce98d8..ea7ce98d8 100644
--- a/src/test/ui/lint/dead-code/self-assign.rs
+++ b/tests/ui/lint/dead-code/self-assign.rs
diff --git a/src/test/ui/lint/dead-code/self-assign.stderr b/tests/ui/lint/dead-code/self-assign.stderr
index bb79c0ec7..bb79c0ec7 100644
--- a/src/test/ui/lint/dead-code/self-assign.stderr
+++ b/tests/ui/lint/dead-code/self-assign.stderr
diff --git a/src/test/ui/lint/dead-code/trait-impl.rs b/tests/ui/lint/dead-code/trait-impl.rs
index 92e389a93..92e389a93 100644
--- a/src/test/ui/lint/dead-code/trait-impl.rs
+++ b/tests/ui/lint/dead-code/trait-impl.rs
diff --git a/src/test/ui/lint/dead-code/tuple-struct-field.rs b/tests/ui/lint/dead-code/tuple-struct-field.rs
index 14fb30be9..14fb30be9 100644
--- a/src/test/ui/lint/dead-code/tuple-struct-field.rs
+++ b/tests/ui/lint/dead-code/tuple-struct-field.rs
diff --git a/src/test/ui/lint/dead-code/tuple-struct-field.stderr b/tests/ui/lint/dead-code/tuple-struct-field.stderr
index b8ad5cbe4..b8ad5cbe4 100644
--- a/src/test/ui/lint/dead-code/tuple-struct-field.stderr
+++ b/tests/ui/lint/dead-code/tuple-struct-field.stderr
diff --git a/src/test/ui/lint/dead-code/type-alias.rs b/tests/ui/lint/dead-code/type-alias.rs
index 35a7f125d..35a7f125d 100644
--- a/src/test/ui/lint/dead-code/type-alias.rs
+++ b/tests/ui/lint/dead-code/type-alias.rs
diff --git a/src/test/ui/lint/dead-code/type-alias.stderr b/tests/ui/lint/dead-code/type-alias.stderr
index 446447d97..446447d97 100644
--- a/src/test/ui/lint/dead-code/type-alias.stderr
+++ b/tests/ui/lint/dead-code/type-alias.stderr
diff --git a/src/test/ui/lint/dead-code/type-in-foreign.rs b/tests/ui/lint/dead-code/type-in-foreign.rs
index b6c593f31..b6c593f31 100644
--- a/src/test/ui/lint/dead-code/type-in-foreign.rs
+++ b/tests/ui/lint/dead-code/type-in-foreign.rs
diff --git a/src/test/ui/lint/dead-code/unused-enum.rs b/tests/ui/lint/dead-code/unused-enum.rs
index 20df3e1de..20df3e1de 100644
--- a/src/test/ui/lint/dead-code/unused-enum.rs
+++ b/tests/ui/lint/dead-code/unused-enum.rs
diff --git a/src/test/ui/lint/dead-code/unused-enum.stderr b/tests/ui/lint/dead-code/unused-enum.stderr
index d2602dbb3..d2602dbb3 100644
--- a/src/test/ui/lint/dead-code/unused-enum.stderr
+++ b/tests/ui/lint/dead-code/unused-enum.stderr
diff --git a/src/test/ui/lint/dead-code/unused-struct-variant.rs b/tests/ui/lint/dead-code/unused-struct-variant.rs
index a914e0c33..a914e0c33 100644
--- a/src/test/ui/lint/dead-code/unused-struct-variant.rs
+++ b/tests/ui/lint/dead-code/unused-struct-variant.rs
diff --git a/src/test/ui/lint/dead-code/unused-struct-variant.stderr b/tests/ui/lint/dead-code/unused-struct-variant.stderr
index d26dd3aff..d26dd3aff 100644
--- a/src/test/ui/lint/dead-code/unused-struct-variant.stderr
+++ b/tests/ui/lint/dead-code/unused-struct-variant.stderr
diff --git a/src/test/ui/lint/dead-code/unused-variant-pub.rs b/tests/ui/lint/dead-code/unused-variant-pub.rs
index 3a9061340..3a9061340 100644
--- a/src/test/ui/lint/dead-code/unused-variant-pub.rs
+++ b/tests/ui/lint/dead-code/unused-variant-pub.rs
diff --git a/src/test/ui/lint/dead-code/unused-variant.rs b/tests/ui/lint/dead-code/unused-variant.rs
index 82108fa9c..82108fa9c 100644
--- a/src/test/ui/lint/dead-code/unused-variant.rs
+++ b/tests/ui/lint/dead-code/unused-variant.rs
diff --git a/src/test/ui/lint/dead-code/unused-variant.stderr b/tests/ui/lint/dead-code/unused-variant.stderr
index 6029bf268..6029bf268 100644
--- a/src/test/ui/lint/dead-code/unused-variant.stderr
+++ b/tests/ui/lint/dead-code/unused-variant.stderr
diff --git a/src/test/ui/lint/dead-code/with-core-crate.rs b/tests/ui/lint/dead-code/with-core-crate.rs
index 0a94b528f..0a94b528f 100644
--- a/src/test/ui/lint/dead-code/with-core-crate.rs
+++ b/tests/ui/lint/dead-code/with-core-crate.rs
diff --git a/src/test/ui/lint/dead-code/with-core-crate.stderr b/tests/ui/lint/dead-code/with-core-crate.stderr
index 7adcf8848..7adcf8848 100644
--- a/src/test/ui/lint/dead-code/with-core-crate.stderr
+++ b/tests/ui/lint/dead-code/with-core-crate.stderr
diff --git a/src/test/ui/lint/dead-code/with-impl.rs b/tests/ui/lint/dead-code/with-impl.rs
index 812fcdd09..812fcdd09 100644
--- a/src/test/ui/lint/dead-code/with-impl.rs
+++ b/tests/ui/lint/dead-code/with-impl.rs
diff --git a/src/test/ui/lint/deny-overflowing-literals.rs b/tests/ui/lint/deny-overflowing-literals.rs
index 21c8ba7d6..21c8ba7d6 100644
--- a/src/test/ui/lint/deny-overflowing-literals.rs
+++ b/tests/ui/lint/deny-overflowing-literals.rs
diff --git a/src/test/ui/lint/deny-overflowing-literals.stderr b/tests/ui/lint/deny-overflowing-literals.stderr
index beb0ad795..beb0ad795 100644
--- a/src/test/ui/lint/deny-overflowing-literals.stderr
+++ b/tests/ui/lint/deny-overflowing-literals.stderr
diff --git a/src/test/ui/lint/empty-lint-attributes.rs b/tests/ui/lint/empty-lint-attributes.rs
index 9a0ec2533..9a0ec2533 100644
--- a/src/test/ui/lint/empty-lint-attributes.rs
+++ b/tests/ui/lint/empty-lint-attributes.rs
diff --git a/src/test/ui/lint/enable-unstable-lib-feature.rs b/tests/ui/lint/enable-unstable-lib-feature.rs
index aa6a973d7..aa6a973d7 100644
--- a/src/test/ui/lint/enable-unstable-lib-feature.rs
+++ b/tests/ui/lint/enable-unstable-lib-feature.rs
diff --git a/src/test/ui/lint/enable-unstable-lib-feature.stderr b/tests/ui/lint/enable-unstable-lib-feature.stderr
index bb4e928ad..bb4e928ad 100644
--- a/src/test/ui/lint/enable-unstable-lib-feature.stderr
+++ b/tests/ui/lint/enable-unstable-lib-feature.stderr
diff --git a/src/test/ui/lint/expansion-time-include.rs b/tests/ui/lint/expansion-time-include.rs
index 4ea89d5ad..4ea89d5ad 100644
--- a/src/test/ui/lint/expansion-time-include.rs
+++ b/tests/ui/lint/expansion-time-include.rs
diff --git a/src/test/ui/lint/expansion-time.rs b/tests/ui/lint/expansion-time.rs
index f23c7cb0d..f23c7cb0d 100644
--- a/src/test/ui/lint/expansion-time.rs
+++ b/tests/ui/lint/expansion-time.rs
diff --git a/src/test/ui/lint/expansion-time.stderr b/tests/ui/lint/expansion-time.stderr
index 064ee5fad..064ee5fad 100644
--- a/src/test/ui/lint/expansion-time.stderr
+++ b/tests/ui/lint/expansion-time.stderr
diff --git a/src/test/ui/lint/expr_attr_paren_order.rs b/tests/ui/lint/expr_attr_paren_order.rs
index e1ec2e951..e1ec2e951 100644
--- a/src/test/ui/lint/expr_attr_paren_order.rs
+++ b/tests/ui/lint/expr_attr_paren_order.rs
diff --git a/src/test/ui/lint/expr_attr_paren_order.stderr b/tests/ui/lint/expr_attr_paren_order.stderr
index 42beed10c..42beed10c 100644
--- a/src/test/ui/lint/expr_attr_paren_order.stderr
+++ b/tests/ui/lint/expr_attr_paren_order.stderr
diff --git a/src/test/ui/lint/fn_must_use.rs b/tests/ui/lint/fn_must_use.rs
index b4e9da0fc..b4e9da0fc 100644
--- a/src/test/ui/lint/fn_must_use.rs
+++ b/tests/ui/lint/fn_must_use.rs
diff --git a/src/test/ui/lint/fn_must_use.stderr b/tests/ui/lint/fn_must_use.stderr
index 657f23c60..657f23c60 100644
--- a/src/test/ui/lint/fn_must_use.stderr
+++ b/tests/ui/lint/fn_must_use.stderr
diff --git a/src/test/ui/lint/for_loop_over_fallibles.rs b/tests/ui/lint/for_loop_over_fallibles.rs
index 43d71c2e8..43d71c2e8 100644
--- a/src/test/ui/lint/for_loop_over_fallibles.rs
+++ b/tests/ui/lint/for_loop_over_fallibles.rs
diff --git a/src/test/ui/lint/for_loop_over_fallibles.stderr b/tests/ui/lint/for_loop_over_fallibles.stderr
index 96efdf85c..96efdf85c 100644
--- a/src/test/ui/lint/for_loop_over_fallibles.stderr
+++ b/tests/ui/lint/for_loop_over_fallibles.stderr
diff --git a/src/test/ui/lint/forbid-error-capped.rs b/tests/ui/lint/forbid-error-capped.rs
index b56471a75..b56471a75 100644
--- a/src/test/ui/lint/forbid-error-capped.rs
+++ b/tests/ui/lint/forbid-error-capped.rs
diff --git a/src/test/ui/lint/forbid-group-group-1.rs b/tests/ui/lint/forbid-group-group-1.rs
index 80f7db4e5..80f7db4e5 100644
--- a/src/test/ui/lint/forbid-group-group-1.rs
+++ b/tests/ui/lint/forbid-group-group-1.rs
diff --git a/src/test/ui/lint/forbid-group-group-1.stderr b/tests/ui/lint/forbid-group-group-1.stderr
index fd425e5f7..fd425e5f7 100644
--- a/src/test/ui/lint/forbid-group-group-1.stderr
+++ b/tests/ui/lint/forbid-group-group-1.stderr
diff --git a/src/test/ui/lint/forbid-group-group-2.rs b/tests/ui/lint/forbid-group-group-2.rs
index b12fd72da..b12fd72da 100644
--- a/src/test/ui/lint/forbid-group-group-2.rs
+++ b/tests/ui/lint/forbid-group-group-2.rs
diff --git a/src/test/ui/lint/forbid-group-group-2.stderr b/tests/ui/lint/forbid-group-group-2.stderr
index b2e2bcea1..b2e2bcea1 100644
--- a/src/test/ui/lint/forbid-group-group-2.stderr
+++ b/tests/ui/lint/forbid-group-group-2.stderr
diff --git a/src/test/ui/lint/forbid-group-member.rs b/tests/ui/lint/forbid-group-member.rs
index 664edeaa8..664edeaa8 100644
--- a/src/test/ui/lint/forbid-group-member.rs
+++ b/tests/ui/lint/forbid-group-member.rs
diff --git a/src/test/ui/lint/forbid-group-member.stderr b/tests/ui/lint/forbid-group-member.stderr
index 47336d4d8..47336d4d8 100644
--- a/src/test/ui/lint/forbid-group-member.stderr
+++ b/tests/ui/lint/forbid-group-member.stderr
diff --git a/src/test/ui/lint/forbid-member-group.rs b/tests/ui/lint/forbid-member-group.rs
index e2f76825a..e2f76825a 100644
--- a/src/test/ui/lint/forbid-member-group.rs
+++ b/tests/ui/lint/forbid-member-group.rs
diff --git a/src/test/ui/lint/forbid-member-group.stderr b/tests/ui/lint/forbid-member-group.stderr
index e65301778..e65301778 100644
--- a/src/test/ui/lint/forbid-member-group.stderr
+++ b/tests/ui/lint/forbid-member-group.stderr
diff --git a/src/test/ui/lint/force-warn/allow-warnings.rs b/tests/ui/lint/force-warn/allow-warnings.rs
index 0199381fc..0199381fc 100644
--- a/src/test/ui/lint/force-warn/allow-warnings.rs
+++ b/tests/ui/lint/force-warn/allow-warnings.rs
diff --git a/src/test/ui/lint/force-warn/allow-warnings.stderr b/tests/ui/lint/force-warn/allow-warnings.stderr
index 4de68a079..4de68a079 100644
--- a/src/test/ui/lint/force-warn/allow-warnings.stderr
+++ b/tests/ui/lint/force-warn/allow-warnings.stderr
diff --git a/src/test/ui/lint/force-warn/allowed-by-default-lint.rs b/tests/ui/lint/force-warn/allowed-by-default-lint.rs
index b24ab822d..b24ab822d 100644
--- a/src/test/ui/lint/force-warn/allowed-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/allowed-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/allowed-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-by-default-lint.stderr
index ac98b5896..ac98b5896 100644
--- a/src/test/ui/lint/force-warn/allowed-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/allowed-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/allowed-cli-deny-by-default-lint.rs b/tests/ui/lint/force-warn/allowed-cli-deny-by-default-lint.rs
index 257df13ef..257df13ef 100644
--- a/src/test/ui/lint/force-warn/allowed-cli-deny-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/allowed-cli-deny-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/allowed-cli-deny-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-cli-deny-by-default-lint.stderr
index 6a1fc76e1..6a1fc76e1 100644
--- a/src/test/ui/lint/force-warn/allowed-cli-deny-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/allowed-cli-deny-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/allowed-deny-by-default-lint.rs b/tests/ui/lint/force-warn/allowed-deny-by-default-lint.rs
index 0d4b468c2..0d4b468c2 100644
--- a/src/test/ui/lint/force-warn/allowed-deny-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/allowed-deny-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/allowed-deny-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-deny-by-default-lint.stderr
index 9ef53d47e..9ef53d47e 100644
--- a/src/test/ui/lint/force-warn/allowed-deny-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/allowed-deny-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/allowed-group-warn-by-default-lint.rs b/tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.rs
index 631a8cb2f..631a8cb2f 100644
--- a/src/test/ui/lint/force-warn/allowed-group-warn-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr
index 0f58953a5..0f58953a5 100644
--- a/src/test/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/allowed-group-warn-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/allowed-warn-by-default-lint.rs b/tests/ui/lint/force-warn/allowed-warn-by-default-lint.rs
index 06b372867..06b372867 100644
--- a/src/test/ui/lint/force-warn/allowed-warn-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/allowed-warn-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/allowed-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/allowed-warn-by-default-lint.stderr
index a6634e212..a6634e212 100644
--- a/src/test/ui/lint/force-warn/allowed-warn-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/allowed-warn-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/cap-lints-allow.rs b/tests/ui/lint/force-warn/cap-lints-allow.rs
index fdba7f410..fdba7f410 100644
--- a/src/test/ui/lint/force-warn/cap-lints-allow.rs
+++ b/tests/ui/lint/force-warn/cap-lints-allow.rs
diff --git a/src/test/ui/lint/force-warn/cap-lints-allow.stderr b/tests/ui/lint/force-warn/cap-lints-allow.stderr
index 03a32fa6f..03a32fa6f 100644
--- a/src/test/ui/lint/force-warn/cap-lints-allow.stderr
+++ b/tests/ui/lint/force-warn/cap-lints-allow.stderr
diff --git a/src/test/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.rs b/tests/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.rs
index e65f156bf..e65f156bf 100644
--- a/src/test/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.stderr
index d1b764b34..d1b764b34 100644
--- a/src/test/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/deny-by-default-lint.rs b/tests/ui/lint/force-warn/deny-by-default-lint.rs
index c2e9377e9..c2e9377e9 100644
--- a/src/test/ui/lint/force-warn/deny-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/deny-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/deny-by-default-lint.stderr b/tests/ui/lint/force-warn/deny-by-default-lint.stderr
index c644d0fe7..c644d0fe7 100644
--- a/src/test/ui/lint/force-warn/deny-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/deny-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/lint-group-allow-warnings.rs b/tests/ui/lint/force-warn/lint-group-allow-warnings.rs
index 4b95f4d2d..4b95f4d2d 100644
--- a/src/test/ui/lint/force-warn/lint-group-allow-warnings.rs
+++ b/tests/ui/lint/force-warn/lint-group-allow-warnings.rs
diff --git a/src/test/ui/lint/force-warn/lint-group-allow-warnings.stderr b/tests/ui/lint/force-warn/lint-group-allow-warnings.stderr
index dc7b1b7b9..dc7b1b7b9 100644
--- a/src/test/ui/lint/force-warn/lint-group-allow-warnings.stderr
+++ b/tests/ui/lint/force-warn/lint-group-allow-warnings.stderr
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.rs b/tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.rs
index 7ad7462dd..7ad7462dd 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr
index e17630fd3..e17630fd3 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/lint-group-allowed-cli-warn-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-lint-group.rs b/tests/ui/lint/force-warn/lint-group-allowed-lint-group.rs
index ee5a18c38..ee5a18c38 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-lint-group.rs
+++ b/tests/ui/lint/force-warn/lint-group-allowed-lint-group.rs
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-lint-group.stderr b/tests/ui/lint/force-warn/lint-group-allowed-lint-group.stderr
index 72198541a..72198541a 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-lint-group.stderr
+++ b/tests/ui/lint/force-warn/lint-group-allowed-lint-group.stderr
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.rs b/tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.rs
index 248aece6f..248aece6f 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.rs
+++ b/tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.rs
diff --git a/src/test/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr b/tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr
index 52c870ac2..52c870ac2 100644
--- a/src/test/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr
+++ b/tests/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.stderr
diff --git a/src/test/ui/lint/force-warn/warn-by-default-lint-two-modules.rs b/tests/ui/lint/force-warn/warn-by-default-lint-two-modules.rs
index 47a480ad7..47a480ad7 100644
--- a/src/test/ui/lint/force-warn/warn-by-default-lint-two-modules.rs
+++ b/tests/ui/lint/force-warn/warn-by-default-lint-two-modules.rs
diff --git a/src/test/ui/lint/force-warn/warn-by-default-lint-two-modules.stderr b/tests/ui/lint/force-warn/warn-by-default-lint-two-modules.stderr
index 824bcccc0..824bcccc0 100644
--- a/src/test/ui/lint/force-warn/warn-by-default-lint-two-modules.stderr
+++ b/tests/ui/lint/force-warn/warn-by-default-lint-two-modules.stderr
diff --git a/src/test/ui/lint/force-warn/warnings-lint-group.rs b/tests/ui/lint/force-warn/warnings-lint-group.rs
index d1d4f5602..d1d4f5602 100644
--- a/src/test/ui/lint/force-warn/warnings-lint-group.rs
+++ b/tests/ui/lint/force-warn/warnings-lint-group.rs
diff --git a/src/test/ui/lint/force-warn/warnings-lint-group.stderr b/tests/ui/lint/force-warn/warnings-lint-group.stderr
index 1faeed337..1faeed337 100644
--- a/src/test/ui/lint/force-warn/warnings-lint-group.stderr
+++ b/tests/ui/lint/force-warn/warnings-lint-group.stderr
diff --git a/src/test/ui/lint/function-item-references.rs b/tests/ui/lint/function-item-references.rs
index 05213f4ed..05213f4ed 100644
--- a/src/test/ui/lint/function-item-references.rs
+++ b/tests/ui/lint/function-item-references.rs
diff --git a/src/test/ui/lint/function-item-references.stderr b/tests/ui/lint/function-item-references.stderr
index a9d18bb6a..a9d18bb6a 100644
--- a/src/test/ui/lint/function-item-references.stderr
+++ b/tests/ui/lint/function-item-references.stderr
diff --git a/src/test/ui/lint/future-incompat-test.rs b/tests/ui/lint/future-incompat-test.rs
index c5f477cc4..c5f477cc4 100644
--- a/src/test/ui/lint/future-incompat-test.rs
+++ b/tests/ui/lint/future-incompat-test.rs
diff --git a/src/test/ui/lint/future-incompat-test.stderr b/tests/ui/lint/future-incompat-test.stderr
index 52674a843..52674a843 100644
--- a/src/test/ui/lint/future-incompat-test.stderr
+++ b/tests/ui/lint/future-incompat-test.stderr
diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.fixed b/tests/ui/lint/inclusive-range-pattern-syntax.fixed
index bee5d4ae4..bee5d4ae4 100644
--- a/src/test/ui/lint/inclusive-range-pattern-syntax.fixed
+++ b/tests/ui/lint/inclusive-range-pattern-syntax.fixed
diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.rs b/tests/ui/lint/inclusive-range-pattern-syntax.rs
index d98c10c26..d98c10c26 100644
--- a/src/test/ui/lint/inclusive-range-pattern-syntax.rs
+++ b/tests/ui/lint/inclusive-range-pattern-syntax.rs
diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.stderr b/tests/ui/lint/inclusive-range-pattern-syntax.stderr
index ed9fa0d41..ed9fa0d41 100644
--- a/src/test/ui/lint/inclusive-range-pattern-syntax.stderr
+++ b/tests/ui/lint/inclusive-range-pattern-syntax.stderr
diff --git a/src/test/ui/lint/inert-attr-macro.rs b/tests/ui/lint/inert-attr-macro.rs
index dc0bb8ac2..dc0bb8ac2 100644
--- a/src/test/ui/lint/inert-attr-macro.rs
+++ b/tests/ui/lint/inert-attr-macro.rs
diff --git a/src/test/ui/lint/inert-attr-macro.stderr b/tests/ui/lint/inert-attr-macro.stderr
index 5ccb4ffe7..5ccb4ffe7 100644
--- a/src/test/ui/lint/inert-attr-macro.stderr
+++ b/tests/ui/lint/inert-attr-macro.stderr
diff --git a/src/test/ui/lint/inline-trait-and-foreign-items.rs b/tests/ui/lint/inline-trait-and-foreign-items.rs
index 13dab7ed9..13dab7ed9 100644
--- a/src/test/ui/lint/inline-trait-and-foreign-items.rs
+++ b/tests/ui/lint/inline-trait-and-foreign-items.rs
diff --git a/src/test/ui/lint/inline-trait-and-foreign-items.stderr b/tests/ui/lint/inline-trait-and-foreign-items.stderr
index 2f1fb4c46..2f1fb4c46 100644
--- a/src/test/ui/lint/inline-trait-and-foreign-items.stderr
+++ b/tests/ui/lint/inline-trait-and-foreign-items.stderr
diff --git a/src/test/ui/lint/invalid_value.rs b/tests/ui/lint/invalid_value.rs
index 57d8cbe7c..57d8cbe7c 100644
--- a/src/test/ui/lint/invalid_value.rs
+++ b/tests/ui/lint/invalid_value.rs
diff --git a/src/test/ui/lint/invalid_value.stderr b/tests/ui/lint/invalid_value.stderr
index 5370660d6..48fd4169d 100644
--- a/src/test/ui/lint/invalid_value.stderr
+++ b/tests/ui/lint/invalid_value.stderr
@@ -604,9 +604,6 @@ LL |         let _val: Result<i32, i32> = mem::uninitialized();
    |
 note: enums with multiple inhabited variants have to be initialized to a variant
   --> $SRC_DIR/core/src/result.rs:LL:COL
-   |
-LL | pub enum Result<T, E> {
-   | ^^^^^^^^^^^^^^^^^^^^^
 
 error: the type `&i32` does not permit zero-initialization
   --> $DIR/invalid_value.rs:152:34
diff --git a/src/test/ui/lint/issue-101284.rs b/tests/ui/lint/issue-101284.rs
index 1381d4f17..1381d4f17 100644
--- a/src/test/ui/lint/issue-101284.rs
+++ b/tests/ui/lint/issue-101284.rs
diff --git a/src/test/ui/lint/issue-102705.rs b/tests/ui/lint/issue-102705.rs
index 5bcc8950a..5bcc8950a 100644
--- a/src/test/ui/lint/issue-102705.rs
+++ b/tests/ui/lint/issue-102705.rs
diff --git a/src/test/ui/lint/issue-103317.fixed b/tests/ui/lint/issue-103317.fixed
index 5a987423e..5a987423e 100644
--- a/src/test/ui/lint/issue-103317.fixed
+++ b/tests/ui/lint/issue-103317.fixed
diff --git a/src/test/ui/lint/issue-103317.rs b/tests/ui/lint/issue-103317.rs
index c2ba939e1..c2ba939e1 100644
--- a/src/test/ui/lint/issue-103317.rs
+++ b/tests/ui/lint/issue-103317.rs
diff --git a/src/test/ui/lint/issue-103317.stderr b/tests/ui/lint/issue-103317.stderr
index 9c982ddc3..9c982ddc3 100644
--- a/src/test/ui/lint/issue-103317.stderr
+++ b/tests/ui/lint/issue-103317.stderr
diff --git a/src/test/ui/lint/issue-103435-extra-parentheses.fixed b/tests/ui/lint/issue-103435-extra-parentheses.fixed
index 2b01b414b..2b01b414b 100644
--- a/src/test/ui/lint/issue-103435-extra-parentheses.fixed
+++ b/tests/ui/lint/issue-103435-extra-parentheses.fixed
diff --git a/src/test/ui/lint/issue-103435-extra-parentheses.rs b/tests/ui/lint/issue-103435-extra-parentheses.rs
index 8261610cf..8261610cf 100644
--- a/src/test/ui/lint/issue-103435-extra-parentheses.rs
+++ b/tests/ui/lint/issue-103435-extra-parentheses.rs
diff --git a/src/test/ui/lint/issue-103435-extra-parentheses.stderr b/tests/ui/lint/issue-103435-extra-parentheses.stderr
index 29c41c910..29c41c910 100644
--- a/src/test/ui/lint/issue-103435-extra-parentheses.stderr
+++ b/tests/ui/lint/issue-103435-extra-parentheses.stderr
diff --git a/src/test/ui/lint/issue-104392.rs b/tests/ui/lint/issue-104392.rs
index d5608edb4..d5608edb4 100644
--- a/src/test/ui/lint/issue-104392.rs
+++ b/tests/ui/lint/issue-104392.rs
diff --git a/src/test/ui/lint/issue-104392.stderr b/tests/ui/lint/issue-104392.stderr
index 8e466439a..8e466439a 100644
--- a/src/test/ui/lint/issue-104392.stderr
+++ b/tests/ui/lint/issue-104392.stderr
diff --git a/src/test/ui/lint/issue-104897.rs b/tests/ui/lint/issue-104897.rs
index 5fbc658f1..5fbc658f1 100644
--- a/src/test/ui/lint/issue-104897.rs
+++ b/tests/ui/lint/issue-104897.rs
diff --git a/src/test/ui/lint/issue-104897.stderr b/tests/ui/lint/issue-104897.stderr
index 817a93c2f..817a93c2f 100644
--- a/src/test/ui/lint/issue-104897.stderr
+++ b/tests/ui/lint/issue-104897.stderr
diff --git a/tests/ui/lint/issue-108155.rs b/tests/ui/lint/issue-108155.rs
new file mode 100644
index 000000000..4ae0cbd92
--- /dev/null
+++ b/tests/ui/lint/issue-108155.rs
@@ -0,0 +1,15 @@
+// check-pass
+// check that `deref_into_dyn_supertrait` doesn't cause ICE by eagerly converting
+// a cancelled lint
+
+#![allow(deref_into_dyn_supertrait)]
+
+trait Trait {}
+impl std::ops::Deref for dyn Trait + Send + Sync {
+    type Target = dyn Trait;
+    fn deref(&self) -> &Self::Target {
+        self
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/lint/issue-14309.rs b/tests/ui/lint/issue-14309.rs
index 328a4c982..328a4c982 100644
--- a/src/test/ui/lint/issue-14309.rs
+++ b/tests/ui/lint/issue-14309.rs
diff --git a/src/test/ui/lint/issue-14309.stderr b/tests/ui/lint/issue-14309.stderr
index 9ce62a6b8..9ce62a6b8 100644
--- a/src/test/ui/lint/issue-14309.stderr
+++ b/tests/ui/lint/issue-14309.stderr
diff --git a/src/test/ui/lint/issue-14837.rs b/tests/ui/lint/issue-14837.rs
index a83bc4150..a83bc4150 100644
--- a/src/test/ui/lint/issue-14837.rs
+++ b/tests/ui/lint/issue-14837.rs
diff --git a/src/test/ui/lint/issue-17718-const-naming.rs b/tests/ui/lint/issue-17718-const-naming.rs
index d7f0e7276..d7f0e7276 100644
--- a/src/test/ui/lint/issue-17718-const-naming.rs
+++ b/tests/ui/lint/issue-17718-const-naming.rs
diff --git a/src/test/ui/lint/issue-17718-const-naming.stderr b/tests/ui/lint/issue-17718-const-naming.stderr
index 7d2aadd5f..7d2aadd5f 100644
--- a/src/test/ui/lint/issue-17718-const-naming.stderr
+++ b/tests/ui/lint/issue-17718-const-naming.stderr
diff --git a/src/test/ui/lint/issue-1866.rs b/tests/ui/lint/issue-1866.rs
index caac0c504..caac0c504 100644
--- a/src/test/ui/lint/issue-1866.rs
+++ b/tests/ui/lint/issue-1866.rs
diff --git a/src/test/ui/lint/issue-1866.stderr b/tests/ui/lint/issue-1866.stderr
index d19a13496..d19a13496 100644
--- a/src/test/ui/lint/issue-1866.stderr
+++ b/tests/ui/lint/issue-1866.stderr
diff --git a/src/test/ui/lint/issue-20343.rs b/tests/ui/lint/issue-20343.rs
index 000b63984..000b63984 100644
--- a/src/test/ui/lint/issue-20343.rs
+++ b/tests/ui/lint/issue-20343.rs
diff --git a/src/test/ui/lint/issue-30302.rs b/tests/ui/lint/issue-30302.rs
index c37d4f29d..5eccb8cd5 100644
--- a/src/test/ui/lint/issue-30302.rs
+++ b/tests/ui/lint/issue-30302.rs
@@ -11,7 +11,7 @@ enum Stack<T> {
 fn is_empty<T>(s: Stack<T>) -> bool {
     match s {
         Nil => true,
-//~^ WARN pattern binding `Nil` is named the same as one of the variants of the type `Stack`
+//~^ ERROR pattern binding `Nil` is named the same as one of the variants of the type `Stack`
         _ => false
 //~^ ERROR unreachable pattern
     }
diff --git a/tests/ui/lint/issue-30302.stderr b/tests/ui/lint/issue-30302.stderr
new file mode 100644
index 000000000..baf6c0d7a
--- /dev/null
+++ b/tests/ui/lint/issue-30302.stderr
@@ -0,0 +1,26 @@
+error[E0170]: pattern binding `Nil` is named the same as one of the variants of the type `Stack`
+  --> $DIR/issue-30302.rs:13:9
+   |
+LL |         Nil => true,
+   |         ^^^ help: to match on the variant, qualify the path: `Stack::Nil`
+   |
+   = note: `#[deny(bindings_with_variant_name)]` on by default
+
+error: unreachable pattern
+  --> $DIR/issue-30302.rs:15:9
+   |
+LL |         Nil => true,
+   |         --- matches any value
+LL |
+LL |         _ => false
+   |         ^ unreachable pattern
+   |
+note: the lint level is defined here
+  --> $DIR/issue-30302.rs:4:9
+   |
+LL | #![deny(unreachable_patterns)]
+   |         ^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0170`.
diff --git a/src/test/ui/lint/issue-31924-non-snake-ffi.rs b/tests/ui/lint/issue-31924-non-snake-ffi.rs
index 5b9faca49..5b9faca49 100644
--- a/src/test/ui/lint/issue-31924-non-snake-ffi.rs
+++ b/tests/ui/lint/issue-31924-non-snake-ffi.rs
diff --git a/src/test/ui/lint/issue-34798.rs b/tests/ui/lint/issue-34798.rs
index f0d710123..f0d710123 100644
--- a/src/test/ui/lint/issue-34798.rs
+++ b/tests/ui/lint/issue-34798.rs
diff --git a/src/test/ui/lint/issue-35075.rs b/tests/ui/lint/issue-35075.rs
index 0e54131c2..0e54131c2 100644
--- a/src/test/ui/lint/issue-35075.rs
+++ b/tests/ui/lint/issue-35075.rs
diff --git a/src/test/ui/lint/issue-35075.stderr b/tests/ui/lint/issue-35075.stderr
index 08bdaa728..08bdaa728 100644
--- a/src/test/ui/lint/issue-35075.stderr
+++ b/tests/ui/lint/issue-35075.stderr
diff --git a/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs b/tests/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs
index 0a951cfa9..0a951cfa9 100644
--- a/src/test/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs
+++ b/tests/ui/lint/issue-47775-nested-macro-unnecessary-parens-arg.rs
diff --git a/src/test/ui/lint/issue-54099-camel-case-underscore-types.rs b/tests/ui/lint/issue-54099-camel-case-underscore-types.rs
index b2bf87358..b2bf87358 100644
--- a/src/test/ui/lint/issue-54099-camel-case-underscore-types.rs
+++ b/tests/ui/lint/issue-54099-camel-case-underscore-types.rs
diff --git a/src/test/ui/lint/issue-57410-1.rs b/tests/ui/lint/issue-57410-1.rs
index d825cb180..d825cb180 100644
--- a/src/test/ui/lint/issue-57410-1.rs
+++ b/tests/ui/lint/issue-57410-1.rs
diff --git a/src/test/ui/lint/issue-57410.rs b/tests/ui/lint/issue-57410.rs
index 0cf4b8068..0cf4b8068 100644
--- a/src/test/ui/lint/issue-57410.rs
+++ b/tests/ui/lint/issue-57410.rs
diff --git a/src/test/ui/lint/issue-63364.rs b/tests/ui/lint/issue-63364.rs
index 5223267a6..5223267a6 100644
--- a/src/test/ui/lint/issue-63364.rs
+++ b/tests/ui/lint/issue-63364.rs
diff --git a/src/test/ui/lint/issue-63364.stderr b/tests/ui/lint/issue-63364.stderr
index 9b5453fa8..9b5453fa8 100644
--- a/src/test/ui/lint/issue-63364.stderr
+++ b/tests/ui/lint/issue-63364.stderr
diff --git a/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.rs b/tests/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.rs
index c2b81959f..c2b81959f 100644
--- a/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.rs
+++ b/tests/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.rs
diff --git a/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr b/tests/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr
index 09dc3640f..09dc3640f 100644
--- a/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr
+++ b/tests/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr
diff --git a/src/test/ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs b/tests/ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs
index b4fc33174..b4fc33174 100644
--- a/src/test/ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs
+++ b/tests/ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs
diff --git a/src/test/ui/lint/issue-70819-dont-override-forbid-in-same-scope.stderr b/tests/ui/lint/issue-70819-dont-override-forbid-in-same-scope.stderr
index cc44f8aa5..cc44f8aa5 100644
--- a/src/test/ui/lint/issue-70819-dont-override-forbid-in-same-scope.stderr
+++ b/tests/ui/lint/issue-70819-dont-override-forbid-in-same-scope.stderr
diff --git a/src/test/ui/lint/issue-79546-fuel-ice.rs b/tests/ui/lint/issue-79546-fuel-ice.rs
index 0e9f54088..0e9f54088 100644
--- a/src/test/ui/lint/issue-79546-fuel-ice.rs
+++ b/tests/ui/lint/issue-79546-fuel-ice.rs
diff --git a/src/test/ui/lint/issue-79744.rs b/tests/ui/lint/issue-79744.rs
index e9725a027..e9725a027 100644
--- a/src/test/ui/lint/issue-79744.rs
+++ b/tests/ui/lint/issue-79744.rs
diff --git a/src/test/ui/lint/issue-79744.stderr b/tests/ui/lint/issue-79744.stderr
index c1b56250d..c1b56250d 100644
--- a/src/test/ui/lint/issue-79744.stderr
+++ b/tests/ui/lint/issue-79744.stderr
diff --git a/src/test/ui/lint/issue-80988.rs b/tests/ui/lint/issue-80988.rs
index 1e116206f..1e116206f 100644
--- a/src/test/ui/lint/issue-80988.rs
+++ b/tests/ui/lint/issue-80988.rs
diff --git a/src/test/ui/lint/issue-80988.stderr b/tests/ui/lint/issue-80988.stderr
index 73e27ffda..73e27ffda 100644
--- a/src/test/ui/lint/issue-80988.stderr
+++ b/tests/ui/lint/issue-80988.stderr
diff --git a/src/test/ui/lint/issue-81218.rs b/tests/ui/lint/issue-81218.rs
index f02aa9040..f02aa9040 100644
--- a/src/test/ui/lint/issue-81218.rs
+++ b/tests/ui/lint/issue-81218.rs
diff --git a/src/test/ui/lint/issue-83477.rs b/tests/ui/lint/issue-83477.rs
index 4262a2879..4262a2879 100644
--- a/src/test/ui/lint/issue-83477.rs
+++ b/tests/ui/lint/issue-83477.rs
diff --git a/src/test/ui/lint/issue-83477.stderr b/tests/ui/lint/issue-83477.stderr
index f824fc09e..f824fc09e 100644
--- a/src/test/ui/lint/issue-83477.stderr
+++ b/tests/ui/lint/issue-83477.stderr
diff --git a/src/test/ui/lint/issue-86600-lint-twice.rs b/tests/ui/lint/issue-86600-lint-twice.rs
index 0e8a837d9..0e8a837d9 100644
--- a/src/test/ui/lint/issue-86600-lint-twice.rs
+++ b/tests/ui/lint/issue-86600-lint-twice.rs
diff --git a/src/test/ui/lint/issue-86600-lint-twice.stderr b/tests/ui/lint/issue-86600-lint-twice.stderr
index 5a65c6121..5a65c6121 100644
--- a/src/test/ui/lint/issue-86600-lint-twice.stderr
+++ b/tests/ui/lint/issue-86600-lint-twice.stderr
diff --git a/src/test/ui/lint/issue-87274-paren-parent.rs b/tests/ui/lint/issue-87274-paren-parent.rs
index 0141c5a25..0141c5a25 100644
--- a/src/test/ui/lint/issue-87274-paren-parent.rs
+++ b/tests/ui/lint/issue-87274-paren-parent.rs
diff --git a/src/test/ui/lint/issue-87274-paren-parent.stderr b/tests/ui/lint/issue-87274-paren-parent.stderr
index f06024298..f06024298 100644
--- a/src/test/ui/lint/issue-87274-paren-parent.stderr
+++ b/tests/ui/lint/issue-87274-paren-parent.stderr
diff --git a/src/test/ui/lint/issue-89469.rs b/tests/ui/lint/issue-89469.rs
index 3a6ab4528..3a6ab4528 100644
--- a/src/test/ui/lint/issue-89469.rs
+++ b/tests/ui/lint/issue-89469.rs
diff --git a/src/test/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs b/tests/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
index 425e2703c..425e2703c 100644
--- a/src/test/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
+++ b/tests/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
diff --git a/src/test/ui/lint/issue-97094.rs b/tests/ui/lint/issue-97094.rs
index 22525ca11..22525ca11 100644
--- a/src/test/ui/lint/issue-97094.rs
+++ b/tests/ui/lint/issue-97094.rs
diff --git a/src/test/ui/lint/issue-97094.stderr b/tests/ui/lint/issue-97094.stderr
index 1a0a3eaf2..1a0a3eaf2 100644
--- a/src/test/ui/lint/issue-97094.stderr
+++ b/tests/ui/lint/issue-97094.stderr
diff --git a/src/test/ui/lint/issue-99387.rs b/tests/ui/lint/issue-99387.rs
index 616eb935e..616eb935e 100644
--- a/src/test/ui/lint/issue-99387.rs
+++ b/tests/ui/lint/issue-99387.rs
diff --git a/src/test/ui/lint/known-tool-in-submodule/root.rs b/tests/ui/lint/known-tool-in-submodule/root.rs
index 80806dcbd..80806dcbd 100644
--- a/src/test/ui/lint/known-tool-in-submodule/root.rs
+++ b/tests/ui/lint/known-tool-in-submodule/root.rs
diff --git a/src/test/ui/lint/known-tool-in-submodule/submodule.rs b/tests/ui/lint/known-tool-in-submodule/submodule.rs
index bb25e1005..bb25e1005 100644
--- a/src/test/ui/lint/known-tool-in-submodule/submodule.rs
+++ b/tests/ui/lint/known-tool-in-submodule/submodule.rs
diff --git a/src/test/ui/lint/let_underscore/let_underscore_drop.rs b/tests/ui/lint/let_underscore/let_underscore_drop.rs
index f298871f1..f298871f1 100644
--- a/src/test/ui/lint/let_underscore/let_underscore_drop.rs
+++ b/tests/ui/lint/let_underscore/let_underscore_drop.rs
diff --git a/src/test/ui/lint/let_underscore/let_underscore_drop.stderr b/tests/ui/lint/let_underscore/let_underscore_drop.stderr
index 7b7de202e..7b7de202e 100644
--- a/src/test/ui/lint/let_underscore/let_underscore_drop.stderr
+++ b/tests/ui/lint/let_underscore/let_underscore_drop.stderr
diff --git a/src/test/ui/lint/let_underscore/let_underscore_lock.rs b/tests/ui/lint/let_underscore/let_underscore_lock.rs
index 7423862cd..7423862cd 100644
--- a/src/test/ui/lint/let_underscore/let_underscore_lock.rs
+++ b/tests/ui/lint/let_underscore/let_underscore_lock.rs
diff --git a/src/test/ui/lint/let_underscore/let_underscore_lock.stderr b/tests/ui/lint/let_underscore/let_underscore_lock.stderr
index fb58af0a4..fb58af0a4 100644
--- a/src/test/ui/lint/let_underscore/let_underscore_lock.stderr
+++ b/tests/ui/lint/let_underscore/let_underscore_lock.stderr
diff --git a/src/test/ui/lint/lint-attr-everywhere-early.rs b/tests/ui/lint/lint-attr-everywhere-early.rs
index fd0c4b43e..fd0c4b43e 100644
--- a/src/test/ui/lint/lint-attr-everywhere-early.rs
+++ b/tests/ui/lint/lint-attr-everywhere-early.rs
diff --git a/src/test/ui/lint/lint-attr-everywhere-early.stderr b/tests/ui/lint/lint-attr-everywhere-early.stderr
index d6c6d5fae..d6c6d5fae 100644
--- a/src/test/ui/lint/lint-attr-everywhere-early.stderr
+++ b/tests/ui/lint/lint-attr-everywhere-early.stderr
diff --git a/src/test/ui/lint/lint-attr-everywhere-late.rs b/tests/ui/lint/lint-attr-everywhere-late.rs
index 1055157d6..1055157d6 100644
--- a/src/test/ui/lint/lint-attr-everywhere-late.rs
+++ b/tests/ui/lint/lint-attr-everywhere-late.rs
diff --git a/src/test/ui/lint/lint-attr-everywhere-late.stderr b/tests/ui/lint/lint-attr-everywhere-late.stderr
index a69c2e0ef..a69c2e0ef 100644
--- a/src/test/ui/lint/lint-attr-everywhere-late.stderr
+++ b/tests/ui/lint/lint-attr-everywhere-late.stderr
diff --git a/src/test/ui/lint/lint-attr-non-item-node.rs b/tests/ui/lint/lint-attr-non-item-node.rs
index 3f05e83a7..3f05e83a7 100644
--- a/src/test/ui/lint/lint-attr-non-item-node.rs
+++ b/tests/ui/lint/lint-attr-non-item-node.rs
diff --git a/src/test/ui/lint/lint-attr-non-item-node.stderr b/tests/ui/lint/lint-attr-non-item-node.stderr
index 583579140..583579140 100644
--- a/src/test/ui/lint/lint-attr-non-item-node.stderr
+++ b/tests/ui/lint/lint-attr-non-item-node.stderr
diff --git a/src/test/ui/lint/lint-cap.rs b/tests/ui/lint/lint-cap.rs
index 461b923cc..461b923cc 100644
--- a/src/test/ui/lint/lint-cap.rs
+++ b/tests/ui/lint/lint-cap.rs
diff --git a/src/test/ui/lint/lint-change-warnings.rs b/tests/ui/lint/lint-change-warnings.rs
index 37af3b761..37af3b761 100644
--- a/src/test/ui/lint/lint-change-warnings.rs
+++ b/tests/ui/lint/lint-change-warnings.rs
diff --git a/src/test/ui/lint/lint-change-warnings.stderr b/tests/ui/lint/lint-change-warnings.stderr
index 3fd5283aa..3fd5283aa 100644
--- a/src/test/ui/lint/lint-change-warnings.stderr
+++ b/tests/ui/lint/lint-change-warnings.stderr
diff --git a/src/test/ui/lint/lint-const-item-mutation.rs b/tests/ui/lint/lint-const-item-mutation.rs
index 4bf5e0a9e..4bf5e0a9e 100644
--- a/src/test/ui/lint/lint-const-item-mutation.rs
+++ b/tests/ui/lint/lint-const-item-mutation.rs
diff --git a/src/test/ui/lint/lint-const-item-mutation.stderr b/tests/ui/lint/lint-const-item-mutation.stderr
index 9f4360e67..747c38b80 100644
--- a/src/test/ui/lint/lint-const-item-mutation.stderr
+++ b/tests/ui/lint/lint-const-item-mutation.stderr
@@ -108,9 +108,6 @@ LL |     VEC.push(0);
    = note: the mutable reference will refer to this temporary, not the original `const` item
 note: mutable reference created due to call to this method
   --> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
-   |
-LL |     pub fn push(&mut self, value: T) {
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: `const` item defined here
   --> $DIR/lint-const-item-mutation.rs:31:1
    |
diff --git a/src/test/ui/lint/lint-ctypes-66202.rs b/tests/ui/lint/lint-ctypes-66202.rs
index ebab41d14..ebab41d14 100644
--- a/src/test/ui/lint/lint-ctypes-66202.rs
+++ b/tests/ui/lint/lint-ctypes-66202.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-1.rs b/tests/ui/lint/lint-ctypes-73249-1.rs
index cf416c3fe..cf416c3fe 100644
--- a/src/test/ui/lint/lint-ctypes-73249-1.rs
+++ b/tests/ui/lint/lint-ctypes-73249-1.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-2.rs b/tests/ui/lint/lint-ctypes-73249-2.rs
index 691047c8a..691047c8a 100644
--- a/src/test/ui/lint/lint-ctypes-73249-2.rs
+++ b/tests/ui/lint/lint-ctypes-73249-2.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-2.stderr b/tests/ui/lint/lint-ctypes-73249-2.stderr
index 8073c33dd..8073c33dd 100644
--- a/src/test/ui/lint/lint-ctypes-73249-2.stderr
+++ b/tests/ui/lint/lint-ctypes-73249-2.stderr
diff --git a/src/test/ui/lint/lint-ctypes-73249-3.rs b/tests/ui/lint/lint-ctypes-73249-3.rs
index ef8ab7e03..ef8ab7e03 100644
--- a/src/test/ui/lint/lint-ctypes-73249-3.rs
+++ b/tests/ui/lint/lint-ctypes-73249-3.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-3.stderr b/tests/ui/lint/lint-ctypes-73249-3.stderr
index c41ce666d..c41ce666d 100644
--- a/src/test/ui/lint/lint-ctypes-73249-3.stderr
+++ b/tests/ui/lint/lint-ctypes-73249-3.stderr
diff --git a/src/test/ui/lint/lint-ctypes-73249-4.rs b/tests/ui/lint/lint-ctypes-73249-4.rs
index 6c72bd691..6c72bd691 100644
--- a/src/test/ui/lint/lint-ctypes-73249-4.rs
+++ b/tests/ui/lint/lint-ctypes-73249-4.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-5.rs b/tests/ui/lint/lint-ctypes-73249-5.rs
index 083fb6c5f..083fb6c5f 100644
--- a/src/test/ui/lint/lint-ctypes-73249-5.rs
+++ b/tests/ui/lint/lint-ctypes-73249-5.rs
diff --git a/src/test/ui/lint/lint-ctypes-73249-5.stderr b/tests/ui/lint/lint-ctypes-73249-5.stderr
index 98245c4f1..98245c4f1 100644
--- a/src/test/ui/lint/lint-ctypes-73249-5.stderr
+++ b/tests/ui/lint/lint-ctypes-73249-5.stderr
diff --git a/src/test/ui/lint/lint-ctypes-73249.rs b/tests/ui/lint/lint-ctypes-73249.rs
index 5b48fa9b7..5b48fa9b7 100644
--- a/src/test/ui/lint/lint-ctypes-73249.rs
+++ b/tests/ui/lint/lint-ctypes-73249.rs
diff --git a/src/test/ui/lint/lint-ctypes-73251-1.rs b/tests/ui/lint/lint-ctypes-73251-1.rs
index 145ba784f..145ba784f 100644
--- a/src/test/ui/lint/lint-ctypes-73251-1.rs
+++ b/tests/ui/lint/lint-ctypes-73251-1.rs
diff --git a/src/test/ui/lint/lint-ctypes-73251-1.stderr b/tests/ui/lint/lint-ctypes-73251-1.stderr
index 9f43576ad..9f43576ad 100644
--- a/src/test/ui/lint/lint-ctypes-73251-1.stderr
+++ b/tests/ui/lint/lint-ctypes-73251-1.stderr
diff --git a/src/test/ui/lint/lint-ctypes-73251-2.rs b/tests/ui/lint/lint-ctypes-73251-2.rs
index df71a9457..df71a9457 100644
--- a/src/test/ui/lint/lint-ctypes-73251-2.rs
+++ b/tests/ui/lint/lint-ctypes-73251-2.rs
diff --git a/src/test/ui/lint/lint-ctypes-73251-2.stderr b/tests/ui/lint/lint-ctypes-73251-2.stderr
index 0b3de379c..0b3de379c 100644
--- a/src/test/ui/lint/lint-ctypes-73251-2.stderr
+++ b/tests/ui/lint/lint-ctypes-73251-2.stderr
diff --git a/src/test/ui/lint/lint-ctypes-73251.rs b/tests/ui/lint/lint-ctypes-73251.rs
index ebc2ca77b..ebc2ca77b 100644
--- a/src/test/ui/lint/lint-ctypes-73251.rs
+++ b/tests/ui/lint/lint-ctypes-73251.rs
diff --git a/src/test/ui/lint/lint-ctypes-73747.rs b/tests/ui/lint/lint-ctypes-73747.rs
index 293ffd5c2..293ffd5c2 100644
--- a/src/test/ui/lint/lint-ctypes-73747.rs
+++ b/tests/ui/lint/lint-ctypes-73747.rs
diff --git a/src/test/ui/lint/lint-ctypes-enum.rs b/tests/ui/lint/lint-ctypes-enum.rs
index 7c2060805..7c2060805 100644
--- a/src/test/ui/lint/lint-ctypes-enum.rs
+++ b/tests/ui/lint/lint-ctypes-enum.rs
diff --git a/src/test/ui/lint/lint-ctypes-enum.stderr b/tests/ui/lint/lint-ctypes-enum.stderr
index 8554e2617..8554e2617 100644
--- a/src/test/ui/lint/lint-ctypes-enum.stderr
+++ b/tests/ui/lint/lint-ctypes-enum.stderr
diff --git a/src/test/ui/lint/lint-ctypes-fn.rs b/tests/ui/lint/lint-ctypes-fn.rs
index d3b36a9d5..d3b36a9d5 100644
--- a/src/test/ui/lint/lint-ctypes-fn.rs
+++ b/tests/ui/lint/lint-ctypes-fn.rs
diff --git a/src/test/ui/lint/lint-ctypes-fn.stderr b/tests/ui/lint/lint-ctypes-fn.stderr
index a05206bf1..a05206bf1 100644
--- a/src/test/ui/lint/lint-ctypes-fn.stderr
+++ b/tests/ui/lint/lint-ctypes-fn.stderr
diff --git a/src/test/ui/lint/lint-ctypes.rs b/tests/ui/lint/lint-ctypes.rs
index 9165e14b7..9165e14b7 100644
--- a/src/test/ui/lint/lint-ctypes.rs
+++ b/tests/ui/lint/lint-ctypes.rs
diff --git a/src/test/ui/lint/lint-ctypes.stderr b/tests/ui/lint/lint-ctypes.stderr
index 121ad0ce8..121ad0ce8 100644
--- a/src/test/ui/lint/lint-ctypes.stderr
+++ b/tests/ui/lint/lint-ctypes.stderr
diff --git a/src/test/ui/lint/lint-deref-nullptr.rs b/tests/ui/lint/lint-deref-nullptr.rs
index d052dbd9b..d052dbd9b 100644
--- a/src/test/ui/lint/lint-deref-nullptr.rs
+++ b/tests/ui/lint/lint-deref-nullptr.rs
diff --git a/src/test/ui/lint/lint-deref-nullptr.stderr b/tests/ui/lint/lint-deref-nullptr.stderr
index c6f432e4e..c6f432e4e 100644
--- a/src/test/ui/lint/lint-deref-nullptr.stderr
+++ b/tests/ui/lint/lint-deref-nullptr.stderr
diff --git a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.rs b/tests/ui/lint/lint-directives-on-use-items-issue-10534.rs
index e5cb0d3df..e5cb0d3df 100644
--- a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.rs
+++ b/tests/ui/lint/lint-directives-on-use-items-issue-10534.rs
diff --git a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr b/tests/ui/lint/lint-directives-on-use-items-issue-10534.stderr
index ccb139e0e..ccb139e0e 100644
--- a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr
+++ b/tests/ui/lint/lint-directives-on-use-items-issue-10534.stderr
diff --git a/src/test/ui/lint/lint-enum-intrinsics-non-enums.rs b/tests/ui/lint/lint-enum-intrinsics-non-enums.rs
index 8ad337064..8ad337064 100644
--- a/src/test/ui/lint/lint-enum-intrinsics-non-enums.rs
+++ b/tests/ui/lint/lint-enum-intrinsics-non-enums.rs
diff --git a/src/test/ui/lint/lint-enum-intrinsics-non-enums.stderr b/tests/ui/lint/lint-enum-intrinsics-non-enums.stderr
index 63ed2503c..63ed2503c 100644
--- a/src/test/ui/lint/lint-enum-intrinsics-non-enums.stderr
+++ b/tests/ui/lint/lint-enum-intrinsics-non-enums.stderr
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.noopt.stderr b/tests/ui/lint/lint-exceeding-bitshifts.noopt.stderr
index 3a84c6c1f..3a84c6c1f 100644
--- a/src/test/ui/lint/lint-exceeding-bitshifts.noopt.stderr
+++ b/tests/ui/lint/lint-exceeding-bitshifts.noopt.stderr
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.opt.stderr b/tests/ui/lint/lint-exceeding-bitshifts.opt.stderr
index 3a84c6c1f..3a84c6c1f 100644
--- a/src/test/ui/lint/lint-exceeding-bitshifts.opt.stderr
+++ b/tests/ui/lint/lint-exceeding-bitshifts.opt.stderr
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr b/tests/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr
index 3a84c6c1f..3a84c6c1f 100644
--- a/src/test/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr
+++ b/tests/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.rs b/tests/ui/lint/lint-exceeding-bitshifts.rs
index 048c1aff8..048c1aff8 100644
--- a/src/test/ui/lint/lint-exceeding-bitshifts.rs
+++ b/tests/ui/lint/lint-exceeding-bitshifts.rs
diff --git a/src/test/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs b/tests/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs
index 07a32904a..07a32904a 100644
--- a/src/test/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs
+++ b/tests/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs
diff --git a/tests/ui/lint/lint-ffi-safety-all-phantom.rs b/tests/ui/lint/lint-ffi-safety-all-phantom.rs
new file mode 100644
index 000000000..7419d3458
--- /dev/null
+++ b/tests/ui/lint/lint-ffi-safety-all-phantom.rs
@@ -0,0 +1,22 @@
+// This is a regression test for issue https://github.com/rust-lang/rust/issues/106629.
+// It ensures that transparent types where all fields are PhantomData are marked as
+// FFI-safe.
+
+// check-pass
+
+#[repr(transparent)]
+#[derive(Copy, Clone)]
+struct MyPhantom(core::marker::PhantomData<u8>);
+
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct Bar {
+    pub x: i32,
+    _marker: MyPhantom,
+}
+
+extern "C" {
+    pub fn foo(bar: *mut Bar);
+}
+
+fn main() {}
diff --git a/src/test/ui/lint/lint-forbid-attr.rs b/tests/ui/lint/lint-forbid-attr.rs
index 6d4cfd834..6d4cfd834 100644
--- a/src/test/ui/lint/lint-forbid-attr.rs
+++ b/tests/ui/lint/lint-forbid-attr.rs
diff --git a/src/test/ui/lint/lint-forbid-attr.stderr b/tests/ui/lint/lint-forbid-attr.stderr
index 5977b9c94..5977b9c94 100644
--- a/src/test/ui/lint/lint-forbid-attr.stderr
+++ b/tests/ui/lint/lint-forbid-attr.stderr
diff --git a/src/test/ui/lint/lint-forbid-cmdline.rs b/tests/ui/lint/lint-forbid-cmdline.rs
index 5246ccb57..5246ccb57 100644
--- a/src/test/ui/lint/lint-forbid-cmdline.rs
+++ b/tests/ui/lint/lint-forbid-cmdline.rs
diff --git a/src/test/ui/lint/lint-forbid-cmdline.stderr b/tests/ui/lint/lint-forbid-cmdline.stderr
index 0a92e58c0..0a92e58c0 100644
--- a/src/test/ui/lint/lint-forbid-cmdline.stderr
+++ b/tests/ui/lint/lint-forbid-cmdline.stderr
diff --git a/src/test/ui/lint/lint-forbid-internal-unsafe.rs b/tests/ui/lint/lint-forbid-internal-unsafe.rs
index 3ee55ba96..3ee55ba96 100644
--- a/src/test/ui/lint/lint-forbid-internal-unsafe.rs
+++ b/tests/ui/lint/lint-forbid-internal-unsafe.rs
diff --git a/src/test/ui/lint/lint-forbid-internal-unsafe.stderr b/tests/ui/lint/lint-forbid-internal-unsafe.stderr
index ba425ceb4..ba425ceb4 100644
--- a/src/test/ui/lint/lint-forbid-internal-unsafe.stderr
+++ b/tests/ui/lint/lint-forbid-internal-unsafe.stderr
diff --git a/src/test/ui/lint/lint-group-nonstandard-style.rs b/tests/ui/lint/lint-group-nonstandard-style.rs
index bd7f327bc..bd7f327bc 100644
--- a/src/test/ui/lint/lint-group-nonstandard-style.rs
+++ b/tests/ui/lint/lint-group-nonstandard-style.rs
diff --git a/src/test/ui/lint/lint-group-nonstandard-style.stderr b/tests/ui/lint/lint-group-nonstandard-style.stderr
index fcd010123..fcd010123 100644
--- a/src/test/ui/lint/lint-group-nonstandard-style.stderr
+++ b/tests/ui/lint/lint-group-nonstandard-style.stderr
diff --git a/src/test/ui/lint/lint-impl-fn.rs b/tests/ui/lint/lint-impl-fn.rs
index 46874d95c..46874d95c 100644
--- a/src/test/ui/lint/lint-impl-fn.rs
+++ b/tests/ui/lint/lint-impl-fn.rs
diff --git a/src/test/ui/lint/lint-impl-fn.stderr b/tests/ui/lint/lint-impl-fn.stderr
index 24ec9c7e4..24ec9c7e4 100644
--- a/src/test/ui/lint/lint-impl-fn.stderr
+++ b/tests/ui/lint/lint-impl-fn.stderr
diff --git a/src/test/ui/lint/lint-incoherent-auto-trait-objects.rs b/tests/ui/lint/lint-incoherent-auto-trait-objects.rs
index d53b51447..d53b51447 100644
--- a/src/test/ui/lint/lint-incoherent-auto-trait-objects.rs
+++ b/tests/ui/lint/lint-incoherent-auto-trait-objects.rs
diff --git a/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr b/tests/ui/lint/lint-incoherent-auto-trait-objects.stderr
index 553ab3869..553ab3869 100644
--- a/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr
+++ b/tests/ui/lint/lint-incoherent-auto-trait-objects.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-bool.rs b/tests/ui/lint/lint-invalid-atomic-ordering-bool.rs
index 15ceb6195..15ceb6195 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-bool.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-bool.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-bool.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-bool.stderr
index 9f38dcb0b..9f38dcb0b 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-bool.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-bool.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange-weak.rs b/tests/ui/lint/lint-invalid-atomic-ordering-exchange-weak.rs
index 63204c725..63204c725 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange-weak.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-exchange-weak.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange-weak.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-exchange-weak.stderr
index cc075ce9e..cc075ce9e 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange-weak.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-exchange-weak.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange.rs b/tests/ui/lint/lint-invalid-atomic-ordering-exchange.rs
index 488d268ee..488d268ee 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-exchange.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-exchange.stderr
index fe6c7e55c..fe6c7e55c 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-exchange.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-exchange.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-false-positive.rs b/tests/ui/lint/lint-invalid-atomic-ordering-false-positive.rs
index 4fb8605b4..4fb8605b4 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-false-positive.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-false-positive.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-fence.rs b/tests/ui/lint/lint-invalid-atomic-ordering-fence.rs
index 22034472c..22034472c 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-fence.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-fence.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-fence.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-fence.stderr
index 38327d607..38327d607 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-fence.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-fence.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-fetch-update.rs b/tests/ui/lint/lint-invalid-atomic-ordering-fetch-update.rs
index 734b63324..734b63324 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-fetch-update.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-fetch-update.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-fetch-update.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-fetch-update.stderr
index 33829d68f..33829d68f 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-fetch-update.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-fetch-update.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-int.rs b/tests/ui/lint/lint-invalid-atomic-ordering-int.rs
index 462c9670f..462c9670f 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-int.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-int.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-int.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-int.stderr
index 36930e2f4..36930e2f4 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-int.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-int.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-ptr.rs b/tests/ui/lint/lint-invalid-atomic-ordering-ptr.rs
index 984f7edeb..984f7edeb 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-ptr.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-ptr.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-ptr.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-ptr.stderr
index 12f4cad90..12f4cad90 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-ptr.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-ptr.stderr
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-uint.rs b/tests/ui/lint/lint-invalid-atomic-ordering-uint.rs
index 80ec3b9ee..80ec3b9ee 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-uint.rs
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-uint.rs
diff --git a/src/test/ui/lint/lint-invalid-atomic-ordering-uint.stderr b/tests/ui/lint/lint-invalid-atomic-ordering-uint.stderr
index d26621f2a..d26621f2a 100644
--- a/src/test/ui/lint/lint-invalid-atomic-ordering-uint.stderr
+++ b/tests/ui/lint/lint-invalid-atomic-ordering-uint.stderr
diff --git a/src/test/ui/lint/lint-level-macro-def-mod.rs b/tests/ui/lint/lint-level-macro-def-mod.rs
index 79f7d1206..79f7d1206 100644
--- a/src/test/ui/lint/lint-level-macro-def-mod.rs
+++ b/tests/ui/lint/lint-level-macro-def-mod.rs
diff --git a/src/test/ui/lint/lint-level-macro-def.rs b/tests/ui/lint/lint-level-macro-def.rs
index 720f4b453..720f4b453 100644
--- a/src/test/ui/lint/lint-level-macro-def.rs
+++ b/tests/ui/lint/lint-level-macro-def.rs
diff --git a/src/test/ui/lint/lint-lowercase-static-const-pattern-rename.rs b/tests/ui/lint/lint-lowercase-static-const-pattern-rename.rs
index d085db43a..d085db43a 100644
--- a/src/test/ui/lint/lint-lowercase-static-const-pattern-rename.rs
+++ b/tests/ui/lint/lint-lowercase-static-const-pattern-rename.rs
diff --git a/src/test/ui/lint/lint-lowercase-static-const-pattern.rs b/tests/ui/lint/lint-lowercase-static-const-pattern.rs
index c2e159eec..c2e159eec 100644
--- a/src/test/ui/lint/lint-lowercase-static-const-pattern.rs
+++ b/tests/ui/lint/lint-lowercase-static-const-pattern.rs
diff --git a/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr b/tests/ui/lint/lint-lowercase-static-const-pattern.stderr
index 8780fac05..8780fac05 100644
--- a/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr
+++ b/tests/ui/lint/lint-lowercase-static-const-pattern.stderr
diff --git a/src/test/ui/lint/lint-malformed.rs b/tests/ui/lint/lint-malformed.rs
index 188e702f9..188e702f9 100644
--- a/src/test/ui/lint/lint-malformed.rs
+++ b/tests/ui/lint/lint-malformed.rs
diff --git a/src/test/ui/lint/lint-malformed.stderr b/tests/ui/lint/lint-malformed.stderr
index 91b4e509b..91b4e509b 100644
--- a/src/test/ui/lint/lint-malformed.stderr
+++ b/tests/ui/lint/lint-malformed.stderr
diff --git a/src/test/ui/lint/lint-match-arms.rs b/tests/ui/lint/lint-match-arms.rs
index 5c2ccc60e..5c2ccc60e 100644
--- a/src/test/ui/lint/lint-match-arms.rs
+++ b/tests/ui/lint/lint-match-arms.rs
diff --git a/src/test/ui/lint/lint-match-arms.stderr b/tests/ui/lint/lint-match-arms.stderr
index 1bc0e41fd..1bc0e41fd 100644
--- a/src/test/ui/lint/lint-match-arms.stderr
+++ b/tests/ui/lint/lint-match-arms.stderr
diff --git a/src/test/ui/lint/lint-misplaced-attr.rs b/tests/ui/lint/lint-misplaced-attr.rs
index d06917ea3..d06917ea3 100644
--- a/src/test/ui/lint/lint-misplaced-attr.rs
+++ b/tests/ui/lint/lint-misplaced-attr.rs
diff --git a/src/test/ui/lint/lint-misplaced-attr.stderr b/tests/ui/lint/lint-misplaced-attr.stderr
index abaf4620e..abaf4620e 100644
--- a/src/test/ui/lint/lint-misplaced-attr.stderr
+++ b/tests/ui/lint/lint-misplaced-attr.stderr
diff --git a/tests/ui/lint/lint-missing-copy-implementations-allow.rs b/tests/ui/lint/lint-missing-copy-implementations-allow.rs
new file mode 100644
index 000000000..051a905ae
--- /dev/null
+++ b/tests/ui/lint/lint-missing-copy-implementations-allow.rs
@@ -0,0 +1,35 @@
+// check-pass
+#![deny(missing_copy_implementations)]
+
+// Don't recommend implementing Copy on something stateful like an iterator.
+pub struct MyIterator {
+    num: u8,
+}
+
+impl Iterator for MyIterator {
+    type Item = u8;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        todo!()
+    }
+}
+
+pub struct Handle {
+    inner: *mut (),
+}
+
+pub struct Handle2 {
+    inner: *const (),
+}
+
+pub enum MaybeHandle {
+    Ptr(*mut ()),
+}
+
+pub union UnionHandle {
+    ptr: *mut (),
+}
+
+pub struct Array([u8; 2048]);
+
+fn main() {}
diff --git a/src/test/ui/lint/lint-missing-copy-implementations.rs b/tests/ui/lint/lint-missing-copy-implementations.rs
index 918f40de1..918f40de1 100644
--- a/src/test/ui/lint/lint-missing-copy-implementations.rs
+++ b/tests/ui/lint/lint-missing-copy-implementations.rs
diff --git a/src/test/ui/lint/lint-missing-copy-implementations.stderr b/tests/ui/lint/lint-missing-copy-implementations.stderr
index e5f5ce20d..e5f5ce20d 100644
--- a/src/test/ui/lint/lint-missing-copy-implementations.stderr
+++ b/tests/ui/lint/lint-missing-copy-implementations.stderr
diff --git a/src/test/ui/lint/lint-missing-doc.rs b/tests/ui/lint/lint-missing-doc.rs
index 229725791..229725791 100644
--- a/src/test/ui/lint/lint-missing-doc.rs
+++ b/tests/ui/lint/lint-missing-doc.rs
diff --git a/src/test/ui/lint/lint-missing-doc.stderr b/tests/ui/lint/lint-missing-doc.stderr
index d68472d4b..d68472d4b 100644
--- a/src/test/ui/lint/lint-missing-doc.stderr
+++ b/tests/ui/lint/lint-missing-doc.stderr
diff --git a/src/test/ui/lint/lint-non-camel-case-types.rs b/tests/ui/lint/lint-non-camel-case-types.rs
index acd5c5df9..acd5c5df9 100644
--- a/src/test/ui/lint/lint-non-camel-case-types.rs
+++ b/tests/ui/lint/lint-non-camel-case-types.rs
diff --git a/src/test/ui/lint/lint-non-camel-case-types.stderr b/tests/ui/lint/lint-non-camel-case-types.stderr
index 875380b5d..875380b5d 100644
--- a/src/test/ui/lint/lint-non-camel-case-types.stderr
+++ b/tests/ui/lint/lint-non-camel-case-types.stderr
diff --git a/src/test/ui/lint/lint-non-camel-case-variant.rs b/tests/ui/lint/lint-non-camel-case-variant.rs
index 2b1a52f25..2b1a52f25 100644
--- a/src/test/ui/lint/lint-non-camel-case-variant.rs
+++ b/tests/ui/lint/lint-non-camel-case-variant.rs
diff --git a/src/test/ui/lint/lint-non-camel-case-with-trailing-underscores.rs b/tests/ui/lint/lint-non-camel-case-with-trailing-underscores.rs
index b832e4bcd..b832e4bcd 100644
--- a/src/test/ui/lint/lint-non-camel-case-with-trailing-underscores.rs
+++ b/tests/ui/lint/lint-non-camel-case-with-trailing-underscores.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-crate-2.rs b/tests/ui/lint/lint-non-snake-case-crate-2.rs
index 1b763a9d8..1b763a9d8 100644
--- a/src/test/ui/lint/lint-non-snake-case-crate-2.rs
+++ b/tests/ui/lint/lint-non-snake-case-crate-2.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-crate-2.stderr b/tests/ui/lint/lint-non-snake-case-crate-2.stderr
index 4b42145bb..4b42145bb 100644
--- a/src/test/ui/lint/lint-non-snake-case-crate-2.stderr
+++ b/tests/ui/lint/lint-non-snake-case-crate-2.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-crate.rs b/tests/ui/lint/lint-non-snake-case-crate.rs
index e4e84261a..e4e84261a 100644
--- a/src/test/ui/lint/lint-non-snake-case-crate.rs
+++ b/tests/ui/lint/lint-non-snake-case-crate.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-crate.stderr b/tests/ui/lint/lint-non-snake-case-crate.stderr
index da6b89c1e..da6b89c1e 100644
--- a/src/test/ui/lint/lint-non-snake-case-crate.stderr
+++ b/tests/ui/lint/lint-non-snake-case-crate.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-functions.rs b/tests/ui/lint/lint-non-snake-case-functions.rs
index fa64a9f98..fa64a9f98 100644
--- a/src/test/ui/lint/lint-non-snake-case-functions.rs
+++ b/tests/ui/lint/lint-non-snake-case-functions.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-functions.stderr b/tests/ui/lint/lint-non-snake-case-functions.stderr
index f6ac6b99b..f6ac6b99b 100644
--- a/src/test/ui/lint/lint-non-snake-case-functions.stderr
+++ b/tests/ui/lint/lint-non-snake-case-functions.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.rs b/tests/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.rs
index 8cc4f976a..8cc4f976a 100644
--- a/src/test/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.rs
+++ b/tests/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.stderr b/tests/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.stderr
index 2841815ec..2841815ec 100644
--- a/src/test/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.stderr
+++ b/tests/ui/lint/lint-non-snake-case-identifiers-suggestion-reserved.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-lifetimes.rs b/tests/ui/lint/lint-non-snake-case-lifetimes.rs
index de76d2dbe..de76d2dbe 100644
--- a/src/test/ui/lint/lint-non-snake-case-lifetimes.rs
+++ b/tests/ui/lint/lint-non-snake-case-lifetimes.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr b/tests/ui/lint/lint-non-snake-case-lifetimes.stderr
index d4fe26a43..d4fe26a43 100644
--- a/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr
+++ b/tests/ui/lint/lint-non-snake-case-lifetimes.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-modules.rs b/tests/ui/lint/lint-non-snake-case-modules.rs
index 73f123321..73f123321 100644
--- a/src/test/ui/lint/lint-non-snake-case-modules.rs
+++ b/tests/ui/lint/lint-non-snake-case-modules.rs
diff --git a/src/test/ui/lint/lint-non-snake-case-modules.stderr b/tests/ui/lint/lint-non-snake-case-modules.stderr
index c8b997c87..c8b997c87 100644
--- a/src/test/ui/lint/lint-non-snake-case-modules.stderr
+++ b/tests/ui/lint/lint-non-snake-case-modules.stderr
diff --git a/src/test/ui/lint/lint-non-snake-case-no-lowercase-equivalent.rs b/tests/ui/lint/lint-non-snake-case-no-lowercase-equivalent.rs
index 9f0c87dca..9f0c87dca 100644
--- a/src/test/ui/lint/lint-non-snake-case-no-lowercase-equivalent.rs
+++ b/tests/ui/lint/lint-non-snake-case-no-lowercase-equivalent.rs
diff --git a/src/test/ui/lint/lint-non-uppercase-associated-const.rs b/tests/ui/lint/lint-non-uppercase-associated-const.rs
index 7b0d93960..7b0d93960 100644
--- a/src/test/ui/lint/lint-non-uppercase-associated-const.rs
+++ b/tests/ui/lint/lint-non-uppercase-associated-const.rs
diff --git a/src/test/ui/lint/lint-non-uppercase-associated-const.stderr b/tests/ui/lint/lint-non-uppercase-associated-const.stderr
index 411ff51aa..411ff51aa 100644
--- a/src/test/ui/lint/lint-non-uppercase-associated-const.stderr
+++ b/tests/ui/lint/lint-non-uppercase-associated-const.stderr
diff --git a/src/test/ui/lint/lint-non-uppercase-statics.rs b/tests/ui/lint/lint-non-uppercase-statics.rs
index 5bd143032..5bd143032 100644
--- a/src/test/ui/lint/lint-non-uppercase-statics.rs
+++ b/tests/ui/lint/lint-non-uppercase-statics.rs
diff --git a/src/test/ui/lint/lint-non-uppercase-statics.stderr b/tests/ui/lint/lint-non-uppercase-statics.stderr
index c6fd0a6e0..c6fd0a6e0 100644
--- a/src/test/ui/lint/lint-non-uppercase-statics.stderr
+++ b/tests/ui/lint/lint-non-uppercase-statics.stderr
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-1.rs b/tests/ui/lint/lint-nonstandard-style-unicode-1.rs
index 7c45c0993..7c45c0993 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-1.rs
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-1.rs
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-1.stderr b/tests/ui/lint/lint-nonstandard-style-unicode-1.stderr
index 6c2aa225e..6c2aa225e 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-1.stderr
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-1.stderr
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-2.rs b/tests/ui/lint/lint-nonstandard-style-unicode-2.rs
index 9690be590..9690be590 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-2.rs
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-2.rs
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-2.stderr b/tests/ui/lint/lint-nonstandard-style-unicode-2.stderr
index 8eb0654e0..8eb0654e0 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-2.stderr
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-2.stderr
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-3.rs b/tests/ui/lint/lint-nonstandard-style-unicode-3.rs
index 9175be7a0..9175be7a0 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-3.rs
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-3.rs
diff --git a/src/test/ui/lint/lint-nonstandard-style-unicode-3.stderr b/tests/ui/lint/lint-nonstandard-style-unicode-3.stderr
index 970e6b838..970e6b838 100644
--- a/src/test/ui/lint/lint-nonstandard-style-unicode-3.stderr
+++ b/tests/ui/lint/lint-nonstandard-style-unicode-3.stderr
diff --git a/src/test/ui/lint/lint-output-format-2.rs b/tests/ui/lint/lint-output-format-2.rs
index 985166e09..985166e09 100644
--- a/src/test/ui/lint/lint-output-format-2.rs
+++ b/tests/ui/lint/lint-output-format-2.rs
diff --git a/src/test/ui/lint/lint-output-format-2.stderr b/tests/ui/lint/lint-output-format-2.stderr
index a36dbd61f..a36dbd61f 100644
--- a/src/test/ui/lint/lint-output-format-2.stderr
+++ b/tests/ui/lint/lint-output-format-2.stderr
diff --git a/src/test/ui/lint/lint-output-format.rs b/tests/ui/lint/lint-output-format.rs
index 67e8ec8f1..67e8ec8f1 100644
--- a/src/test/ui/lint/lint-output-format.rs
+++ b/tests/ui/lint/lint-output-format.rs
diff --git a/src/test/ui/lint/lint-output-format.stderr b/tests/ui/lint/lint-output-format.stderr
index 0db79a156..0db79a156 100644
--- a/src/test/ui/lint/lint-output-format.stderr
+++ b/tests/ui/lint/lint-output-format.stderr
diff --git a/src/test/ui/lint/lint-owned-heap-memory.rs b/tests/ui/lint/lint-owned-heap-memory.rs
index af47d5c07..af47d5c07 100644
--- a/src/test/ui/lint/lint-owned-heap-memory.rs
+++ b/tests/ui/lint/lint-owned-heap-memory.rs
diff --git a/src/test/ui/lint/lint-owned-heap-memory.stderr b/tests/ui/lint/lint-owned-heap-memory.stderr
index 5ba396970..5ba396970 100644
--- a/src/test/ui/lint/lint-owned-heap-memory.stderr
+++ b/tests/ui/lint/lint-owned-heap-memory.stderr
diff --git a/src/test/ui/lint/lint-pre-expansion-extern-module.rs b/tests/ui/lint/lint-pre-expansion-extern-module.rs
index 30e2ed8b7..30e2ed8b7 100644
--- a/src/test/ui/lint/lint-pre-expansion-extern-module.rs
+++ b/tests/ui/lint/lint-pre-expansion-extern-module.rs
diff --git a/src/test/ui/lint/lint-pre-expansion-extern-module.stderr b/tests/ui/lint/lint-pre-expansion-extern-module.stderr
index ce3e8806a..ce3e8806a 100644
--- a/src/test/ui/lint/lint-pre-expansion-extern-module.stderr
+++ b/tests/ui/lint/lint-pre-expansion-extern-module.stderr
diff --git a/src/test/ui/lint/lint-pub-unreachable-for-nested-glob.rs b/tests/ui/lint/lint-pub-unreachable-for-nested-glob.rs
index 2df6d08e7..2df6d08e7 100644
--- a/src/test/ui/lint/lint-pub-unreachable-for-nested-glob.rs
+++ b/tests/ui/lint/lint-pub-unreachable-for-nested-glob.rs
diff --git a/src/test/ui/lint/lint-qualification.rs b/tests/ui/lint/lint-qualification.rs
index 0cace0ca0..0cace0ca0 100644
--- a/src/test/ui/lint/lint-qualification.rs
+++ b/tests/ui/lint/lint-qualification.rs
diff --git a/src/test/ui/lint/lint-qualification.stderr b/tests/ui/lint/lint-qualification.stderr
index 149a782d9..149a782d9 100644
--- a/src/test/ui/lint/lint-qualification.stderr
+++ b/tests/ui/lint/lint-qualification.stderr
diff --git a/src/test/ui/lint/lint-range-endpoint-overflow.rs b/tests/ui/lint/lint-range-endpoint-overflow.rs
index 7034d56aa..7034d56aa 100644
--- a/src/test/ui/lint/lint-range-endpoint-overflow.rs
+++ b/tests/ui/lint/lint-range-endpoint-overflow.rs
diff --git a/src/test/ui/lint/lint-range-endpoint-overflow.stderr b/tests/ui/lint/lint-range-endpoint-overflow.stderr
index d2df73727..d2df73727 100644
--- a/src/test/ui/lint/lint-range-endpoint-overflow.stderr
+++ b/tests/ui/lint/lint-range-endpoint-overflow.stderr
diff --git a/src/test/ui/lint/lint-removed-allow.rs b/tests/ui/lint/lint-removed-allow.rs
index 30ba4f02f..30ba4f02f 100644
--- a/src/test/ui/lint/lint-removed-allow.rs
+++ b/tests/ui/lint/lint-removed-allow.rs
diff --git a/src/test/ui/lint/lint-removed-allow.stderr b/tests/ui/lint/lint-removed-allow.stderr
index 029334c2e..029334c2e 100644
--- a/src/test/ui/lint/lint-removed-allow.stderr
+++ b/tests/ui/lint/lint-removed-allow.stderr
diff --git a/src/test/ui/lint/lint-removed-cmdline.rs b/tests/ui/lint/lint-removed-cmdline.rs
index 462beabb9..462beabb9 100644
--- a/src/test/ui/lint/lint-removed-cmdline.rs
+++ b/tests/ui/lint/lint-removed-cmdline.rs
diff --git a/src/test/ui/lint/lint-removed-cmdline.stderr b/tests/ui/lint/lint-removed-cmdline.stderr
index 9be532ef2..9be532ef2 100644
--- a/src/test/ui/lint/lint-removed-cmdline.stderr
+++ b/tests/ui/lint/lint-removed-cmdline.stderr
diff --git a/src/test/ui/lint/lint-removed.rs b/tests/ui/lint/lint-removed.rs
index 92f4372c2..92f4372c2 100644
--- a/src/test/ui/lint/lint-removed.rs
+++ b/tests/ui/lint/lint-removed.rs
diff --git a/src/test/ui/lint/lint-removed.stderr b/tests/ui/lint/lint-removed.stderr
index dc0515b84..dc0515b84 100644
--- a/src/test/ui/lint/lint-removed.stderr
+++ b/tests/ui/lint/lint-removed.stderr
diff --git a/src/test/ui/lint/lint-renamed-allow.rs b/tests/ui/lint/lint-renamed-allow.rs
index 9cf6f329c..9cf6f329c 100644
--- a/src/test/ui/lint/lint-renamed-allow.rs
+++ b/tests/ui/lint/lint-renamed-allow.rs
diff --git a/src/test/ui/lint/lint-renamed-allow.stderr b/tests/ui/lint/lint-renamed-allow.stderr
index 46f6a10de..46f6a10de 100644
--- a/src/test/ui/lint/lint-renamed-allow.stderr
+++ b/tests/ui/lint/lint-renamed-allow.stderr
diff --git a/src/test/ui/lint/lint-renamed-cmdline.rs b/tests/ui/lint/lint-renamed-cmdline.rs
index c873771e3..c873771e3 100644
--- a/src/test/ui/lint/lint-renamed-cmdline.rs
+++ b/tests/ui/lint/lint-renamed-cmdline.rs
diff --git a/src/test/ui/lint/lint-renamed-cmdline.stderr b/tests/ui/lint/lint-renamed-cmdline.stderr
index 8dfd61ac9..8dfd61ac9 100644
--- a/src/test/ui/lint/lint-renamed-cmdline.stderr
+++ b/tests/ui/lint/lint-renamed-cmdline.stderr
diff --git a/src/test/ui/lint/lint-renamed.rs b/tests/ui/lint/lint-renamed.rs
index ca3299430..ca3299430 100644
--- a/src/test/ui/lint/lint-renamed.rs
+++ b/tests/ui/lint/lint-renamed.rs
diff --git a/src/test/ui/lint/lint-renamed.stderr b/tests/ui/lint/lint-renamed.stderr
index 984254571..984254571 100644
--- a/src/test/ui/lint/lint-renamed.stderr
+++ b/tests/ui/lint/lint-renamed.stderr
diff --git a/src/test/ui/lint/lint-shorthand-field.fixed b/tests/ui/lint/lint-shorthand-field.fixed
index 7cd5717bc..7cd5717bc 100644
--- a/src/test/ui/lint/lint-shorthand-field.fixed
+++ b/tests/ui/lint/lint-shorthand-field.fixed
diff --git a/src/test/ui/lint/lint-shorthand-field.rs b/tests/ui/lint/lint-shorthand-field.rs
index 22de9c325..22de9c325 100644
--- a/src/test/ui/lint/lint-shorthand-field.rs
+++ b/tests/ui/lint/lint-shorthand-field.rs
diff --git a/src/test/ui/lint/lint-shorthand-field.stderr b/tests/ui/lint/lint-shorthand-field.stderr
index 2d1ca30f9..2d1ca30f9 100644
--- a/src/test/ui/lint/lint-shorthand-field.stderr
+++ b/tests/ui/lint/lint-shorthand-field.stderr
diff --git a/src/test/ui/lint/lint-stability-2.rs b/tests/ui/lint/lint-stability-2.rs
index 94a8d08c8..94a8d08c8 100644
--- a/src/test/ui/lint/lint-stability-2.rs
+++ b/tests/ui/lint/lint-stability-2.rs
diff --git a/src/test/ui/lint/lint-stability-2.stderr b/tests/ui/lint/lint-stability-2.stderr
index 5b7537fa2..5b7537fa2 100644
--- a/src/test/ui/lint/lint-stability-2.stderr
+++ b/tests/ui/lint/lint-stability-2.stderr
diff --git a/src/test/ui/lint/lint-stability-deprecated.rs b/tests/ui/lint/lint-stability-deprecated.rs
index 74c35083e..74c35083e 100644
--- a/src/test/ui/lint/lint-stability-deprecated.rs
+++ b/tests/ui/lint/lint-stability-deprecated.rs
diff --git a/src/test/ui/lint/lint-stability-deprecated.stderr b/tests/ui/lint/lint-stability-deprecated.stderr
index 9f1e7b281..9f1e7b281 100644
--- a/src/test/ui/lint/lint-stability-deprecated.stderr
+++ b/tests/ui/lint/lint-stability-deprecated.stderr
diff --git a/src/test/ui/lint/lint-stability-fields-deprecated.rs b/tests/ui/lint/lint-stability-fields-deprecated.rs
index a5511966d..a5511966d 100644
--- a/src/test/ui/lint/lint-stability-fields-deprecated.rs
+++ b/tests/ui/lint/lint-stability-fields-deprecated.rs
diff --git a/src/test/ui/lint/lint-stability-fields-deprecated.stderr b/tests/ui/lint/lint-stability-fields-deprecated.stderr
index 2d8326020..2d8326020 100644
--- a/src/test/ui/lint/lint-stability-fields-deprecated.stderr
+++ b/tests/ui/lint/lint-stability-fields-deprecated.stderr
diff --git a/src/test/ui/lint/lint-stability-fields.rs b/tests/ui/lint/lint-stability-fields.rs
index 51990b6ee..51990b6ee 100644
--- a/src/test/ui/lint/lint-stability-fields.rs
+++ b/tests/ui/lint/lint-stability-fields.rs
diff --git a/src/test/ui/lint/lint-stability-fields.stderr b/tests/ui/lint/lint-stability-fields.stderr
index 3d2e73c1e..3d2e73c1e 100644
--- a/src/test/ui/lint/lint-stability-fields.stderr
+++ b/tests/ui/lint/lint-stability-fields.stderr
diff --git a/src/test/ui/lint/lint-stability.rs b/tests/ui/lint/lint-stability.rs
index d0f0e9f80..d0f0e9f80 100644
--- a/src/test/ui/lint/lint-stability.rs
+++ b/tests/ui/lint/lint-stability.rs
diff --git a/src/test/ui/lint/lint-stability.stderr b/tests/ui/lint/lint-stability.stderr
index bd1a57dc4..bd1a57dc4 100644
--- a/src/test/ui/lint/lint-stability.stderr
+++ b/tests/ui/lint/lint-stability.stderr
diff --git a/src/test/ui/lint/lint-stability2.rs b/tests/ui/lint/lint-stability2.rs
index 9ae23dac6..9ae23dac6 100644
--- a/src/test/ui/lint/lint-stability2.rs
+++ b/tests/ui/lint/lint-stability2.rs
diff --git a/src/test/ui/lint/lint-stability2.stderr b/tests/ui/lint/lint-stability2.stderr
index 51bdf84a3..51bdf84a3 100644
--- a/src/test/ui/lint/lint-stability2.stderr
+++ b/tests/ui/lint/lint-stability2.stderr
diff --git a/src/test/ui/lint/lint-stability3.rs b/tests/ui/lint/lint-stability3.rs
index 4452846ec..4452846ec 100644
--- a/src/test/ui/lint/lint-stability3.rs
+++ b/tests/ui/lint/lint-stability3.rs
diff --git a/src/test/ui/lint/lint-stability3.stderr b/tests/ui/lint/lint-stability3.stderr
index 3bbb60dd3..3bbb60dd3 100644
--- a/src/test/ui/lint/lint-stability3.stderr
+++ b/tests/ui/lint/lint-stability3.stderr
diff --git a/src/test/ui/lint/lint-strict-provenance-fuzzy-casts.rs b/tests/ui/lint/lint-strict-provenance-fuzzy-casts.rs
index d2d72a68f..d2d72a68f 100644
--- a/src/test/ui/lint/lint-strict-provenance-fuzzy-casts.rs
+++ b/tests/ui/lint/lint-strict-provenance-fuzzy-casts.rs
diff --git a/src/test/ui/lint/lint-strict-provenance-fuzzy-casts.stderr b/tests/ui/lint/lint-strict-provenance-fuzzy-casts.stderr
index 383623b48..383623b48 100644
--- a/src/test/ui/lint/lint-strict-provenance-fuzzy-casts.stderr
+++ b/tests/ui/lint/lint-strict-provenance-fuzzy-casts.stderr
diff --git a/src/test/ui/lint/lint-strict-provenance-lossy-casts.rs b/tests/ui/lint/lint-strict-provenance-lossy-casts.rs
index 9799a0537..9799a0537 100644
--- a/src/test/ui/lint/lint-strict-provenance-lossy-casts.rs
+++ b/tests/ui/lint/lint-strict-provenance-lossy-casts.rs
diff --git a/src/test/ui/lint/lint-strict-provenance-lossy-casts.stderr b/tests/ui/lint/lint-strict-provenance-lossy-casts.stderr
index aa151fe2d..aa151fe2d 100644
--- a/src/test/ui/lint/lint-strict-provenance-lossy-casts.stderr
+++ b/tests/ui/lint/lint-strict-provenance-lossy-casts.stderr
diff --git a/src/test/ui/lint/lint-temporary-cstring-as-param.rs b/tests/ui/lint/lint-temporary-cstring-as-param.rs
index 9f5805367..9f5805367 100644
--- a/src/test/ui/lint/lint-temporary-cstring-as-param.rs
+++ b/tests/ui/lint/lint-temporary-cstring-as-param.rs
diff --git a/src/test/ui/lint/lint-temporary-cstring-as-param.stderr b/tests/ui/lint/lint-temporary-cstring-as-param.stderr
index 838b3bc13..838b3bc13 100644
--- a/src/test/ui/lint/lint-temporary-cstring-as-param.stderr
+++ b/tests/ui/lint/lint-temporary-cstring-as-param.stderr
diff --git a/src/test/ui/lint/lint-temporary-cstring-as-ptr.rs b/tests/ui/lint/lint-temporary-cstring-as-ptr.rs
index 7aa4f2e1e..7aa4f2e1e 100644
--- a/src/test/ui/lint/lint-temporary-cstring-as-ptr.rs
+++ b/tests/ui/lint/lint-temporary-cstring-as-ptr.rs
diff --git a/src/test/ui/lint/lint-temporary-cstring-as-ptr.stderr b/tests/ui/lint/lint-temporary-cstring-as-ptr.stderr
index 79ef57dd1..79ef57dd1 100644
--- a/src/test/ui/lint/lint-temporary-cstring-as-ptr.stderr
+++ b/tests/ui/lint/lint-temporary-cstring-as-ptr.stderr
diff --git a/src/test/ui/lint/lint-type-limits.rs b/tests/ui/lint/lint-type-limits.rs
index 2b140f869..2b140f869 100644
--- a/src/test/ui/lint/lint-type-limits.rs
+++ b/tests/ui/lint/lint-type-limits.rs
diff --git a/src/test/ui/lint/lint-type-limits.stderr b/tests/ui/lint/lint-type-limits.stderr
index 71a2b3bfd..71a2b3bfd 100644
--- a/src/test/ui/lint/lint-type-limits.stderr
+++ b/tests/ui/lint/lint-type-limits.stderr
diff --git a/src/test/ui/lint/lint-type-limits2.rs b/tests/ui/lint/lint-type-limits2.rs
index 3f90119cd..3f90119cd 100644
--- a/src/test/ui/lint/lint-type-limits2.rs
+++ b/tests/ui/lint/lint-type-limits2.rs
diff --git a/src/test/ui/lint/lint-type-limits2.stderr b/tests/ui/lint/lint-type-limits2.stderr
index b3420ad8a..b3420ad8a 100644
--- a/src/test/ui/lint/lint-type-limits2.stderr
+++ b/tests/ui/lint/lint-type-limits2.stderr
diff --git a/src/test/ui/lint/lint-type-limits3.rs b/tests/ui/lint/lint-type-limits3.rs
index ceecf9ab3..ceecf9ab3 100644
--- a/src/test/ui/lint/lint-type-limits3.rs
+++ b/tests/ui/lint/lint-type-limits3.rs
diff --git a/src/test/ui/lint/lint-type-limits3.stderr b/tests/ui/lint/lint-type-limits3.stderr
index db46e7ae7..db46e7ae7 100644
--- a/src/test/ui/lint/lint-type-limits3.stderr
+++ b/tests/ui/lint/lint-type-limits3.stderr
diff --git a/src/test/ui/lint/lint-type-overflow.rs b/tests/ui/lint/lint-type-overflow.rs
index 9672da6d3..9672da6d3 100644
--- a/src/test/ui/lint/lint-type-overflow.rs
+++ b/tests/ui/lint/lint-type-overflow.rs
diff --git a/src/test/ui/lint/lint-type-overflow.stderr b/tests/ui/lint/lint-type-overflow.stderr
index 48d8228b8..48d8228b8 100644
--- a/src/test/ui/lint/lint-type-overflow.stderr
+++ b/tests/ui/lint/lint-type-overflow.stderr
diff --git a/src/test/ui/lint/lint-type-overflow2.rs b/tests/ui/lint/lint-type-overflow2.rs
index 9b1eb510b..9b1eb510b 100644
--- a/src/test/ui/lint/lint-type-overflow2.rs
+++ b/tests/ui/lint/lint-type-overflow2.rs
diff --git a/src/test/ui/lint/lint-type-overflow2.stderr b/tests/ui/lint/lint-type-overflow2.stderr
index eb593d062..eb593d062 100644
--- a/src/test/ui/lint/lint-type-overflow2.stderr
+++ b/tests/ui/lint/lint-type-overflow2.stderr
diff --git a/src/test/ui/lint/lint-unconditional-recursion.rs b/tests/ui/lint/lint-unconditional-recursion.rs
index ad052d36f..ad052d36f 100644
--- a/src/test/ui/lint/lint-unconditional-recursion.rs
+++ b/tests/ui/lint/lint-unconditional-recursion.rs
diff --git a/src/test/ui/lint/lint-unconditional-recursion.stderr b/tests/ui/lint/lint-unconditional-recursion.stderr
index 9d200a789..9d200a789 100644
--- a/src/test/ui/lint/lint-unconditional-recursion.stderr
+++ b/tests/ui/lint/lint-unconditional-recursion.stderr
diff --git a/src/test/ui/lint/lint-unexported-no-mangle.rs b/tests/ui/lint/lint-unexported-no-mangle.rs
index f260fc323..f260fc323 100644
--- a/src/test/ui/lint/lint-unexported-no-mangle.rs
+++ b/tests/ui/lint/lint-unexported-no-mangle.rs
diff --git a/src/test/ui/lint/lint-unexported-no-mangle.stderr b/tests/ui/lint/lint-unexported-no-mangle.stderr
index a11ee769c..a11ee769c 100644
--- a/src/test/ui/lint/lint-unexported-no-mangle.stderr
+++ b/tests/ui/lint/lint-unexported-no-mangle.stderr
diff --git a/src/test/ui/lint/lint-unknown-feature-default.rs b/tests/ui/lint/lint-unknown-feature-default.rs
index 84a2e5a4b..84a2e5a4b 100644
--- a/src/test/ui/lint/lint-unknown-feature-default.rs
+++ b/tests/ui/lint/lint-unknown-feature-default.rs
diff --git a/src/test/ui/lint/lint-unknown-feature.rs b/tests/ui/lint/lint-unknown-feature.rs
index 1af8d4ff8..1af8d4ff8 100644
--- a/src/test/ui/lint/lint-unknown-feature.rs
+++ b/tests/ui/lint/lint-unknown-feature.rs
diff --git a/src/test/ui/lint/lint-unknown-lint-cmdline.rs b/tests/ui/lint/lint-unknown-lint-cmdline.rs
index 7f3f55fba..7f3f55fba 100644
--- a/src/test/ui/lint/lint-unknown-lint-cmdline.rs
+++ b/tests/ui/lint/lint-unknown-lint-cmdline.rs
diff --git a/src/test/ui/lint/lint-unknown-lint-cmdline.stderr b/tests/ui/lint/lint-unknown-lint-cmdline.stderr
index 3855d5527..3855d5527 100644
--- a/src/test/ui/lint/lint-unknown-lint-cmdline.stderr
+++ b/tests/ui/lint/lint-unknown-lint-cmdline.stderr
diff --git a/src/test/ui/lint/lint-unknown-lint.rs b/tests/ui/lint/lint-unknown-lint.rs
index 2d842d514..2d842d514 100644
--- a/src/test/ui/lint/lint-unknown-lint.rs
+++ b/tests/ui/lint/lint-unknown-lint.rs
diff --git a/src/test/ui/lint/lint-unknown-lint.stderr b/tests/ui/lint/lint-unknown-lint.stderr
index 0cb6b4957..0cb6b4957 100644
--- a/src/test/ui/lint/lint-unknown-lint.stderr
+++ b/tests/ui/lint/lint-unknown-lint.stderr
diff --git a/src/test/ui/lint/lint-unnecessary-import-braces.rs b/tests/ui/lint/lint-unnecessary-import-braces.rs
index 9a3398a87..9a3398a87 100644
--- a/src/test/ui/lint/lint-unnecessary-import-braces.rs
+++ b/tests/ui/lint/lint-unnecessary-import-braces.rs
diff --git a/src/test/ui/lint/lint-unnecessary-import-braces.stderr b/tests/ui/lint/lint-unnecessary-import-braces.stderr
index 2d289404d..2d289404d 100644
--- a/src/test/ui/lint/lint-unnecessary-import-braces.stderr
+++ b/tests/ui/lint/lint-unnecessary-import-braces.stderr
diff --git a/src/test/ui/lint/lint-unnecessary-parens.fixed b/tests/ui/lint/lint-unnecessary-parens.fixed
index 9c144324f..9c144324f 100644
--- a/src/test/ui/lint/lint-unnecessary-parens.fixed
+++ b/tests/ui/lint/lint-unnecessary-parens.fixed
diff --git a/src/test/ui/lint/lint-unnecessary-parens.rs b/tests/ui/lint/lint-unnecessary-parens.rs
index 4fd9cabb3..4fd9cabb3 100644
--- a/src/test/ui/lint/lint-unnecessary-parens.rs
+++ b/tests/ui/lint/lint-unnecessary-parens.rs
diff --git a/src/test/ui/lint/lint-unnecessary-parens.stderr b/tests/ui/lint/lint-unnecessary-parens.stderr
index e13620f06..e13620f06 100644
--- a/src/test/ui/lint/lint-unnecessary-parens.stderr
+++ b/tests/ui/lint/lint-unnecessary-parens.stderr
diff --git a/src/test/ui/lint/lint-unsafe-code.rs b/tests/ui/lint/lint-unsafe-code.rs
index b72e4c3a9..b72e4c3a9 100644
--- a/src/test/ui/lint/lint-unsafe-code.rs
+++ b/tests/ui/lint/lint-unsafe-code.rs
diff --git a/src/test/ui/lint/lint-unsafe-code.stderr b/tests/ui/lint/lint-unsafe-code.stderr
index 037f0a832..037f0a832 100644
--- a/src/test/ui/lint/lint-unsafe-code.stderr
+++ b/tests/ui/lint/lint-unsafe-code.stderr
diff --git a/tests/ui/lint/lint-uppercase-variables.rs b/tests/ui/lint/lint-uppercase-variables.rs
new file mode 100644
index 000000000..59dba536f
--- /dev/null
+++ b/tests/ui/lint/lint-uppercase-variables.rs
@@ -0,0 +1,41 @@
+#![warn(unused)]
+#![allow(dead_code)]
+#![deny(non_snake_case)]
+
+mod foo {
+    pub enum Foo { Foo }
+}
+
+struct Something {
+    X: usize //~ ERROR structure field `X` should have a snake case name
+}
+
+fn test(Xx: usize) { //~ ERROR variable `Xx` should have a snake case name
+    println!("{}", Xx);
+}
+
+fn main() {
+    let Test: usize = 0; //~ ERROR variable `Test` should have a snake case name
+    println!("{}", Test);
+
+    match foo::Foo::Foo {
+        Foo => {}
+    //~^ ERROR variable `Foo` should have a snake case name
+    //~^^ ERROR `Foo` is named the same as one of the variants of the type `foo::Foo`
+    //~^^^ WARN unused variable: `Foo`
+    }
+
+    let Foo = foo::Foo::Foo;
+    //~^ ERROR variable `Foo` should have a snake case name
+    //~^^ ERROR `Foo` is named the same as one of the variants of the type `foo::Foo`
+    //~^^^ WARN unused variable: `Foo`
+
+    fn in_param(Foo: foo::Foo) {}
+    //~^ ERROR variable `Foo` should have a snake case name
+    //~^^ ERROR `Foo` is named the same as one of the variants of the type `foo::Foo`
+    //~^^^ WARN unused variable: `Foo`
+
+    test(1);
+
+    let _ = Something { X: 0 };
+}
diff --git a/src/test/ui/lint/lint-uppercase-variables.stderr b/tests/ui/lint/lint-uppercase-variables.stderr
index 71b24a835..42ec9364b 100644
--- a/src/test/ui/lint/lint-uppercase-variables.stderr
+++ b/tests/ui/lint/lint-uppercase-variables.stderr
@@ -1,22 +1,22 @@
-warning[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `Foo`
+error[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `foo::Foo`
   --> $DIR/lint-uppercase-variables.rs:22:9
    |
 LL |         Foo => {}
-   |         ^^^ help: to match on the variant, qualify the path: `Foo::Foo`
+   |         ^^^ help: to match on the variant, qualify the path: `foo::Foo::Foo`
    |
-   = note: `#[warn(bindings_with_variant_name)]` on by default
+   = note: `#[deny(bindings_with_variant_name)]` on by default
 
-warning[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `Foo`
+error[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `foo::Foo`
   --> $DIR/lint-uppercase-variables.rs:28:9
    |
 LL |     let Foo = foo::Foo::Foo;
-   |         ^^^ help: to match on the variant, qualify the path: `Foo::Foo`
+   |         ^^^ help: to match on the variant, qualify the path: `foo::Foo::Foo`
 
-warning[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `Foo`
+error[E0170]: pattern binding `Foo` is named the same as one of the variants of the type `foo::Foo`
   --> $DIR/lint-uppercase-variables.rs:33:17
    |
 LL |     fn in_param(Foo: foo::Foo) {}
-   |                 ^^^ help: to match on the variant, qualify the path: `Foo::Foo`
+   |                 ^^^ help: to match on the variant, qualify the path: `foo::Foo::Foo`
 
 warning: unused variable: `Foo`
   --> $DIR/lint-uppercase-variables.rs:22:9
@@ -85,6 +85,6 @@ error: variable `Foo` should have a snake case name
 LL |     fn in_param(Foo: foo::Foo) {}
    |                 ^^^ help: convert the identifier to snake case (notice the capitalization): `foo`
 
-error: aborting due to 6 previous errors; 6 warnings emitted
+error: aborting due to 9 previous errors; 3 warnings emitted
 
 For more information about this error, try `rustc --explain E0170`.
diff --git a/src/test/ui/lint/lint_pre_expansion_extern_module_aux.rs b/tests/ui/lint/lint_pre_expansion_extern_module_aux.rs
index 71dec40ea..71dec40ea 100644
--- a/src/test/ui/lint/lint_pre_expansion_extern_module_aux.rs
+++ b/tests/ui/lint/lint_pre_expansion_extern_module_aux.rs
diff --git a/src/test/ui/lint/lints-in-foreign-macros.rs b/tests/ui/lint/lints-in-foreign-macros.rs
index 1e8b6788a..1e8b6788a 100644
--- a/src/test/ui/lint/lints-in-foreign-macros.rs
+++ b/tests/ui/lint/lints-in-foreign-macros.rs
diff --git a/src/test/ui/lint/lints-in-foreign-macros.stderr b/tests/ui/lint/lints-in-foreign-macros.stderr
index f20e16287..f20e16287 100644
--- a/src/test/ui/lint/lints-in-foreign-macros.stderr
+++ b/tests/ui/lint/lints-in-foreign-macros.stderr
diff --git a/src/test/ui/lint/missing-doc-private-macro.rs b/tests/ui/lint/missing-doc-private-macro.rs
index 0d4332ed0..0d4332ed0 100644
--- a/src/test/ui/lint/missing-doc-private-macro.rs
+++ b/tests/ui/lint/missing-doc-private-macro.rs
diff --git a/src/test/ui/lint/missing-doc-private-macro.stderr b/tests/ui/lint/missing-doc-private-macro.stderr
index 979b007d0..979b007d0 100644
--- a/src/test/ui/lint/missing-doc-private-macro.stderr
+++ b/tests/ui/lint/missing-doc-private-macro.stderr
diff --git a/src/test/ui/lint/must_not_suspend/boxed.rs b/tests/ui/lint/must_not_suspend/boxed.rs
index 1f823fc55..1f823fc55 100644
--- a/src/test/ui/lint/must_not_suspend/boxed.rs
+++ b/tests/ui/lint/must_not_suspend/boxed.rs
diff --git a/src/test/ui/lint/must_not_suspend/boxed.stderr b/tests/ui/lint/must_not_suspend/boxed.stderr
index 9efc7b069..9efc7b069 100644
--- a/src/test/ui/lint/must_not_suspend/boxed.stderr
+++ b/tests/ui/lint/must_not_suspend/boxed.stderr
diff --git a/src/test/ui/lint/must_not_suspend/dedup.rs b/tests/ui/lint/must_not_suspend/dedup.rs
index 81a08579b..81a08579b 100644
--- a/src/test/ui/lint/must_not_suspend/dedup.rs
+++ b/tests/ui/lint/must_not_suspend/dedup.rs
diff --git a/src/test/ui/lint/must_not_suspend/dedup.stderr b/tests/ui/lint/must_not_suspend/dedup.stderr
index f8978ba57..f8978ba57 100644
--- a/src/test/ui/lint/must_not_suspend/dedup.stderr
+++ b/tests/ui/lint/must_not_suspend/dedup.stderr
diff --git a/src/test/ui/lint/must_not_suspend/feature-gate-must_not_suspend.rs b/tests/ui/lint/must_not_suspend/feature-gate-must_not_suspend.rs
index 1554408c1..1554408c1 100644
--- a/src/test/ui/lint/must_not_suspend/feature-gate-must_not_suspend.rs
+++ b/tests/ui/lint/must_not_suspend/feature-gate-must_not_suspend.rs
diff --git a/src/test/ui/lint/must_not_suspend/feature-gate-must_not_suspend.stderr b/tests/ui/lint/must_not_suspend/feature-gate-must_not_suspend.stderr
index ab20a8be8..ab20a8be8 100644
--- a/src/test/ui/lint/must_not_suspend/feature-gate-must_not_suspend.stderr
+++ b/tests/ui/lint/must_not_suspend/feature-gate-must_not_suspend.stderr
diff --git a/src/test/ui/lint/must_not_suspend/gated.rs b/tests/ui/lint/must_not_suspend/gated.rs
index b73a76555..b73a76555 100644
--- a/src/test/ui/lint/must_not_suspend/gated.rs
+++ b/tests/ui/lint/must_not_suspend/gated.rs
diff --git a/src/test/ui/lint/must_not_suspend/gated.stderr b/tests/ui/lint/must_not_suspend/gated.stderr
index 64de1ebea..64de1ebea 100644
--- a/src/test/ui/lint/must_not_suspend/gated.stderr
+++ b/tests/ui/lint/must_not_suspend/gated.stderr
diff --git a/src/test/ui/lint/must_not_suspend/generic.rs b/tests/ui/lint/must_not_suspend/generic.rs
index b3effa020..b3effa020 100644
--- a/src/test/ui/lint/must_not_suspend/generic.rs
+++ b/tests/ui/lint/must_not_suspend/generic.rs
diff --git a/src/test/ui/lint/must_not_suspend/handled.rs b/tests/ui/lint/must_not_suspend/handled.rs
index 8714be644..8714be644 100644
--- a/src/test/ui/lint/must_not_suspend/handled.rs
+++ b/tests/ui/lint/must_not_suspend/handled.rs
diff --git a/src/test/ui/lint/must_not_suspend/issue-89562.rs b/tests/ui/lint/must_not_suspend/issue-89562.rs
index acdb36fcd..acdb36fcd 100644
--- a/src/test/ui/lint/must_not_suspend/issue-89562.rs
+++ b/tests/ui/lint/must_not_suspend/issue-89562.rs
diff --git a/src/test/ui/lint/must_not_suspend/mutex.rs b/tests/ui/lint/must_not_suspend/mutex.rs
index 7bb895e7d..7bb895e7d 100644
--- a/src/test/ui/lint/must_not_suspend/mutex.rs
+++ b/tests/ui/lint/must_not_suspend/mutex.rs
diff --git a/src/test/ui/lint/must_not_suspend/mutex.stderr b/tests/ui/lint/must_not_suspend/mutex.stderr
index c251cb845..c251cb845 100644
--- a/src/test/ui/lint/must_not_suspend/mutex.stderr
+++ b/tests/ui/lint/must_not_suspend/mutex.stderr
diff --git a/src/test/ui/lint/must_not_suspend/other_items.rs b/tests/ui/lint/must_not_suspend/other_items.rs
index 5aa1abb14..5aa1abb14 100644
--- a/src/test/ui/lint/must_not_suspend/other_items.rs
+++ b/tests/ui/lint/must_not_suspend/other_items.rs
diff --git a/src/test/ui/lint/must_not_suspend/other_items.stderr b/tests/ui/lint/must_not_suspend/other_items.stderr
index 41c889692..41c889692 100644
--- a/src/test/ui/lint/must_not_suspend/other_items.stderr
+++ b/tests/ui/lint/must_not_suspend/other_items.stderr
diff --git a/src/test/ui/lint/must_not_suspend/ref-drop-tracking.rs b/tests/ui/lint/must_not_suspend/ref-drop-tracking.rs
index 1bc4a3812..1bc4a3812 100644
--- a/src/test/ui/lint/must_not_suspend/ref-drop-tracking.rs
+++ b/tests/ui/lint/must_not_suspend/ref-drop-tracking.rs
diff --git a/src/test/ui/lint/must_not_suspend/ref-drop-tracking.stderr b/tests/ui/lint/must_not_suspend/ref-drop-tracking.stderr
index 180e187c1..180e187c1 100644
--- a/src/test/ui/lint/must_not_suspend/ref-drop-tracking.stderr
+++ b/tests/ui/lint/must_not_suspend/ref-drop-tracking.stderr
diff --git a/src/test/ui/lint/must_not_suspend/ref.drop_tracking.stderr b/tests/ui/lint/must_not_suspend/ref.drop_tracking.stderr
index abf76711b..abf76711b 100644
--- a/src/test/ui/lint/must_not_suspend/ref.drop_tracking.stderr
+++ b/tests/ui/lint/must_not_suspend/ref.drop_tracking.stderr
diff --git a/src/test/ui/lint/must_not_suspend/ref.no_drop_tracking.stderr b/tests/ui/lint/must_not_suspend/ref.no_drop_tracking.stderr
index 41ac09ea7..41ac09ea7 100644
--- a/src/test/ui/lint/must_not_suspend/ref.no_drop_tracking.stderr
+++ b/tests/ui/lint/must_not_suspend/ref.no_drop_tracking.stderr
diff --git a/src/test/ui/lint/must_not_suspend/ref.rs b/tests/ui/lint/must_not_suspend/ref.rs
index f6b23746f..f6b23746f 100644
--- a/src/test/ui/lint/must_not_suspend/ref.rs
+++ b/tests/ui/lint/must_not_suspend/ref.rs
diff --git a/src/test/ui/lint/must_not_suspend/return.rs b/tests/ui/lint/must_not_suspend/return.rs
index 5b1fa5e27..5b1fa5e27 100644
--- a/src/test/ui/lint/must_not_suspend/return.rs
+++ b/tests/ui/lint/must_not_suspend/return.rs
diff --git a/src/test/ui/lint/must_not_suspend/return.stderr b/tests/ui/lint/must_not_suspend/return.stderr
index fdada85eb..fdada85eb 100644
--- a/src/test/ui/lint/must_not_suspend/return.stderr
+++ b/tests/ui/lint/must_not_suspend/return.stderr
diff --git a/src/test/ui/lint/must_not_suspend/trait.rs b/tests/ui/lint/must_not_suspend/trait.rs
index 6c911cb4b..6c911cb4b 100644
--- a/src/test/ui/lint/must_not_suspend/trait.rs
+++ b/tests/ui/lint/must_not_suspend/trait.rs
diff --git a/src/test/ui/lint/must_not_suspend/trait.stderr b/tests/ui/lint/must_not_suspend/trait.stderr
index d64d25aae..d64d25aae 100644
--- a/src/test/ui/lint/must_not_suspend/trait.stderr
+++ b/tests/ui/lint/must_not_suspend/trait.stderr
diff --git a/tests/ui/lint/must_not_suspend/tuple-mismatch.rs b/tests/ui/lint/must_not_suspend/tuple-mismatch.rs
new file mode 100644
index 000000000..c7e14e425
--- /dev/null
+++ b/tests/ui/lint/must_not_suspend/tuple-mismatch.rs
@@ -0,0 +1,9 @@
+#![feature(generators)]
+
+fn main() {
+    let _generator = || {
+        yield ((), ((), ()));
+        yield ((), ());
+        //~^ ERROR mismatched types
+    };
+}
diff --git a/tests/ui/lint/must_not_suspend/tuple-mismatch.stderr b/tests/ui/lint/must_not_suspend/tuple-mismatch.stderr
new file mode 100644
index 000000000..cca8cd9bd
--- /dev/null
+++ b/tests/ui/lint/must_not_suspend/tuple-mismatch.stderr
@@ -0,0 +1,12 @@
+error[E0308]: mismatched types
+  --> $DIR/tuple-mismatch.rs:6:20
+   |
+LL |         yield ((), ());
+   |                    ^^ expected tuple, found `()`
+   |
+   = note:  expected tuple `((), ())`
+           found unit type `()`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/lint/must_not_suspend/unit.rs b/tests/ui/lint/must_not_suspend/unit.rs
index d3a19f704..d3a19f704 100644
--- a/src/test/ui/lint/must_not_suspend/unit.rs
+++ b/tests/ui/lint/must_not_suspend/unit.rs
diff --git a/src/test/ui/lint/must_not_suspend/unit.stderr b/tests/ui/lint/must_not_suspend/unit.stderr
index c967dbac5..c967dbac5 100644
--- a/src/test/ui/lint/must_not_suspend/unit.stderr
+++ b/tests/ui/lint/must_not_suspend/unit.stderr
diff --git a/src/test/ui/lint/must_not_suspend/warn.rs b/tests/ui/lint/must_not_suspend/warn.rs
index 7fdea66a2..7fdea66a2 100644
--- a/src/test/ui/lint/must_not_suspend/warn.rs
+++ b/tests/ui/lint/must_not_suspend/warn.rs
diff --git a/src/test/ui/lint/must_not_suspend/warn.stderr b/tests/ui/lint/must_not_suspend/warn.stderr
index fe551c652..fe551c652 100644
--- a/src/test/ui/lint/must_not_suspend/warn.stderr
+++ b/tests/ui/lint/must_not_suspend/warn.stderr
diff --git a/src/test/ui/lint/no-coverage.rs b/tests/ui/lint/no-coverage.rs
index ff24c12b2..ff24c12b2 100644
--- a/src/test/ui/lint/no-coverage.rs
+++ b/tests/ui/lint/no-coverage.rs
diff --git a/src/test/ui/lint/no-coverage.stderr b/tests/ui/lint/no-coverage.stderr
index 404efbeac..404efbeac 100644
--- a/src/test/ui/lint/no-coverage.stderr
+++ b/tests/ui/lint/no-coverage.stderr
diff --git a/src/test/ui/lint/noop-method-call.rs b/tests/ui/lint/noop-method-call.rs
index 89b296635..89b296635 100644
--- a/src/test/ui/lint/noop-method-call.rs
+++ b/tests/ui/lint/noop-method-call.rs
diff --git a/src/test/ui/lint/noop-method-call.stderr b/tests/ui/lint/noop-method-call.stderr
index 6a904d01a..6a904d01a 100644
--- a/src/test/ui/lint/noop-method-call.stderr
+++ b/tests/ui/lint/noop-method-call.stderr
diff --git a/src/test/ui/lint/not_found.rs b/tests/ui/lint/not_found.rs
index de120b6e0..de120b6e0 100644
--- a/src/test/ui/lint/not_found.rs
+++ b/tests/ui/lint/not_found.rs
diff --git a/src/test/ui/lint/not_found.stderr b/tests/ui/lint/not_found.stderr
index ea118c73c..ea118c73c 100644
--- a/src/test/ui/lint/not_found.stderr
+++ b/tests/ui/lint/not_found.stderr
diff --git a/src/test/ui/lint/opaque-ty-ffi-normalization-cycle.rs b/tests/ui/lint/opaque-ty-ffi-normalization-cycle.rs
index c83bca4a4..c83bca4a4 100644
--- a/src/test/ui/lint/opaque-ty-ffi-normalization-cycle.rs
+++ b/tests/ui/lint/opaque-ty-ffi-normalization-cycle.rs
diff --git a/src/test/ui/lint/opaque-ty-ffi-normalization-cycle.stderr b/tests/ui/lint/opaque-ty-ffi-normalization-cycle.stderr
index e8d696477..e8d696477 100644
--- a/src/test/ui/lint/opaque-ty-ffi-normalization-cycle.stderr
+++ b/tests/ui/lint/opaque-ty-ffi-normalization-cycle.stderr
diff --git a/src/test/ui/lint/opaque-ty-ffi-unsafe.rs b/tests/ui/lint/opaque-ty-ffi-unsafe.rs
index b7cc38e99..b7cc38e99 100644
--- a/src/test/ui/lint/opaque-ty-ffi-unsafe.rs
+++ b/tests/ui/lint/opaque-ty-ffi-unsafe.rs
diff --git a/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr b/tests/ui/lint/opaque-ty-ffi-unsafe.stderr
index 33aa95854..33aa95854 100644
--- a/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr
+++ b/tests/ui/lint/opaque-ty-ffi-unsafe.stderr
diff --git a/src/test/ui/lint/outer-forbid.rs b/tests/ui/lint/outer-forbid.rs
index ba330258d..ba330258d 100644
--- a/src/test/ui/lint/outer-forbid.rs
+++ b/tests/ui/lint/outer-forbid.rs
diff --git a/src/test/ui/lint/outer-forbid.stderr b/tests/ui/lint/outer-forbid.stderr
index a47877980..a47877980 100644
--- a/src/test/ui/lint/outer-forbid.stderr
+++ b/tests/ui/lint/outer-forbid.stderr
diff --git a/src/test/ui/lint/reasons-erroneous.rs b/tests/ui/lint/reasons-erroneous.rs
index cd693ae16..cd693ae16 100644
--- a/src/test/ui/lint/reasons-erroneous.rs
+++ b/tests/ui/lint/reasons-erroneous.rs
diff --git a/src/test/ui/lint/reasons-erroneous.stderr b/tests/ui/lint/reasons-erroneous.stderr
index 5521af17c..5521af17c 100644
--- a/src/test/ui/lint/reasons-erroneous.stderr
+++ b/tests/ui/lint/reasons-erroneous.stderr
diff --git a/src/test/ui/lint/reasons-forbidden.rs b/tests/ui/lint/reasons-forbidden.rs
index 9c2edec4d..9c2edec4d 100644
--- a/src/test/ui/lint/reasons-forbidden.rs
+++ b/tests/ui/lint/reasons-forbidden.rs
diff --git a/src/test/ui/lint/reasons-forbidden.stderr b/tests/ui/lint/reasons-forbidden.stderr
index ab6f19a01..ab6f19a01 100644
--- a/src/test/ui/lint/reasons-forbidden.stderr
+++ b/tests/ui/lint/reasons-forbidden.stderr
diff --git a/src/test/ui/lint/reasons.rs b/tests/ui/lint/reasons.rs
index da1c740c4..da1c740c4 100644
--- a/src/test/ui/lint/reasons.rs
+++ b/tests/ui/lint/reasons.rs
diff --git a/src/test/ui/lint/reasons.stderr b/tests/ui/lint/reasons.stderr
index cd8412153..cd8412153 100644
--- a/src/test/ui/lint/reasons.stderr
+++ b/tests/ui/lint/reasons.stderr
diff --git a/src/test/ui/lint/recommend-literal.rs b/tests/ui/lint/recommend-literal.rs
index 453cbf285..453cbf285 100644
--- a/src/test/ui/lint/recommend-literal.rs
+++ b/tests/ui/lint/recommend-literal.rs
diff --git a/src/test/ui/lint/recommend-literal.stderr b/tests/ui/lint/recommend-literal.stderr
index 424ecadd4..424ecadd4 100644
--- a/src/test/ui/lint/recommend-literal.stderr
+++ b/tests/ui/lint/recommend-literal.stderr
diff --git a/src/test/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs b/tests/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs
index 5a94ccd74..5a94ccd74 100644
--- a/src/test/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs
+++ b/tests/ui/lint/redundant-semicolon/auxiliary/redundant-semi-proc-macro-def.rs
diff --git a/src/test/ui/lint/redundant-semicolon/item-stmt-semi.rs b/tests/ui/lint/redundant-semicolon/item-stmt-semi.rs
index 8c79630b7..8c79630b7 100644
--- a/src/test/ui/lint/redundant-semicolon/item-stmt-semi.rs
+++ b/tests/ui/lint/redundant-semicolon/item-stmt-semi.rs
diff --git a/src/test/ui/lint/redundant-semicolon/item-stmt-semi.stderr b/tests/ui/lint/redundant-semicolon/item-stmt-semi.stderr
index 451b152cb..451b152cb 100644
--- a/src/test/ui/lint/redundant-semicolon/item-stmt-semi.stderr
+++ b/tests/ui/lint/redundant-semicolon/item-stmt-semi.stderr
diff --git a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
index 08a5c6c2b..08a5c6c2b 100644
--- a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
+++ b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
diff --git a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
index e31d14c55..e31d14c55 100644
--- a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
+++ b/tests/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
diff --git a/src/test/ui/lint/register-tool-lint.rs b/tests/ui/lint/register-tool-lint.rs
index 17d3afbf6..17d3afbf6 100644
--- a/src/test/ui/lint/register-tool-lint.rs
+++ b/tests/ui/lint/register-tool-lint.rs
diff --git a/src/test/ui/lint/register-tool-lint.stderr b/tests/ui/lint/register-tool-lint.stderr
index 842d845ff..842d845ff 100644
--- a/src/test/ui/lint/register-tool-lint.stderr
+++ b/tests/ui/lint/register-tool-lint.stderr
diff --git a/src/test/ui/lint/renamed-lints-still-apply.rs b/tests/ui/lint/renamed-lints-still-apply.rs
index 01cd32536..01cd32536 100644
--- a/src/test/ui/lint/renamed-lints-still-apply.rs
+++ b/tests/ui/lint/renamed-lints-still-apply.rs
diff --git a/src/test/ui/lint/renamed-lints-still-apply.stderr b/tests/ui/lint/renamed-lints-still-apply.stderr
index e926719bb..e926719bb 100644
--- a/src/test/ui/lint/renamed-lints-still-apply.stderr
+++ b/tests/ui/lint/renamed-lints-still-apply.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/avoid_delayed_good_path_ice.rs b/tests/ui/lint/rfc-2383-lint-reason/avoid_delayed_good_path_ice.rs
index 912e831d8..912e831d8 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/avoid_delayed_good_path_ice.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/avoid_delayed_good_path_ice.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/catch_multiple_lint_triggers.rs b/tests/ui/lint/rfc-2383-lint-reason/catch_multiple_lint_triggers.rs
index 6b255b799..6b255b799 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/catch_multiple_lint_triggers.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/catch_multiple_lint_triggers.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/crate_level_expect.rs b/tests/ui/lint/rfc-2383-lint-reason/crate_level_expect.rs
index 9f591ba98..9f591ba98 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/crate_level_expect.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/crate_level_expect.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/crate_level_expect.stderr b/tests/ui/lint/rfc-2383-lint-reason/crate_level_expect.stderr
index 7237f6fb6..7237f6fb6 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/crate_level_expect.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/crate_level_expect.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_inside_macro.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_inside_macro.rs
index b95815bc5..b95815bc5 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_inside_macro.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_inside_macro.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.rs
index 07c60fa0c..07c60fa0c 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.stderr
index 817e16fdc..817e16fdc 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_lint_from_macro.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.rs
index 928e16106..928e16106 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.stderr
index b5601cf9e..b5601cf9e 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_missing_feature_gate.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.rs
index dc9a719a3..dc9a719a3 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.stderr
index 90ee744b2..90ee744b2 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_multiple_lints.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.rs
index 8f94bd6ec..8f94bd6ec 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.stderr
index 2c35647b8..2c35647b8 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_nested_lint_levels.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.rs
index 5fdb71041..5fdb71041 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.stderr
index 69f7cda08..69f7cda08 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_on_fn_params.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.rs
index f80fe88cb..f80fe88cb 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.stderr
index 6d49e7543..6d49e7543 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_tool_lint_rfc_2383.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.rs
index d38e65533..d38e65533 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.stderr
index 9a1c3e442..9a1c3e442 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_unfulfilled_expectation.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_forbid.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_with_forbid.rs
index 479ee198e..479ee198e 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_forbid.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_with_forbid.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_forbid.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_with_forbid.stderr
index a8116e934..a8116e934 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_forbid.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_with_forbid.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_reason.rs b/tests/ui/lint/rfc-2383-lint-reason/expect_with_reason.rs
index b4183d982..b4183d982 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_reason.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_with_reason.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_reason.stderr b/tests/ui/lint/rfc-2383-lint-reason/expect_with_reason.stderr
index e349e4081..e349e4081 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/expect_with_reason.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/expect_with_reason.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs
index a3c3933d7..a3c3933d7 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr
index 5942fa8ae..5942fa8ae 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_fulfilled.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.rs b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.rs
index 080e30023..080e30023 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.stderr b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.stderr
index c74fabe27..c74fabe27 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/force_warn_expected_lints_unfulfilled.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_early_lints.rs b/tests/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_early_lints.rs
index 6624b930e..6624b930e 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_early_lints.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_early_lints.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_late_lints.rs b/tests/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_late_lints.rs
index 5d928b3ca..5d928b3ca 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_late_lints.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/fulfilled_expectation_late_lints.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.rs b/tests/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.rs
index bafdea96e..bafdea96e 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.stderr b/tests/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.stderr
index 3e9d70821..3e9d70821 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/lint-attribute-only-with-reason.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.rs b/tests/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.rs
index 98080b4e8..98080b4e8 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.stderr b/tests/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.stderr
index df7d6584f..df7d6584f 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.stderr
+++ b/tests/ui/lint/rfc-2383-lint-reason/multiple_expect_attrs.stderr
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.rs b/tests/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.rs
index 2b6c3c6a1..2b6c3c6a1 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.rs
+++ b/tests/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.rs
diff --git a/src/test/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.stdout b/tests/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.stdout
index 0ee3a03c3..0ee3a03c3 100644
--- a/src/test/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.stdout
+++ b/tests/ui/lint/rfc-2383-lint-reason/no_ice_for_partial_compiler_runs.stdout
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.rs b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.rs
index e7da825ae..e7da825ae 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.rs
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.rs
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.stderr b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.stderr
index e9906c83d..e9906c83d 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.stderr
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.stderr
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables-2.rs b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables-2.rs
index f62c8a190..f62c8a190 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables-2.rs
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables-2.rs
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.rs b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.rs
index 9d837d41f..9d837d41f 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.rs
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.rs
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.stderr b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.stderr
index 884a4a453..884a4a453 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.stderr
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-mixed-script-confusables.stderr
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.rs b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.rs
index 8ae174409..8ae174409 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.rs
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.rs
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr
index 8ed7f093c..8ed7f093c 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.rs b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.rs
index ed8e7dddd..ed8e7dddd 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.rs
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.rs
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr
index 0533da030..0533da030 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr
+++ b/tests/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr
diff --git a/src/test/ui/lint/rustdoc-group.rs b/tests/ui/lint/rustdoc-group.rs
index 130abe425..130abe425 100644
--- a/src/test/ui/lint/rustdoc-group.rs
+++ b/tests/ui/lint/rustdoc-group.rs
diff --git a/src/test/ui/lint/rustdoc-group.stderr b/tests/ui/lint/rustdoc-group.stderr
index fddc863ae..fddc863ae 100644
--- a/src/test/ui/lint/rustdoc-group.stderr
+++ b/tests/ui/lint/rustdoc-group.stderr
diff --git a/src/test/ui/lint/rustdoc-renamed.rs b/tests/ui/lint/rustdoc-renamed.rs
index ecd6155b7..ecd6155b7 100644
--- a/src/test/ui/lint/rustdoc-renamed.rs
+++ b/tests/ui/lint/rustdoc-renamed.rs
diff --git a/src/test/ui/lint/rustdoc-renamed.stderr b/tests/ui/lint/rustdoc-renamed.stderr
index 096e867aa..096e867aa 100644
--- a/src/test/ui/lint/rustdoc-renamed.stderr
+++ b/tests/ui/lint/rustdoc-renamed.stderr
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs b/tests/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs
index 781391cc5..781391cc5 100644
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/auxiliary/foreign-crate.rs
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs b/tests/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs
index 374506366..374506366 100644
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/foreign-crate.rs
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs b/tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs
index fff380934..fff380934 100644
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.rs
diff --git a/tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr b/tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr
new file mode 100644
index 000000000..c60120061
--- /dev/null
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/semicolon-in-expressions-from-macros.stderr
@@ -0,0 +1,185 @@
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         foo!(warn_in_block)
+   |         ------------------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:4:9
+   |
+LL | #![warn(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |     let _ = foo!(warn_in_expr);
+   |             ------------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |     let _ = #[allow(semicolon_in_expressions_from_macros)] foo!(allow_does_not_work);
+   |                                                            ------------------------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: 3 warnings emitted
+
+Future incompatibility report: Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         foo!(first)
+   |         ----------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:24:13
+   |
+LL |     #[allow(semicolon_in_expressions_from_macros)]
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |     let _ = foo!(second);
+   |             ------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:29:13
+   |
+LL |     #[allow(semicolon_in_expressions_from_macros)]
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         let _ = foo!(third);
+   |                 ----------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:32:13
+   |
+LL |     #[allow(semicolon_in_expressions_from_macros)]
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         let _ = foo!(fourth);
+   |                 ------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:37:13
+   |
+LL |     #[allow(semicolon_in_expressions_from_macros)]
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         foo!(warn_in_block)
+   |         ------------------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: macro invocations at the end of a block are treated as expressions
+   = note: to ignore the value produced by the macro, add a semicolon after the invocation of `foo`
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:4:9
+   |
+LL | #![warn(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |     let _ = foo!(warn_in_expr);
+   |             ------------------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:4:9
+   |
+LL | #![warn(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/semicolon-in-expressions-from-macros.rs:9:13
+   |
+LL |         true;
+   |             ^
+...
+LL |     let _ = #[allow(semicolon_in_expressions_from_macros)] foo!(allow_does_not_work);
+   |                                                            ------------------------- in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+note: the lint level is defined here
+  --> $DIR/semicolon-in-expressions-from-macros.rs:4:9
+   |
+LL | #![warn(semicolon_in_expressions_from_macros)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs b/tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs
index 2c63311e6..2c63311e6 100644
--- a/src/test/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.rs
diff --git a/tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr b/tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr
new file mode 100644
index 000000000..0fec4996f
--- /dev/null
+++ b/tests/ui/lint/semicolon-in-expressions-from-macros/warn-semicolon-in-expressions-from-macros.stderr
@@ -0,0 +1,31 @@
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/warn-semicolon-in-expressions-from-macros.rs:6:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         _ => foo!()
+   |              ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+warning: 1 warning emitted
+
+Future incompatibility report: Future breakage diagnostic:
+warning: trailing semicolon in macro used in expression position
+  --> $DIR/warn-semicolon-in-expressions-from-macros.rs:6:13
+   |
+LL |         true;
+   |             ^
+...
+LL |         _ => foo!()
+   |              ------ in this macro invocation
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #79813 <https://github.com/rust-lang/rust/issues/79813>
+   = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default
+   = note: this warning originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
+
diff --git a/src/test/ui/lint/special-upper-lower-cases.rs b/tests/ui/lint/special-upper-lower-cases.rs
index 761be61fa..761be61fa 100644
--- a/src/test/ui/lint/special-upper-lower-cases.rs
+++ b/tests/ui/lint/special-upper-lower-cases.rs
diff --git a/src/test/ui/lint/special-upper-lower-cases.stderr b/tests/ui/lint/special-upper-lower-cases.stderr
index 2aa13c33b..2aa13c33b 100644
--- a/src/test/ui/lint/special-upper-lower-cases.stderr
+++ b/tests/ui/lint/special-upper-lower-cases.stderr
diff --git a/src/test/ui/lint/suggestions.fixed b/tests/ui/lint/suggestions.fixed
index 35851690b..35851690b 100644
--- a/src/test/ui/lint/suggestions.fixed
+++ b/tests/ui/lint/suggestions.fixed
diff --git a/src/test/ui/lint/suggestions.rs b/tests/ui/lint/suggestions.rs
index be6f0d6b3..be6f0d6b3 100644
--- a/src/test/ui/lint/suggestions.rs
+++ b/tests/ui/lint/suggestions.rs
diff --git a/src/test/ui/lint/suggestions.stderr b/tests/ui/lint/suggestions.stderr
index 4caee777a..4caee777a 100644
--- a/src/test/ui/lint/suggestions.stderr
+++ b/tests/ui/lint/suggestions.stderr
diff --git a/src/test/ui/lint/test-allow-dead-extern-static-no-warning.rs b/tests/ui/lint/test-allow-dead-extern-static-no-warning.rs
index 2583e431e..2583e431e 100644
--- a/src/test/ui/lint/test-allow-dead-extern-static-no-warning.rs
+++ b/tests/ui/lint/test-allow-dead-extern-static-no-warning.rs
diff --git a/src/test/ui/lint/test-inner-fn.rs b/tests/ui/lint/test-inner-fn.rs
index d419cc6fa..d419cc6fa 100644
--- a/src/test/ui/lint/test-inner-fn.rs
+++ b/tests/ui/lint/test-inner-fn.rs
diff --git a/src/test/ui/lint/test-inner-fn.stderr b/tests/ui/lint/test-inner-fn.stderr
index 7a32bc86b..7a32bc86b 100644
--- a/src/test/ui/lint/test-inner-fn.stderr
+++ b/tests/ui/lint/test-inner-fn.stderr
diff --git a/src/test/ui/lint/trivial-cast-ice.rs b/tests/ui/lint/trivial-cast-ice.rs
index f781fab22..f781fab22 100644
--- a/src/test/ui/lint/trivial-cast-ice.rs
+++ b/tests/ui/lint/trivial-cast-ice.rs
diff --git a/src/test/ui/lint/trivial-casts-featuring-type-ascription.rs b/tests/ui/lint/trivial-casts-featuring-type-ascription.rs
index 96bf2dcfb..96bf2dcfb 100644
--- a/src/test/ui/lint/trivial-casts-featuring-type-ascription.rs
+++ b/tests/ui/lint/trivial-casts-featuring-type-ascription.rs
diff --git a/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr b/tests/ui/lint/trivial-casts-featuring-type-ascription.stderr
index 5087807b6..5087807b6 100644
--- a/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr
+++ b/tests/ui/lint/trivial-casts-featuring-type-ascription.stderr
diff --git a/src/test/ui/lint/trivial-casts.rs b/tests/ui/lint/trivial-casts.rs
index b17de624a..b17de624a 100644
--- a/src/test/ui/lint/trivial-casts.rs
+++ b/tests/ui/lint/trivial-casts.rs
diff --git a/src/test/ui/lint/trivial-casts.stderr b/tests/ui/lint/trivial-casts.stderr
index 7ace353de..7ace353de 100644
--- a/src/test/ui/lint/trivial-casts.stderr
+++ b/tests/ui/lint/trivial-casts.stderr
diff --git a/src/test/ui/lint/trivial_casts.rs b/tests/ui/lint/trivial_casts.rs
index 0a8b9de1d..0a8b9de1d 100644
--- a/src/test/ui/lint/trivial_casts.rs
+++ b/tests/ui/lint/trivial_casts.rs
diff --git a/src/test/ui/lint/trivial_casts.stderr b/tests/ui/lint/trivial_casts.stderr
index 74f962835..74f962835 100644
--- a/src/test/ui/lint/trivial_casts.stderr
+++ b/tests/ui/lint/trivial_casts.stderr
diff --git a/src/test/ui/lint/type-overflow.rs b/tests/ui/lint/type-overflow.rs
index 6234b794c..6234b794c 100644
--- a/src/test/ui/lint/type-overflow.rs
+++ b/tests/ui/lint/type-overflow.rs
diff --git a/src/test/ui/lint/type-overflow.stderr b/tests/ui/lint/type-overflow.stderr
index 62cb1f7f4..62cb1f7f4 100644
--- a/src/test/ui/lint/type-overflow.stderr
+++ b/tests/ui/lint/type-overflow.stderr
diff --git a/src/test/ui/lint/unaligned_references.rs b/tests/ui/lint/unaligned_references.rs
index e547f031a..e547f031a 100644
--- a/src/test/ui/lint/unaligned_references.rs
+++ b/tests/ui/lint/unaligned_references.rs
diff --git a/src/test/ui/lint/unaligned_references.stderr b/tests/ui/lint/unaligned_references.stderr
index 346f49b92..346f49b92 100644
--- a/src/test/ui/lint/unaligned_references.stderr
+++ b/tests/ui/lint/unaligned_references.stderr
diff --git a/src/test/ui/lint/unaligned_references_external_macro.rs b/tests/ui/lint/unaligned_references_external_macro.rs
index cb597c38e..cb597c38e 100644
--- a/src/test/ui/lint/unaligned_references_external_macro.rs
+++ b/tests/ui/lint/unaligned_references_external_macro.rs
diff --git a/src/test/ui/lint/unaligned_references_external_macro.stderr b/tests/ui/lint/unaligned_references_external_macro.stderr
index c46ca6742..c46ca6742 100644
--- a/src/test/ui/lint/unaligned_references_external_macro.stderr
+++ b/tests/ui/lint/unaligned_references_external_macro.stderr
diff --git a/src/test/ui/lint/unnecessary-extern-crate.rs b/tests/ui/lint/unnecessary-extern-crate.rs
index af2bd84bd..af2bd84bd 100644
--- a/src/test/ui/lint/unnecessary-extern-crate.rs
+++ b/tests/ui/lint/unnecessary-extern-crate.rs
diff --git a/src/test/ui/lint/unnecessary-extern-crate.stderr b/tests/ui/lint/unnecessary-extern-crate.stderr
index 14ba9d052..14ba9d052 100644
--- a/src/test/ui/lint/unnecessary-extern-crate.stderr
+++ b/tests/ui/lint/unnecessary-extern-crate.stderr
diff --git a/src/test/ui/lint/unreachable-async-fn.rs b/tests/ui/lint/unreachable-async-fn.rs
index eedd877fe..eedd877fe 100644
--- a/src/test/ui/lint/unreachable-async-fn.rs
+++ b/tests/ui/lint/unreachable-async-fn.rs
diff --git a/src/test/ui/lint/unreachable_pub.rs b/tests/ui/lint/unreachable_pub.rs
index a50467ce8..a50467ce8 100644
--- a/src/test/ui/lint/unreachable_pub.rs
+++ b/tests/ui/lint/unreachable_pub.rs
diff --git a/src/test/ui/lint/unreachable_pub.stderr b/tests/ui/lint/unreachable_pub.stderr
index 762834b97..762834b97 100644
--- a/src/test/ui/lint/unreachable_pub.stderr
+++ b/tests/ui/lint/unreachable_pub.stderr
diff --git a/src/test/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs b/tests/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
index 26871c98d..26871c98d 100644
--- a/src/test/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
+++ b/tests/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
diff --git a/src/test/ui/lint/unsafe_code/forge_unsafe_block.rs b/tests/ui/lint/unsafe_code/forge_unsafe_block.rs
index a1bd7b413..a1bd7b413 100644
--- a/src/test/ui/lint/unsafe_code/forge_unsafe_block.rs
+++ b/tests/ui/lint/unsafe_code/forge_unsafe_block.rs
diff --git a/src/test/ui/lint/unused-borrows.rs b/tests/ui/lint/unused-borrows.rs
index 4518522ae..4518522ae 100644
--- a/src/test/ui/lint/unused-borrows.rs
+++ b/tests/ui/lint/unused-borrows.rs
diff --git a/src/test/ui/lint/unused-borrows.stderr b/tests/ui/lint/unused-borrows.stderr
index d8dd2b5fd..d8dd2b5fd 100644
--- a/src/test/ui/lint/unused-borrows.stderr
+++ b/tests/ui/lint/unused-borrows.stderr
diff --git a/src/test/ui/lint/unused-braces-while-let-with-mutable-value.rs b/tests/ui/lint/unused-braces-while-let-with-mutable-value.rs
index ac547293c..ac547293c 100644
--- a/src/test/ui/lint/unused-braces-while-let-with-mutable-value.rs
+++ b/tests/ui/lint/unused-braces-while-let-with-mutable-value.rs
diff --git a/src/test/ui/lint/unused-qualification-in-derive-expansion.rs b/tests/ui/lint/unused-qualification-in-derive-expansion.rs
index c2efbf507..c2efbf507 100644
--- a/src/test/ui/lint/unused-qualification-in-derive-expansion.rs
+++ b/tests/ui/lint/unused-qualification-in-derive-expansion.rs
diff --git a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate.rs b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate.rs
+++ b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate.rs
diff --git a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate2.rs b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate2.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate2.rs
+++ b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate2.rs
diff --git a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate3.rs b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate3.rs
index b76b4321d..b76b4321d 100644
--- a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate3.rs
+++ b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate3.rs
diff --git a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate4.rs b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate4.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate4.rs
+++ b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate4.rs
diff --git a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate5.rs b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate5.rs
index d11c69f81..d11c69f81 100644
--- a/src/test/ui/lint/unused/auxiliary/lint_unused_extern_crate5.rs
+++ b/tests/ui/lint/unused/auxiliary/lint_unused_extern_crate5.rs
diff --git a/src/test/ui/lint/unused/issue-104397.rs b/tests/ui/lint/unused/issue-104397.rs
index 94e15cd96..94e15cd96 100644
--- a/src/test/ui/lint/unused/issue-104397.rs
+++ b/tests/ui/lint/unused/issue-104397.rs
diff --git a/tests/ui/lint/unused/issue-105061-array-lint.rs b/tests/ui/lint/unused/issue-105061-array-lint.rs
new file mode 100644
index 000000000..9b06a4fde
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061-array-lint.rs
@@ -0,0 +1,11 @@
+#![warn(unused)]
+#![deny(warnings)]
+
+fn main() {
+    let _x: ([u32; 3]); //~ ERROR unnecessary parentheses around type
+    let _y: [u8; (3)]; //~ ERROR unnecessary parentheses around const expression
+    let _z: ([u8; (3)]);
+    //~^ ERROR unnecessary parentheses around const expression
+    //~| ERROR unnecessary parentheses around type
+
+}
diff --git a/tests/ui/lint/unused/issue-105061-array-lint.stderr b/tests/ui/lint/unused/issue-105061-array-lint.stderr
new file mode 100644
index 000000000..7eb761aee
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061-array-lint.stderr
@@ -0,0 +1,56 @@
+error: unnecessary parentheses around type
+  --> $DIR/issue-105061-array-lint.rs:5:13
+   |
+LL |     let _x: ([u32; 3]);
+   |             ^        ^
+   |
+note: the lint level is defined here
+  --> $DIR/issue-105061-array-lint.rs:2:9
+   |
+LL | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(unused_parens)]` implied by `#[deny(warnings)]`
+help: remove these parentheses
+   |
+LL -     let _x: ([u32; 3]);
+LL +     let _x: [u32; 3];
+   |
+
+error: unnecessary parentheses around const expression
+  --> $DIR/issue-105061-array-lint.rs:6:18
+   |
+LL |     let _y: [u8; (3)];
+   |                  ^ ^
+   |
+help: remove these parentheses
+   |
+LL -     let _y: [u8; (3)];
+LL +     let _y: [u8; 3];
+   |
+
+error: unnecessary parentheses around type
+  --> $DIR/issue-105061-array-lint.rs:7:13
+   |
+LL |     let _z: ([u8; (3)]);
+   |             ^         ^
+   |
+help: remove these parentheses
+   |
+LL -     let _z: ([u8; (3)]);
+LL +     let _z: [u8; (3)];
+   |
+
+error: unnecessary parentheses around const expression
+  --> $DIR/issue-105061-array-lint.rs:7:19
+   |
+LL |     let _z: ([u8; (3)]);
+   |                   ^ ^
+   |
+help: remove these parentheses
+   |
+LL -     let _z: ([u8; (3)]);
+LL +     let _z: ([u8; 3]);
+   |
+
+error: aborting due to 4 previous errors
+
diff --git a/tests/ui/lint/unused/issue-105061-should-lint.rs b/tests/ui/lint/unused/issue-105061-should-lint.rs
new file mode 100644
index 000000000..7e4e09473
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061-should-lint.rs
@@ -0,0 +1,23 @@
+#![warn(unused)]
+#![deny(warnings)]
+
+struct Inv<'a>(&'a mut &'a ());
+
+trait Trait<'a> {}
+impl<'b> Trait<'b> for for<'a> fn(Inv<'a>) {}
+
+fn with_bound()
+where
+    for<'b> (for<'a> fn(Inv<'a>)): Trait<'b>, //~ ERROR unnecessary parentheses around type
+{}
+
+trait Hello<T> {}
+fn with_dyn_bound<T>()
+where
+    (dyn Hello<(for<'b> fn(&'b ()))>): Hello<T> //~ ERROR unnecessary parentheses around type
+{}
+
+fn main() {
+    with_bound();
+    with_dyn_bound();
+}
diff --git a/tests/ui/lint/unused/issue-105061-should-lint.stderr b/tests/ui/lint/unused/issue-105061-should-lint.stderr
new file mode 100644
index 000000000..e591f1ffb
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061-should-lint.stderr
@@ -0,0 +1,32 @@
+error: unnecessary parentheses around type
+  --> $DIR/issue-105061-should-lint.rs:11:13
+   |
+LL |     for<'b> (for<'a> fn(Inv<'a>)): Trait<'b>,
+   |             ^                   ^
+   |
+note: the lint level is defined here
+  --> $DIR/issue-105061-should-lint.rs:2:9
+   |
+LL | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(unused_parens)]` implied by `#[deny(warnings)]`
+help: remove these parentheses
+   |
+LL -     for<'b> (for<'a> fn(Inv<'a>)): Trait<'b>,
+LL +     for<'b> for<'a> fn(Inv<'a>): Trait<'b>,
+   |
+
+error: unnecessary parentheses around type
+  --> $DIR/issue-105061-should-lint.rs:17:16
+   |
+LL |     (dyn Hello<(for<'b> fn(&'b ()))>): Hello<T>
+   |                ^                  ^
+   |
+help: remove these parentheses
+   |
+LL -     (dyn Hello<(for<'b> fn(&'b ()))>): Hello<T>
+LL +     (dyn Hello<for<'b> fn(&'b ())>): Hello<T>
+   |
+
+error: aborting due to 2 previous errors
+
diff --git a/tests/ui/lint/unused/issue-105061.rs b/tests/ui/lint/unused/issue-105061.rs
new file mode 100644
index 000000000..92d636d0a
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061.rs
@@ -0,0 +1,17 @@
+#![warn(unused)]
+#![deny(warnings)]
+
+struct Inv<'a>(&'a mut &'a ());
+
+trait Trait {}
+impl Trait for (for<'a> fn(Inv<'a>),) {}
+
+
+fn with_bound()
+where
+    ((for<'a> fn(Inv<'a>)),): Trait, //~ ERROR unnecessary parentheses around type
+{}
+
+fn main() {
+    with_bound();
+}
diff --git a/tests/ui/lint/unused/issue-105061.stderr b/tests/ui/lint/unused/issue-105061.stderr
new file mode 100644
index 000000000..f07aa2012
--- /dev/null
+++ b/tests/ui/lint/unused/issue-105061.stderr
@@ -0,0 +1,20 @@
+error: unnecessary parentheses around type
+  --> $DIR/issue-105061.rs:12:6
+   |
+LL |     ((for<'a> fn(Inv<'a>)),): Trait,
+   |      ^                   ^
+   |
+note: the lint level is defined here
+  --> $DIR/issue-105061.rs:2:9
+   |
+LL | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(unused_parens)]` implied by `#[deny(warnings)]`
+help: remove these parentheses
+   |
+LL -     ((for<'a> fn(Inv<'a>)),): Trait,
+LL +     (for<'a> fn(Inv<'a>),): Trait,
+   |
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/lint/unused/issue-30730.rs b/tests/ui/lint/unused/issue-30730.rs
index d6be90c81..d6be90c81 100644
--- a/src/test/ui/lint/unused/issue-30730.rs
+++ b/tests/ui/lint/unused/issue-30730.rs
diff --git a/src/test/ui/lint/unused/issue-30730.stderr b/tests/ui/lint/unused/issue-30730.stderr
index b299e99a3..b299e99a3 100644
--- a/src/test/ui/lint/unused/issue-30730.stderr
+++ b/tests/ui/lint/unused/issue-30730.stderr
diff --git a/src/test/ui/lint/unused/issue-46576.rs b/tests/ui/lint/unused/issue-46576.rs
index 15f458f38..15f458f38 100644
--- a/src/test/ui/lint/unused/issue-46576.rs
+++ b/tests/ui/lint/unused/issue-46576.rs
diff --git a/src/test/ui/lint/unused/issue-46576.stderr b/tests/ui/lint/unused/issue-46576.stderr
index 6f4d97068..6f4d97068 100644
--- a/src/test/ui/lint/unused/issue-46576.stderr
+++ b/tests/ui/lint/unused/issue-46576.stderr
diff --git a/src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.rs b/tests/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.rs
index 4822a9b2c..4822a9b2c 100644
--- a/src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.rs
+++ b/tests/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.rs
diff --git a/src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.stderr b/tests/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.stderr
index fe2e3afc8..fe2e3afc8 100644
--- a/src/test/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.stderr
+++ b/tests/ui/lint/unused/issue-47390-unused-variable-in-struct-pattern.stderr
diff --git a/src/test/ui/lint/unused/issue-54180-unused-ref-field.fixed b/tests/ui/lint/unused/issue-54180-unused-ref-field.fixed
index 1350b7ca6..1350b7ca6 100644
--- a/src/test/ui/lint/unused/issue-54180-unused-ref-field.fixed
+++ b/tests/ui/lint/unused/issue-54180-unused-ref-field.fixed
diff --git a/src/test/ui/lint/unused/issue-54180-unused-ref-field.rs b/tests/ui/lint/unused/issue-54180-unused-ref-field.rs
index 7b3392b60..7b3392b60 100644
--- a/src/test/ui/lint/unused/issue-54180-unused-ref-field.rs
+++ b/tests/ui/lint/unused/issue-54180-unused-ref-field.rs
diff --git a/src/test/ui/lint/unused/issue-54180-unused-ref-field.stderr b/tests/ui/lint/unused/issue-54180-unused-ref-field.stderr
index f2e616899..f2e616899 100644
--- a/src/test/ui/lint/unused/issue-54180-unused-ref-field.stderr
+++ b/tests/ui/lint/unused/issue-54180-unused-ref-field.stderr
diff --git a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.fixed b/tests/ui/lint/unused/issue-54538-unused-parens-lint.fixed
index 0b3fe9371..71ebaea8e 100644
--- a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.fixed
+++ b/tests/ui/lint/unused/issue-54538-unused-parens-lint.fixed
@@ -1,6 +1,6 @@
 // run-rustfix
 
-#![feature(box_patterns, stmt_expr_attributes)]
+#![feature(box_patterns, stmt_expr_attributes, yeet_expr)]
 
 #![allow(
     dead_code,
@@ -25,6 +25,13 @@ fn _no_lint_attr() {
     let _x = #[allow(dead_code)] (1 + 2);
 }
 
+fn _no_lint_yeet() -> Result<(), ()> {
+    #[allow(unreachable_code)]
+    if (do yeet) {}
+
+    Ok(())
+}
+
 // Don't lint in these cases (#64106).
 fn or_patterns_no_lint() {
     match Box::new(0) {
diff --git a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.rs b/tests/ui/lint/unused/issue-54538-unused-parens-lint.rs
index 1e78ec5f7..28b662dd0 100644
--- a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.rs
+++ b/tests/ui/lint/unused/issue-54538-unused-parens-lint.rs
@@ -1,6 +1,6 @@
 // run-rustfix
 
-#![feature(box_patterns, stmt_expr_attributes)]
+#![feature(box_patterns, stmt_expr_attributes, yeet_expr)]
 
 #![allow(
     dead_code,
@@ -25,6 +25,13 @@ fn _no_lint_attr() {
     let _x = #[allow(dead_code)] (1 + 2);
 }
 
+fn _no_lint_yeet() -> Result<(), ()> {
+    #[allow(unreachable_code)]
+    if (do yeet) {}
+
+    Ok(())
+}
+
 // Don't lint in these cases (#64106).
 fn or_patterns_no_lint() {
     match Box::new(0) {
diff --git a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.stderr b/tests/ui/lint/unused/issue-54538-unused-parens-lint.stderr
index c73884663..a5e69e6d9 100644
--- a/src/test/ui/lint/unused/issue-54538-unused-parens-lint.stderr
+++ b/tests/ui/lint/unused/issue-54538-unused-parens-lint.stderr
@@ -76,7 +76,7 @@ LL +     let _ = |a: u8| 0;
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:49:12
+  --> $DIR/issue-54538-unused-parens-lint.rs:56:12
    |
 LL |     if let (0 | 1) = 0 {}
    |            ^     ^
@@ -88,7 +88,7 @@ LL +     if let 0 | 1 = 0 {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:50:13
+  --> $DIR/issue-54538-unused-parens-lint.rs:57:13
    |
 LL |     if let ((0 | 1),) = (0,) {}
    |             ^     ^
@@ -100,7 +100,7 @@ LL +     if let (0 | 1,) = (0,) {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:51:13
+  --> $DIR/issue-54538-unused-parens-lint.rs:58:13
    |
 LL |     if let [(0 | 1)] = [0] {}
    |             ^     ^
@@ -112,7 +112,7 @@ LL +     if let [0 | 1] = [0] {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:52:16
+  --> $DIR/issue-54538-unused-parens-lint.rs:59:16
    |
 LL |     if let 0 | (1 | 2) = 0 {}
    |                ^     ^
@@ -124,7 +124,7 @@ LL +     if let 0 | 1 | 2 = 0 {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:54:15
+  --> $DIR/issue-54538-unused-parens-lint.rs:61:15
    |
 LL |     if let TS((0 | 1)) = TS(0) {}
    |               ^     ^
@@ -136,7 +136,7 @@ LL +     if let TS(0 | 1) = TS(0) {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:56:20
+  --> $DIR/issue-54538-unused-parens-lint.rs:63:20
    |
 LL |     if let NS { f: (0 | 1) } = (NS { f: 0 }) {}
    |                    ^     ^
@@ -148,7 +148,7 @@ LL +     if let NS { f: 0 | 1 } = (NS { f: 0 }) {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:66:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:73:9
    |
 LL |         (_) => {}
    |         ^ ^
@@ -160,7 +160,7 @@ LL +         _ => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:67:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:74:9
    |
 LL |         (y) => {}
    |         ^ ^
@@ -172,7 +172,7 @@ LL +         y => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:68:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:75:9
    |
 LL |         (ref r) => {}
    |         ^     ^
@@ -184,7 +184,7 @@ LL +         ref r => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:69:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:76:9
    |
 LL |         (e @ 1...2) => {}
    |         ^         ^
@@ -196,7 +196,7 @@ LL +         e @ 1...2 => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:75:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:82:9
    |
 LL |         (e @ &(1...2)) => {}
    |         ^            ^
@@ -208,7 +208,7 @@ LL +         e @ &(1...2) => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:76:10
+  --> $DIR/issue-54538-unused-parens-lint.rs:83:10
    |
 LL |         &(_) => {}
    |          ^ ^
@@ -220,7 +220,7 @@ LL +         &_ => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:87:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:94:9
    |
 LL |         (_) => {}
    |         ^ ^
@@ -232,7 +232,7 @@ LL +         _ => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:88:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:95:9
    |
 LL |         (y) => {}
    |         ^ ^
@@ -244,7 +244,7 @@ LL +         y => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:89:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:96:9
    |
 LL |         (ref r) => {}
    |         ^     ^
@@ -256,7 +256,7 @@ LL +         ref r => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:90:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:97:9
    |
 LL |         (e @ 1..=2) => {}
    |         ^         ^
@@ -268,7 +268,7 @@ LL +         e @ 1..=2 => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:96:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:103:9
    |
 LL |         (e @ &(1..=2)) => {}
    |         ^            ^
@@ -280,7 +280,7 @@ LL +         e @ &(1..=2) => {}
    |
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:97:10
+  --> $DIR/issue-54538-unused-parens-lint.rs:104:10
    |
 LL |         &(_) => {}
    |          ^ ^
diff --git a/src/test/ui/lint/unused/issue-59896.rs b/tests/ui/lint/unused/issue-59896.rs
index ff9f19acf..ff9f19acf 100644
--- a/src/test/ui/lint/unused/issue-59896.rs
+++ b/tests/ui/lint/unused/issue-59896.rs
diff --git a/src/test/ui/lint/unused/issue-59896.stderr b/tests/ui/lint/unused/issue-59896.stderr
index 95b7938ae..95b7938ae 100644
--- a/src/test/ui/lint/unused/issue-59896.stderr
+++ b/tests/ui/lint/unused/issue-59896.stderr
diff --git a/src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.rs b/tests/ui/lint/unused/issue-67691-unused-field-in-or-pattern.rs
index e3631d014..e3631d014 100644
--- a/src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.rs
+++ b/tests/ui/lint/unused/issue-67691-unused-field-in-or-pattern.rs
diff --git a/src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.stderr b/tests/ui/lint/unused/issue-67691-unused-field-in-or-pattern.stderr
index 8fc2d1bc8..8fc2d1bc8 100644
--- a/src/test/ui/lint/unused/issue-67691-unused-field-in-or-pattern.stderr
+++ b/tests/ui/lint/unused/issue-67691-unused-field-in-or-pattern.stderr
diff --git a/src/test/ui/lint/unused/issue-70041.rs b/tests/ui/lint/unused/issue-70041.rs
index 22e42295e..22e42295e 100644
--- a/src/test/ui/lint/unused/issue-70041.rs
+++ b/tests/ui/lint/unused/issue-70041.rs
diff --git a/src/test/ui/lint/unused/issue-70041.stderr b/tests/ui/lint/unused/issue-70041.stderr
index b2e6d1aeb..b2e6d1aeb 100644
--- a/src/test/ui/lint/unused/issue-70041.stderr
+++ b/tests/ui/lint/unused/issue-70041.stderr
diff --git a/src/test/ui/lint/unused/issue-71290-unused-paren-binop.rs b/tests/ui/lint/unused/issue-71290-unused-paren-binop.rs
index 24d77e36d..24d77e36d 100644
--- a/src/test/ui/lint/unused/issue-71290-unused-paren-binop.rs
+++ b/tests/ui/lint/unused/issue-71290-unused-paren-binop.rs
diff --git a/src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.rs b/tests/ui/lint/unused/issue-74883-unused-paren-baren-yield.rs
index 8064c3a88..8064c3a88 100644
--- a/src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.rs
+++ b/tests/ui/lint/unused/issue-74883-unused-paren-baren-yield.rs
diff --git a/src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.stderr b/tests/ui/lint/unused/issue-74883-unused-paren-baren-yield.stderr
index 3f1fee332..3f1fee332 100644
--- a/src/test/ui/lint/unused/issue-74883-unused-paren-baren-yield.stderr
+++ b/tests/ui/lint/unused/issue-74883-unused-paren-baren-yield.stderr
diff --git a/src/test/ui/lint/unused/issue-81314-unused-span-ident.fixed b/tests/ui/lint/unused/issue-81314-unused-span-ident.fixed
index aac918f2b..aac918f2b 100644
--- a/src/test/ui/lint/unused/issue-81314-unused-span-ident.fixed
+++ b/tests/ui/lint/unused/issue-81314-unused-span-ident.fixed
diff --git a/src/test/ui/lint/unused/issue-81314-unused-span-ident.rs b/tests/ui/lint/unused/issue-81314-unused-span-ident.rs
index 78296f425..78296f425 100644
--- a/src/test/ui/lint/unused/issue-81314-unused-span-ident.rs
+++ b/tests/ui/lint/unused/issue-81314-unused-span-ident.rs
diff --git a/src/test/ui/lint/unused/issue-81314-unused-span-ident.stderr b/tests/ui/lint/unused/issue-81314-unused-span-ident.stderr
index 519c71e94..519c71e94 100644
--- a/src/test/ui/lint/unused/issue-81314-unused-span-ident.stderr
+++ b/tests/ui/lint/unused/issue-81314-unused-span-ident.stderr
diff --git a/src/test/ui/lint/unused/issue-85913.rs b/tests/ui/lint/unused/issue-85913.rs
index 7f3817b6e..7f3817b6e 100644
--- a/src/test/ui/lint/unused/issue-85913.rs
+++ b/tests/ui/lint/unused/issue-85913.rs
diff --git a/src/test/ui/lint/unused/issue-85913.stderr b/tests/ui/lint/unused/issue-85913.stderr
index 8234ed3b1..8234ed3b1 100644
--- a/src/test/ui/lint/unused/issue-85913.stderr
+++ b/tests/ui/lint/unused/issue-85913.stderr
diff --git a/src/test/ui/lint/unused/issue-88519-unused-paren.rs b/tests/ui/lint/unused/issue-88519-unused-paren.rs
index ce3d15ac1..ce3d15ac1 100644
--- a/src/test/ui/lint/unused/issue-88519-unused-paren.rs
+++ b/tests/ui/lint/unused/issue-88519-unused-paren.rs
diff --git a/src/test/ui/lint/unused/issue-90807-unused-paren-error.rs b/tests/ui/lint/unused/issue-90807-unused-paren-error.rs
index 2fca2e262..2fca2e262 100644
--- a/src/test/ui/lint/unused/issue-90807-unused-paren-error.rs
+++ b/tests/ui/lint/unused/issue-90807-unused-paren-error.rs
diff --git a/src/test/ui/lint/unused/issue-90807-unused-paren-error.stderr b/tests/ui/lint/unused/issue-90807-unused-paren-error.stderr
index b3b809d5f..b3b809d5f 100644
--- a/src/test/ui/lint/unused/issue-90807-unused-paren-error.stderr
+++ b/tests/ui/lint/unused/issue-90807-unused-paren-error.stderr
diff --git a/src/test/ui/lint/unused/issue-90807-unused-paren.rs b/tests/ui/lint/unused/issue-90807-unused-paren.rs
index 4c0930f96..4c0930f96 100644
--- a/src/test/ui/lint/unused/issue-90807-unused-paren.rs
+++ b/tests/ui/lint/unused/issue-90807-unused-paren.rs
diff --git a/src/test/ui/lint/unused/issue-92751.rs b/tests/ui/lint/unused/issue-92751.rs
index 2fb292736..2fb292736 100644
--- a/src/test/ui/lint/unused/issue-92751.rs
+++ b/tests/ui/lint/unused/issue-92751.rs
diff --git a/src/test/ui/lint/unused/issue-92751.stderr b/tests/ui/lint/unused/issue-92751.stderr
index 0a8d8e672..0a8d8e672 100644
--- a/src/test/ui/lint/unused/issue-92751.stderr
+++ b/tests/ui/lint/unused/issue-92751.stderr
diff --git a/src/test/ui/lint/unused/lint-unused-extern-crate.rs b/tests/ui/lint/unused/lint-unused-extern-crate.rs
index d5e4da526..d5e4da526 100644
--- a/src/test/ui/lint/unused/lint-unused-extern-crate.rs
+++ b/tests/ui/lint/unused/lint-unused-extern-crate.rs
diff --git a/src/test/ui/lint/unused/lint-unused-extern-crate.stderr b/tests/ui/lint/unused/lint-unused-extern-crate.stderr
index 46d8f3bee..46d8f3bee 100644
--- a/src/test/ui/lint/unused/lint-unused-extern-crate.stderr
+++ b/tests/ui/lint/unused/lint-unused-extern-crate.stderr
diff --git a/src/test/ui/lint/unused/lint-unused-imports.rs b/tests/ui/lint/unused/lint-unused-imports.rs
index 4754d8880..4754d8880 100644
--- a/src/test/ui/lint/unused/lint-unused-imports.rs
+++ b/tests/ui/lint/unused/lint-unused-imports.rs
diff --git a/src/test/ui/lint/unused/lint-unused-imports.stderr b/tests/ui/lint/unused/lint-unused-imports.stderr
index 0574ca456..0574ca456 100644
--- a/src/test/ui/lint/unused/lint-unused-imports.stderr
+++ b/tests/ui/lint/unused/lint-unused-imports.stderr
diff --git a/src/test/ui/lint/unused/lint-unused-mut-self.fixed b/tests/ui/lint/unused/lint-unused-mut-self.fixed
index 92ce10358..92ce10358 100644
--- a/src/test/ui/lint/unused/lint-unused-mut-self.fixed
+++ b/tests/ui/lint/unused/lint-unused-mut-self.fixed
diff --git a/src/test/ui/lint/unused/lint-unused-mut-self.rs b/tests/ui/lint/unused/lint-unused-mut-self.rs
index 70736ce21..70736ce21 100644
--- a/src/test/ui/lint/unused/lint-unused-mut-self.rs
+++ b/tests/ui/lint/unused/lint-unused-mut-self.rs
diff --git a/src/test/ui/lint/unused/lint-unused-mut-self.stderr b/tests/ui/lint/unused/lint-unused-mut-self.stderr
index 01a524bd3..01a524bd3 100644
--- a/src/test/ui/lint/unused/lint-unused-mut-self.stderr
+++ b/tests/ui/lint/unused/lint-unused-mut-self.stderr
diff --git a/src/test/ui/lint/unused/lint-unused-mut-variables.rs b/tests/ui/lint/unused/lint-unused-mut-variables.rs
index 67ec7facf..67ec7facf 100644
--- a/src/test/ui/lint/unused/lint-unused-mut-variables.rs
+++ b/tests/ui/lint/unused/lint-unused-mut-variables.rs
diff --git a/src/test/ui/lint/unused/lint-unused-mut-variables.stderr b/tests/ui/lint/unused/lint-unused-mut-variables.stderr
index 805ed2b40..805ed2b40 100644
--- a/src/test/ui/lint/unused/lint-unused-mut-variables.stderr
+++ b/tests/ui/lint/unused/lint-unused-mut-variables.stderr
diff --git a/src/test/ui/lint/unused/lint-unused-variables.rs b/tests/ui/lint/unused/lint-unused-variables.rs
index 6850e9992..6850e9992 100644
--- a/src/test/ui/lint/unused/lint-unused-variables.rs
+++ b/tests/ui/lint/unused/lint-unused-variables.rs
diff --git a/src/test/ui/lint/unused/lint-unused-variables.stderr b/tests/ui/lint/unused/lint-unused-variables.stderr
index fd9a5bcbf..fd9a5bcbf 100644
--- a/src/test/ui/lint/unused/lint-unused-variables.stderr
+++ b/tests/ui/lint/unused/lint-unused-variables.stderr
diff --git a/src/test/ui/lint/unused/must-use-box-from-raw.rs b/tests/ui/lint/unused/must-use-box-from-raw.rs
index 9ea772689..9ea772689 100644
--- a/src/test/ui/lint/unused/must-use-box-from-raw.rs
+++ b/tests/ui/lint/unused/must-use-box-from-raw.rs
diff --git a/src/test/ui/lint/unused/must-use-box-from-raw.stderr b/tests/ui/lint/unused/must-use-box-from-raw.stderr
index 721182757..47ab613be 100644
--- a/src/test/ui/lint/unused/must-use-box-from-raw.stderr
+++ b/tests/ui/lint/unused/must-use-box-from-raw.stderr
@@ -4,7 +4,7 @@ warning: unused return value of `Box::<T>::from_raw` that must be used
 LL |     Box::from_raw(ptr);
    |     ^^^^^^^^^^^^^^^^^^
    |
-   = note: call `drop(from_raw(ptr))` if you intend to drop the `Box`
+   = note: call `drop(Box::from_raw(ptr))` if you intend to drop the `Box`
 note: the lint level is defined here
   --> $DIR/must-use-box-from-raw.rs:5:9
    |
diff --git a/src/test/ui/lint/unused/must-use-ops.rs b/tests/ui/lint/unused/must-use-ops.rs
index 60f877aa8..60f877aa8 100644
--- a/src/test/ui/lint/unused/must-use-ops.rs
+++ b/tests/ui/lint/unused/must-use-ops.rs
diff --git a/src/test/ui/lint/unused/must-use-ops.stderr b/tests/ui/lint/unused/must-use-ops.stderr
index 79a53d39c..79a53d39c 100644
--- a/src/test/ui/lint/unused/must-use-ops.stderr
+++ b/tests/ui/lint/unused/must-use-ops.stderr
diff --git a/src/test/ui/lint/unused/must_use-array.rs b/tests/ui/lint/unused/must_use-array.rs
index b7bae4b0a..b7bae4b0a 100644
--- a/src/test/ui/lint/unused/must_use-array.rs
+++ b/tests/ui/lint/unused/must_use-array.rs
diff --git a/src/test/ui/lint/unused/must_use-array.stderr b/tests/ui/lint/unused/must_use-array.stderr
index 61ef2088d..61ef2088d 100644
--- a/src/test/ui/lint/unused/must_use-array.stderr
+++ b/tests/ui/lint/unused/must_use-array.stderr
diff --git a/src/test/ui/lint/unused/must_use-in-stdlib-traits.rs b/tests/ui/lint/unused/must_use-in-stdlib-traits.rs
index 70dddf61f..70dddf61f 100644
--- a/src/test/ui/lint/unused/must_use-in-stdlib-traits.rs
+++ b/tests/ui/lint/unused/must_use-in-stdlib-traits.rs
diff --git a/src/test/ui/lint/unused/must_use-in-stdlib-traits.stderr b/tests/ui/lint/unused/must_use-in-stdlib-traits.stderr
index ef738708d..ef738708d 100644
--- a/src/test/ui/lint/unused/must_use-in-stdlib-traits.stderr
+++ b/tests/ui/lint/unused/must_use-in-stdlib-traits.stderr
diff --git a/src/test/ui/lint/unused/must_use-trait.rs b/tests/ui/lint/unused/must_use-trait.rs
index 0aa751443..0aa751443 100644
--- a/src/test/ui/lint/unused/must_use-trait.rs
+++ b/tests/ui/lint/unused/must_use-trait.rs
diff --git a/src/test/ui/lint/unused/must_use-trait.stderr b/tests/ui/lint/unused/must_use-trait.stderr
index 2f5496484..2f5496484 100644
--- a/src/test/ui/lint/unused/must_use-trait.stderr
+++ b/tests/ui/lint/unused/must_use-trait.stderr
diff --git a/src/test/ui/lint/unused/must_use-tuple.rs b/tests/ui/lint/unused/must_use-tuple.rs
index 0f0aa2025..0f0aa2025 100644
--- a/src/test/ui/lint/unused/must_use-tuple.rs
+++ b/tests/ui/lint/unused/must_use-tuple.rs
diff --git a/src/test/ui/lint/unused/must_use-tuple.stderr b/tests/ui/lint/unused/must_use-tuple.stderr
index 63e0318fb..63e0318fb 100644
--- a/src/test/ui/lint/unused/must_use-tuple.stderr
+++ b/tests/ui/lint/unused/must_use-tuple.stderr
diff --git a/src/test/ui/lint/unused/must_use-unit.rs b/tests/ui/lint/unused/must_use-unit.rs
index 4dd4798ab..4dd4798ab 100644
--- a/src/test/ui/lint/unused/must_use-unit.rs
+++ b/tests/ui/lint/unused/must_use-unit.rs
diff --git a/src/test/ui/lint/unused/must_use-unit.stderr b/tests/ui/lint/unused/must_use-unit.stderr
index 9fcbc5074..9fcbc5074 100644
--- a/src/test/ui/lint/unused/must_use-unit.stderr
+++ b/tests/ui/lint/unused/must_use-unit.stderr
diff --git a/src/test/ui/lint/unused/no-unused-parens-return-block.rs b/tests/ui/lint/unused/no-unused-parens-return-block.rs
index 37dc519a2..37dc519a2 100644
--- a/src/test/ui/lint/unused/no-unused-parens-return-block.rs
+++ b/tests/ui/lint/unused/no-unused-parens-return-block.rs
diff --git a/src/test/ui/lint/unused/unused-async.rs b/tests/ui/lint/unused/unused-async.rs
index 4be93aa15..4be93aa15 100644
--- a/src/test/ui/lint/unused/unused-async.rs
+++ b/tests/ui/lint/unused/unused-async.rs
diff --git a/src/test/ui/lint/unused/unused-async.stderr b/tests/ui/lint/unused/unused-async.stderr
index 4bcb26dc1..4bcb26dc1 100644
--- a/src/test/ui/lint/unused/unused-async.stderr
+++ b/tests/ui/lint/unused/unused-async.stderr
diff --git a/src/test/ui/lint/unused/unused-attr-duplicate.rs b/tests/ui/lint/unused/unused-attr-duplicate.rs
index 692617eac..692617eac 100644
--- a/src/test/ui/lint/unused/unused-attr-duplicate.rs
+++ b/tests/ui/lint/unused/unused-attr-duplicate.rs
diff --git a/src/test/ui/lint/unused/unused-attr-duplicate.stderr b/tests/ui/lint/unused/unused-attr-duplicate.stderr
index 769b17487..769b17487 100644
--- a/src/test/ui/lint/unused/unused-attr-duplicate.stderr
+++ b/tests/ui/lint/unused/unused-attr-duplicate.stderr
diff --git a/src/test/ui/lint/unused/unused-attr-macro-rules.rs b/tests/ui/lint/unused/unused-attr-macro-rules.rs
index c0fc280ab..c0fc280ab 100644
--- a/src/test/ui/lint/unused/unused-attr-macro-rules.rs
+++ b/tests/ui/lint/unused/unused-attr-macro-rules.rs
diff --git a/src/test/ui/lint/unused/unused-attr-macro-rules.stderr b/tests/ui/lint/unused/unused-attr-macro-rules.stderr
index e3ca90d9a..e3ca90d9a 100644
--- a/src/test/ui/lint/unused/unused-attr-macro-rules.stderr
+++ b/tests/ui/lint/unused/unused-attr-macro-rules.stderr
diff --git a/src/test/ui/lint/unused/unused-closure.rs b/tests/ui/lint/unused/unused-closure.rs
index c96c90731..c96c90731 100644
--- a/src/test/ui/lint/unused/unused-closure.rs
+++ b/tests/ui/lint/unused/unused-closure.rs
diff --git a/src/test/ui/lint/unused/unused-closure.stderr b/tests/ui/lint/unused/unused-closure.stderr
index c3a82402e..c3a82402e 100644
--- a/src/test/ui/lint/unused/unused-closure.stderr
+++ b/tests/ui/lint/unused/unused-closure.stderr
diff --git a/src/test/ui/lint/unused/unused-doc-comments-edge-cases.rs b/tests/ui/lint/unused/unused-doc-comments-edge-cases.rs
index 54d86c31f..54d86c31f 100644
--- a/src/test/ui/lint/unused/unused-doc-comments-edge-cases.rs
+++ b/tests/ui/lint/unused/unused-doc-comments-edge-cases.rs
diff --git a/src/test/ui/lint/unused/unused-doc-comments-edge-cases.stderr b/tests/ui/lint/unused/unused-doc-comments-edge-cases.stderr
index 078b780d8..078b780d8 100644
--- a/src/test/ui/lint/unused/unused-doc-comments-edge-cases.stderr
+++ b/tests/ui/lint/unused/unused-doc-comments-edge-cases.stderr
diff --git a/src/test/ui/lint/unused/unused-doc-comments-for-macros.rs b/tests/ui/lint/unused/unused-doc-comments-for-macros.rs
index 05828ebb2..05828ebb2 100644
--- a/src/test/ui/lint/unused/unused-doc-comments-for-macros.rs
+++ b/tests/ui/lint/unused/unused-doc-comments-for-macros.rs
diff --git a/src/test/ui/lint/unused/unused-doc-comments-for-macros.stderr b/tests/ui/lint/unused/unused-doc-comments-for-macros.stderr
index 26b1c2b05..26b1c2b05 100644
--- a/src/test/ui/lint/unused/unused-doc-comments-for-macros.stderr
+++ b/tests/ui/lint/unused/unused-doc-comments-for-macros.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-rules-compile-error.rs b/tests/ui/lint/unused/unused-macro-rules-compile-error.rs
index 4d51db89b..4d51db89b 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-compile-error.rs
+++ b/tests/ui/lint/unused/unused-macro-rules-compile-error.rs
diff --git a/src/test/ui/lint/unused/unused-macro-rules-compile-error.stderr b/tests/ui/lint/unused/unused-macro-rules-compile-error.stderr
index 76af8c967..76af8c967 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-compile-error.stderr
+++ b/tests/ui/lint/unused/unused-macro-rules-compile-error.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-rules-decl.rs b/tests/ui/lint/unused/unused-macro-rules-decl.rs
index 537c84940..537c84940 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-decl.rs
+++ b/tests/ui/lint/unused/unused-macro-rules-decl.rs
diff --git a/src/test/ui/lint/unused/unused-macro-rules-decl.stderr b/tests/ui/lint/unused/unused-macro-rules-decl.stderr
index 4d9b22fed..4d9b22fed 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-decl.stderr
+++ b/tests/ui/lint/unused/unused-macro-rules-decl.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-rules-malformed-rule.rs b/tests/ui/lint/unused/unused-macro-rules-malformed-rule.rs
index a826026ec..a826026ec 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-malformed-rule.rs
+++ b/tests/ui/lint/unused/unused-macro-rules-malformed-rule.rs
diff --git a/src/test/ui/lint/unused/unused-macro-rules-malformed-rule.stderr b/tests/ui/lint/unused/unused-macro-rules-malformed-rule.stderr
index 797c86710..797c86710 100644
--- a/src/test/ui/lint/unused/unused-macro-rules-malformed-rule.stderr
+++ b/tests/ui/lint/unused/unused-macro-rules-malformed-rule.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-rules.rs b/tests/ui/lint/unused/unused-macro-rules.rs
index eeaf4d1b0..eeaf4d1b0 100644
--- a/src/test/ui/lint/unused/unused-macro-rules.rs
+++ b/tests/ui/lint/unused/unused-macro-rules.rs
diff --git a/src/test/ui/lint/unused/unused-macro-rules.stderr b/tests/ui/lint/unused/unused-macro-rules.stderr
index 2b3098a51..2b3098a51 100644
--- a/src/test/ui/lint/unused/unused-macro-rules.stderr
+++ b/tests/ui/lint/unused/unused-macro-rules.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.rs b/tests/ui/lint/unused/unused-macro-with-bad-frag-spec.rs
index ce187047b..ce187047b 100644
--- a/src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.rs
+++ b/tests/ui/lint/unused/unused-macro-with-bad-frag-spec.rs
diff --git a/src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr b/tests/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr
index 6edf0a2cf..6edf0a2cf 100644
--- a/src/test/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr
+++ b/tests/ui/lint/unused/unused-macro-with-bad-frag-spec.stderr
diff --git a/src/test/ui/lint/unused/unused-macro-with-follow-violation.rs b/tests/ui/lint/unused/unused-macro-with-follow-violation.rs
index 1666dae69..1666dae69 100644
--- a/src/test/ui/lint/unused/unused-macro-with-follow-violation.rs
+++ b/tests/ui/lint/unused/unused-macro-with-follow-violation.rs
diff --git a/src/test/ui/lint/unused/unused-macro-with-follow-violation.stderr b/tests/ui/lint/unused/unused-macro-with-follow-violation.stderr
index 5eced4f06..5eced4f06 100644
--- a/src/test/ui/lint/unused/unused-macro-with-follow-violation.stderr
+++ b/tests/ui/lint/unused/unused-macro-with-follow-violation.stderr
diff --git a/src/test/ui/lint/unused/unused-macros-decl.rs b/tests/ui/lint/unused/unused-macros-decl.rs
index 21f6108b1..21f6108b1 100644
--- a/src/test/ui/lint/unused/unused-macros-decl.rs
+++ b/tests/ui/lint/unused/unused-macros-decl.rs
diff --git a/src/test/ui/lint/unused/unused-macros-decl.stderr b/tests/ui/lint/unused/unused-macros-decl.stderr
index 1f426b9d9..1f426b9d9 100644
--- a/src/test/ui/lint/unused/unused-macros-decl.stderr
+++ b/tests/ui/lint/unused/unused-macros-decl.stderr
diff --git a/src/test/ui/lint/unused/unused-macros-malformed-rule.rs b/tests/ui/lint/unused/unused-macros-malformed-rule.rs
index d4c35fad9..d4c35fad9 100644
--- a/src/test/ui/lint/unused/unused-macros-malformed-rule.rs
+++ b/tests/ui/lint/unused/unused-macros-malformed-rule.rs
diff --git a/src/test/ui/lint/unused/unused-macros-malformed-rule.stderr b/tests/ui/lint/unused/unused-macros-malformed-rule.stderr
index 9a880dccf..9a880dccf 100644
--- a/src/test/ui/lint/unused/unused-macros-malformed-rule.stderr
+++ b/tests/ui/lint/unused/unused-macros-malformed-rule.stderr
diff --git a/src/test/ui/lint/unused/unused-macros.rs b/tests/ui/lint/unused/unused-macros.rs
index 70b50b208..70b50b208 100644
--- a/src/test/ui/lint/unused/unused-macros.rs
+++ b/tests/ui/lint/unused/unused-macros.rs
diff --git a/src/test/ui/lint/unused/unused-macros.stderr b/tests/ui/lint/unused/unused-macros.stderr
index d0baf5bec..d0baf5bec 100644
--- a/src/test/ui/lint/unused/unused-macros.stderr
+++ b/tests/ui/lint/unused/unused-macros.stderr
diff --git a/src/test/ui/lint/unused/unused-mut-warning-captured-var.fixed b/tests/ui/lint/unused/unused-mut-warning-captured-var.fixed
index c21f18015..c21f18015 100644
--- a/src/test/ui/lint/unused/unused-mut-warning-captured-var.fixed
+++ b/tests/ui/lint/unused/unused-mut-warning-captured-var.fixed
diff --git a/src/test/ui/lint/unused/unused-mut-warning-captured-var.rs b/tests/ui/lint/unused/unused-mut-warning-captured-var.rs
index 3119d83a0..3119d83a0 100644
--- a/src/test/ui/lint/unused/unused-mut-warning-captured-var.rs
+++ b/tests/ui/lint/unused/unused-mut-warning-captured-var.rs
diff --git a/src/test/ui/lint/unused/unused-mut-warning-captured-var.stderr b/tests/ui/lint/unused/unused-mut-warning-captured-var.stderr
index 20aeedcc2..20aeedcc2 100644
--- a/src/test/ui/lint/unused/unused-mut-warning-captured-var.stderr
+++ b/tests/ui/lint/unused/unused-mut-warning-captured-var.stderr
diff --git a/src/test/ui/lint/unused/unused-result.rs b/tests/ui/lint/unused/unused-result.rs
index e283eaa88..e283eaa88 100644
--- a/src/test/ui/lint/unused/unused-result.rs
+++ b/tests/ui/lint/unused/unused-result.rs
diff --git a/src/test/ui/lint/unused/unused-result.stderr b/tests/ui/lint/unused/unused-result.stderr
index 4e1ba1fd9..4e1ba1fd9 100644
--- a/src/test/ui/lint/unused/unused-result.stderr
+++ b/tests/ui/lint/unused/unused-result.stderr
diff --git a/src/test/ui/lint/unused/unused-supertrait.rs b/tests/ui/lint/unused/unused-supertrait.rs
index 64a8e5204..64a8e5204 100644
--- a/src/test/ui/lint/unused/unused-supertrait.rs
+++ b/tests/ui/lint/unused/unused-supertrait.rs
diff --git a/src/test/ui/lint/unused/unused-supertrait.stderr b/tests/ui/lint/unused/unused-supertrait.stderr
index cb45add9c..cb45add9c 100644
--- a/src/test/ui/lint/unused/unused-supertrait.stderr
+++ b/tests/ui/lint/unused/unused-supertrait.stderr
diff --git a/src/test/ui/lint/unused/unused_attributes-must_use.rs b/tests/ui/lint/unused/unused_attributes-must_use.rs
index 51f868706..51f868706 100644
--- a/src/test/ui/lint/unused/unused_attributes-must_use.rs
+++ b/tests/ui/lint/unused/unused_attributes-must_use.rs
diff --git a/src/test/ui/lint/unused/unused_attributes-must_use.stderr b/tests/ui/lint/unused/unused_attributes-must_use.stderr
index 0f699429e..0f699429e 100644
--- a/src/test/ui/lint/unused/unused_attributes-must_use.stderr
+++ b/tests/ui/lint/unused/unused_attributes-must_use.stderr
diff --git a/src/test/ui/lint/unused/useless-comment.rs b/tests/ui/lint/unused/useless-comment.rs
index 7d2e5ab6f..7d2e5ab6f 100644
--- a/src/test/ui/lint/unused/useless-comment.rs
+++ b/tests/ui/lint/unused/useless-comment.rs
diff --git a/src/test/ui/lint/unused/useless-comment.stderr b/tests/ui/lint/unused/useless-comment.stderr
index 8bb5bdaeb..8bb5bdaeb 100644
--- a/src/test/ui/lint/unused/useless-comment.stderr
+++ b/tests/ui/lint/unused/useless-comment.stderr
diff --git a/tests/ui/lint/unused_braces.fixed b/tests/ui/lint/unused_braces.fixed
new file mode 100644
index 000000000..e691fb37e
--- /dev/null
+++ b/tests/ui/lint/unused_braces.fixed
@@ -0,0 +1,57 @@
+// check-pass
+// run-rustfix
+
+#![warn(unused_braces, unused_parens)]
+#![allow(unreachable_code, unused_unsafe)] // for rustfix
+
+fn consume<T>(_: T) {}
+
+fn main() {
+    let _ = 7;
+    //~^WARN unnecessary parentheses
+
+    // Do not emit a lint in these cases,
+    // as we have to be careful with
+    // `ref` patterns.
+    {
+        let _ = { 7 };
+
+        if let 7 = { 7 } { }
+
+        match { 7 } {
+            _ => (),
+        }
+    }
+
+    if true {
+        //~^ WARN unnecessary braces
+    }
+
+    while false {
+        //~^ WARN unnecessary braces
+    }
+
+    let _: [u8; 3];
+    //~^ WARN unnecessary braces
+
+    consume(7);
+    //~^ WARN unnecessary braces
+
+    // Do not emit lint for multiline blocks.
+    let _ = {
+        7
+    };
+
+    // Do not emit lint for unsafe blocks.
+    let _ = unsafe { 7 };
+
+    // Do not emit lint, as the `{` would then
+    // be parsed as part of the `return`.
+    if { return } {
+
+    }
+
+    // regression test for https://github.com/rust-lang/rust/issues/106899
+    return println!("!");
+    //~^ WARN unnecessary braces
+}
diff --git a/tests/ui/lint/unused_braces.rs b/tests/ui/lint/unused_braces.rs
new file mode 100644
index 000000000..0d260d2cb
--- /dev/null
+++ b/tests/ui/lint/unused_braces.rs
@@ -0,0 +1,57 @@
+// check-pass
+// run-rustfix
+
+#![warn(unused_braces, unused_parens)]
+#![allow(unreachable_code, unused_unsafe)] // for rustfix
+
+fn consume<T>(_: T) {}
+
+fn main() {
+    let _ = (7);
+    //~^WARN unnecessary parentheses
+
+    // Do not emit a lint in these cases,
+    // as we have to be careful with
+    // `ref` patterns.
+    {
+        let _ = { 7 };
+
+        if let 7 = { 7 } { }
+
+        match { 7 } {
+            _ => (),
+        }
+    }
+
+    if { true } {
+        //~^ WARN unnecessary braces
+    }
+
+    while { false } {
+        //~^ WARN unnecessary braces
+    }
+
+    let _: [u8; { 3 }];
+    //~^ WARN unnecessary braces
+
+    consume({ 7 });
+    //~^ WARN unnecessary braces
+
+    // Do not emit lint for multiline blocks.
+    let _ = {
+        7
+    };
+
+    // Do not emit lint for unsafe blocks.
+    let _ = unsafe { 7 };
+
+    // Do not emit lint, as the `{` would then
+    // be parsed as part of the `return`.
+    if { return } {
+
+    }
+
+    // regression test for https://github.com/rust-lang/rust/issues/106899
+    return { println!("!") };
+    //~^ WARN unnecessary braces
+}
diff --git a/tests/ui/lint/unused_braces.stderr b/tests/ui/lint/unused_braces.stderr
new file mode 100644
index 000000000..0b4a1c321
--- /dev/null
+++ b/tests/ui/lint/unused_braces.stderr
@@ -0,0 +1,84 @@
+warning: unnecessary parentheses around assigned value
+  --> $DIR/unused_braces.rs:10:13
+   |
+LL |     let _ = (7);
+   |             ^ ^
+   |
+note: the lint level is defined here
+  --> $DIR/unused_braces.rs:4:24
+   |
+LL | #![warn(unused_braces, unused_parens)]
+   |                        ^^^^^^^^^^^^^
+help: remove these parentheses
+   |
+LL -     let _ = (7);
+LL +     let _ = 7;
+   |
+
+warning: unnecessary braces around `if` condition
+  --> $DIR/unused_braces.rs:26:8
+   |
+LL |     if { true } {
+   |        ^^    ^^
+   |
+note: the lint level is defined here
+  --> $DIR/unused_braces.rs:4:9
+   |
+LL | #![warn(unused_braces, unused_parens)]
+   |         ^^^^^^^^^^^^^
+help: remove these braces
+   |
+LL -     if { true } {
+LL +     if true {
+   |
+
+warning: unnecessary braces around `while` condition
+  --> $DIR/unused_braces.rs:30:11
+   |
+LL |     while { false } {
+   |           ^^     ^^
+   |
+help: remove these braces
+   |
+LL -     while { false } {
+LL +     while false {
+   |
+
+warning: unnecessary braces around const expression
+  --> $DIR/unused_braces.rs:34:17
+   |
+LL |     let _: [u8; { 3 }];
+   |                 ^^ ^^
+   |
+help: remove these braces
+   |
+LL -     let _: [u8; { 3 }];
+LL +     let _: [u8; 3];
+   |
+
+warning: unnecessary braces around function argument
+  --> $DIR/unused_braces.rs:37:13
+   |
+LL |     consume({ 7 });
+   |             ^^ ^^
+   |
+help: remove these braces
+   |
+LL -     consume({ 7 });
+LL +     consume(7);
+   |
+
+warning: unnecessary braces around `return` value
+  --> $DIR/unused_braces.rs:55:12
+   |
+LL |     return { println!("!") };
+   |            ^^             ^^
+   |
+help: remove these braces
+   |
+LL -     return { println!("!") };
+LL +     return println!("!");
+   |
+
+warning: 6 warnings emitted
+
diff --git a/src/test/ui/lint/unused_braces_borrow.fixed b/tests/ui/lint/unused_braces_borrow.fixed
index 583506f89..583506f89 100644
--- a/src/test/ui/lint/unused_braces_borrow.fixed
+++ b/tests/ui/lint/unused_braces_borrow.fixed
diff --git a/src/test/ui/lint/unused_braces_borrow.rs b/tests/ui/lint/unused_braces_borrow.rs
index b7c529d73..b7c529d73 100644
--- a/src/test/ui/lint/unused_braces_borrow.rs
+++ b/tests/ui/lint/unused_braces_borrow.rs
diff --git a/src/test/ui/lint/unused_braces_borrow.stderr b/tests/ui/lint/unused_braces_borrow.stderr
index 05f7432b8..05f7432b8 100644
--- a/src/test/ui/lint/unused_braces_borrow.stderr
+++ b/tests/ui/lint/unused_braces_borrow.stderr
diff --git a/tests/ui/lint/unused_braces_macro.rs b/tests/ui/lint/unused_braces_macro.rs
new file mode 100644
index 000000000..bfee95378
--- /dev/null
+++ b/tests/ui/lint/unused_braces_macro.rs
@@ -0,0 +1,6 @@
+// build-pass
+pub fn foo<const BAR: bool> () {}
+
+fn main() {
+    foo::<{cfg!(feature = "foo")}>();
+}
diff --git a/src/test/ui/lint/unused_import_warning_issue_45268.rs b/tests/ui/lint/unused_import_warning_issue_45268.rs
index 5ae482863..5ae482863 100644
--- a/src/test/ui/lint/unused_import_warning_issue_45268.rs
+++ b/tests/ui/lint/unused_import_warning_issue_45268.rs
diff --git a/src/test/ui/lint/unused_import_warning_issue_45268.stderr b/tests/ui/lint/unused_import_warning_issue_45268.stderr
index fa8699abc..fa8699abc 100644
--- a/src/test/ui/lint/unused_import_warning_issue_45268.stderr
+++ b/tests/ui/lint/unused_import_warning_issue_45268.stderr
diff --git a/src/test/ui/lint/unused_labels.rs b/tests/ui/lint/unused_labels.rs
index 87a5392fd..87a5392fd 100644
--- a/src/test/ui/lint/unused_labels.rs
+++ b/tests/ui/lint/unused_labels.rs
diff --git a/src/test/ui/lint/unused_labels.stderr b/tests/ui/lint/unused_labels.stderr
index 846da792b..846da792b 100644
--- a/src/test/ui/lint/unused_labels.stderr
+++ b/tests/ui/lint/unused_labels.stderr
diff --git a/src/test/ui/lint/unused_parens_json_suggestion.fixed b/tests/ui/lint/unused_parens_json_suggestion.fixed
index c40045404..c40045404 100644
--- a/src/test/ui/lint/unused_parens_json_suggestion.fixed
+++ b/tests/ui/lint/unused_parens_json_suggestion.fixed
diff --git a/src/test/ui/lint/unused_parens_json_suggestion.rs b/tests/ui/lint/unused_parens_json_suggestion.rs
index 962c8bdd7..962c8bdd7 100644
--- a/src/test/ui/lint/unused_parens_json_suggestion.rs
+++ b/tests/ui/lint/unused_parens_json_suggestion.rs
diff --git a/src/test/ui/lint/unused_parens_json_suggestion.stderr b/tests/ui/lint/unused_parens_json_suggestion.stderr
index ea19e0cdc..ea19e0cdc 100644
--- a/src/test/ui/lint/unused_parens_json_suggestion.stderr
+++ b/tests/ui/lint/unused_parens_json_suggestion.stderr
diff --git a/src/test/ui/lint/unused_parens_multibyte_recovery.rs b/tests/ui/lint/unused_parens_multibyte_recovery.rs
index 8fcfae22a..8fcfae22a 100644
--- a/src/test/ui/lint/unused_parens_multibyte_recovery.rs
+++ b/tests/ui/lint/unused_parens_multibyte_recovery.rs
diff --git a/src/test/ui/lint/unused_parens_multibyte_recovery.stderr b/tests/ui/lint/unused_parens_multibyte_recovery.stderr
index a0302b17e..a0302b17e 100644
--- a/src/test/ui/lint/unused_parens_multibyte_recovery.stderr
+++ b/tests/ui/lint/unused_parens_multibyte_recovery.stderr
diff --git a/src/test/ui/lint/unused_parens_remove_json_suggestion.fixed b/tests/ui/lint/unused_parens_remove_json_suggestion.fixed
index 8a57cd573..8a57cd573 100644
--- a/src/test/ui/lint/unused_parens_remove_json_suggestion.fixed
+++ b/tests/ui/lint/unused_parens_remove_json_suggestion.fixed
diff --git a/src/test/ui/lint/unused_parens_remove_json_suggestion.rs b/tests/ui/lint/unused_parens_remove_json_suggestion.rs
index 952332d54..952332d54 100644
--- a/src/test/ui/lint/unused_parens_remove_json_suggestion.rs
+++ b/tests/ui/lint/unused_parens_remove_json_suggestion.rs
diff --git a/src/test/ui/lint/unused_parens_remove_json_suggestion.stderr b/tests/ui/lint/unused_parens_remove_json_suggestion.stderr
index f4c6ceaf1..f4c6ceaf1 100644
--- a/src/test/ui/lint/unused_parens_remove_json_suggestion.stderr
+++ b/tests/ui/lint/unused_parens_remove_json_suggestion.stderr
diff --git a/src/test/ui/lint/unused_variables-issue-82488.fixed b/tests/ui/lint/unused_variables-issue-82488.fixed
index 3cb2c90d0..3cb2c90d0 100644
--- a/src/test/ui/lint/unused_variables-issue-82488.fixed
+++ b/tests/ui/lint/unused_variables-issue-82488.fixed
diff --git a/src/test/ui/lint/unused_variables-issue-82488.rs b/tests/ui/lint/unused_variables-issue-82488.rs
index 007b0799b..007b0799b 100644
--- a/src/test/ui/lint/unused_variables-issue-82488.rs
+++ b/tests/ui/lint/unused_variables-issue-82488.rs
diff --git a/src/test/ui/lint/unused_variables-issue-82488.stderr b/tests/ui/lint/unused_variables-issue-82488.stderr
index dce03a0f7..dce03a0f7 100644
--- a/src/test/ui/lint/unused_variables-issue-82488.stderr
+++ b/tests/ui/lint/unused_variables-issue-82488.stderr
diff --git a/src/test/ui/lint/use-redundant.rs b/tests/ui/lint/use-redundant.rs
index 53315dcf6..53315dcf6 100644
--- a/src/test/ui/lint/use-redundant.rs
+++ b/tests/ui/lint/use-redundant.rs
diff --git a/src/test/ui/lint/use-redundant.stderr b/tests/ui/lint/use-redundant.stderr
index c861a1956..c861a1956 100644
--- a/src/test/ui/lint/use-redundant.stderr
+++ b/tests/ui/lint/use-redundant.stderr
diff --git a/src/test/ui/lint/use_suggestion_json.rs b/tests/ui/lint/use_suggestion_json.rs
index 7d641e08b..7d641e08b 100644
--- a/src/test/ui/lint/use_suggestion_json.rs
+++ b/tests/ui/lint/use_suggestion_json.rs
diff --git a/src/test/ui/lint/use_suggestion_json.stderr b/tests/ui/lint/use_suggestion_json.stderr
index d17514303..d17514303 100644
--- a/src/test/ui/lint/use_suggestion_json.stderr
+++ b/tests/ui/lint/use_suggestion_json.stderr
diff --git a/src/test/ui/lint/warn-ctypes-inhibit.rs b/tests/ui/lint/warn-ctypes-inhibit.rs
index 15d8b09d2..15d8b09d2 100644
--- a/src/test/ui/lint/warn-ctypes-inhibit.rs
+++ b/tests/ui/lint/warn-ctypes-inhibit.rs
diff --git a/src/test/ui/lint/warn-path-statement.rs b/tests/ui/lint/warn-path-statement.rs
index 2435be623..2435be623 100644
--- a/src/test/ui/lint/warn-path-statement.rs
+++ b/tests/ui/lint/warn-path-statement.rs
diff --git a/src/test/ui/lint/warn-path-statement.stderr b/tests/ui/lint/warn-path-statement.stderr
index 248d2ef29..248d2ef29 100644
--- a/src/test/ui/lint/warn-path-statement.stderr
+++ b/tests/ui/lint/warn-path-statement.stderr
diff --git a/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.rs b/tests/ui/lint/warn-unused-inline-on-fn-prototypes.rs
index 4684fe145..4684fe145 100644
--- a/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.rs
+++ b/tests/ui/lint/warn-unused-inline-on-fn-prototypes.rs
diff --git a/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.stderr b/tests/ui/lint/warn-unused-inline-on-fn-prototypes.stderr
index ab19d80e7..ab19d80e7 100644
--- a/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.stderr
+++ b/tests/ui/lint/warn-unused-inline-on-fn-prototypes.stderr