Merging upstream version 1.68.2+dfsg1.

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

131 files changed, 4 insertions, 7 deletions

diff --git a/src/test/ui/hygiene/arguments.rs b/tests/ui/hygiene/arguments.rs
index f0f732f4c..f0f732f4c 100644
--- a/src/test/ui/hygiene/arguments.rs
+++ b/tests/ui/hygiene/arguments.rs
diff --git a/src/test/ui/hygiene/arguments.stderr b/tests/ui/hygiene/arguments.stderr
index d072086e0..d072086e0 100644
--- a/src/test/ui/hygiene/arguments.stderr
+++ b/tests/ui/hygiene/arguments.stderr
diff --git a/src/test/ui/hygiene/assoc_item_ctxt.rs b/tests/ui/hygiene/assoc_item_ctxt.rs
index 65593d1d5..65593d1d5 100644
--- a/src/test/ui/hygiene/assoc_item_ctxt.rs
+++ b/tests/ui/hygiene/assoc_item_ctxt.rs
diff --git a/src/test/ui/hygiene/assoc_item_ctxt.stderr b/tests/ui/hygiene/assoc_item_ctxt.stderr
index d65716ec2..d65716ec2 100644
--- a/src/test/ui/hygiene/assoc_item_ctxt.stderr
+++ b/tests/ui/hygiene/assoc_item_ctxt.stderr
diff --git a/src/test/ui/hygiene/assoc_ty_bindings.rs b/tests/ui/hygiene/assoc_ty_bindings.rs
index 0567beab9..0567beab9 100644
--- a/src/test/ui/hygiene/assoc_ty_bindings.rs
+++ b/tests/ui/hygiene/assoc_ty_bindings.rs
diff --git a/src/test/ui/hygiene/auxiliary/codegen-attrs.rs b/tests/ui/hygiene/auxiliary/codegen-attrs.rs
index 74afedbeb..74afedbeb 100644
--- a/src/test/ui/hygiene/auxiliary/codegen-attrs.rs
+++ b/tests/ui/hygiene/auxiliary/codegen-attrs.rs
diff --git a/src/test/ui/hygiene/auxiliary/def-site-async-await.rs b/tests/ui/hygiene/auxiliary/def-site-async-await.rs
index f7e9b8013..f7e9b8013 100644
--- a/src/test/ui/hygiene/auxiliary/def-site-async-await.rs
+++ b/tests/ui/hygiene/auxiliary/def-site-async-await.rs
diff --git a/src/test/ui/hygiene/auxiliary/fields.rs b/tests/ui/hygiene/auxiliary/fields.rs
index 733d11a9e..733d11a9e 100644
--- a/src/test/ui/hygiene/auxiliary/fields.rs
+++ b/tests/ui/hygiene/auxiliary/fields.rs
diff --git a/src/test/ui/hygiene/auxiliary/intercrate.rs b/tests/ui/hygiene/auxiliary/intercrate.rs
index 068535885..068535885 100644
--- a/src/test/ui/hygiene/auxiliary/intercrate.rs
+++ b/tests/ui/hygiene/auxiliary/intercrate.rs
diff --git a/src/test/ui/hygiene/auxiliary/legacy_interaction.rs b/tests/ui/hygiene/auxiliary/legacy_interaction.rs
index 90d5243b7..90d5243b7 100644
--- a/src/test/ui/hygiene/auxiliary/legacy_interaction.rs
+++ b/tests/ui/hygiene/auxiliary/legacy_interaction.rs
diff --git a/src/test/ui/hygiene/auxiliary/local_inner_macros.rs b/tests/ui/hygiene/auxiliary/local_inner_macros.rs
index 4296ae2fd..4296ae2fd 100644
--- a/src/test/ui/hygiene/auxiliary/local_inner_macros.rs
+++ b/tests/ui/hygiene/auxiliary/local_inner_macros.rs
diff --git a/src/test/ui/hygiene/auxiliary/methods.rs b/tests/ui/hygiene/auxiliary/methods.rs
index 23b9c61cf..23b9c61cf 100644
--- a/src/test/ui/hygiene/auxiliary/methods.rs
+++ b/tests/ui/hygiene/auxiliary/methods.rs
diff --git a/src/test/ui/hygiene/auxiliary/my_crate.rs b/tests/ui/hygiene/auxiliary/my_crate.rs
index cdc6c27d8..cdc6c27d8 100644
--- a/src/test/ui/hygiene/auxiliary/my_crate.rs
+++ b/tests/ui/hygiene/auxiliary/my_crate.rs
diff --git a/src/test/ui/hygiene/auxiliary/needs_hygiene.rs b/tests/ui/hygiene/auxiliary/needs_hygiene.rs
index 3df6450fd..3df6450fd 100644
--- a/src/test/ui/hygiene/auxiliary/needs_hygiene.rs
+++ b/tests/ui/hygiene/auxiliary/needs_hygiene.rs
diff --git a/src/test/ui/hygiene/auxiliary/nested-dollar-crate.rs b/tests/ui/hygiene/auxiliary/nested-dollar-crate.rs
index e5caa0f9c..e5caa0f9c 100644
--- a/src/test/ui/hygiene/auxiliary/nested-dollar-crate.rs
+++ b/tests/ui/hygiene/auxiliary/nested-dollar-crate.rs
diff --git a/src/test/ui/hygiene/auxiliary/not-libstd.rs b/tests/ui/hygiene/auxiliary/not-libstd.rs
index babba293d..babba293d 100644
--- a/src/test/ui/hygiene/auxiliary/not-libstd.rs
+++ b/tests/ui/hygiene/auxiliary/not-libstd.rs
diff --git a/src/test/ui/hygiene/auxiliary/opaque-hygiene.rs b/tests/ui/hygiene/auxiliary/opaque-hygiene.rs
index 7730f91bd..7730f91bd 100644
--- a/src/test/ui/hygiene/auxiliary/opaque-hygiene.rs
+++ b/tests/ui/hygiene/auxiliary/opaque-hygiene.rs
diff --git a/src/test/ui/hygiene/auxiliary/pub_hygiene.rs b/tests/ui/hygiene/auxiliary/pub_hygiene.rs
index 47e76a629..47e76a629 100644
--- a/src/test/ui/hygiene/auxiliary/pub_hygiene.rs
+++ b/tests/ui/hygiene/auxiliary/pub_hygiene.rs
diff --git a/src/test/ui/hygiene/auxiliary/stdlib-prelude.rs b/tests/ui/hygiene/auxiliary/stdlib-prelude.rs
index 81b0b7faa..81b0b7faa 100644
--- a/src/test/ui/hygiene/auxiliary/stdlib-prelude.rs
+++ b/tests/ui/hygiene/auxiliary/stdlib-prelude.rs
diff --git a/src/test/ui/hygiene/auxiliary/transparent-basic.rs b/tests/ui/hygiene/auxiliary/transparent-basic.rs
index 37de27ee8..37de27ee8 100644
--- a/src/test/ui/hygiene/auxiliary/transparent-basic.rs
+++ b/tests/ui/hygiene/auxiliary/transparent-basic.rs
diff --git a/src/test/ui/hygiene/auxiliary/unhygienic_example.rs b/tests/ui/hygiene/auxiliary/unhygienic_example.rs
index 8e6e8f9b3..8e6e8f9b3 100644
--- a/src/test/ui/hygiene/auxiliary/unhygienic_example.rs
+++ b/tests/ui/hygiene/auxiliary/unhygienic_example.rs
diff --git a/src/test/ui/hygiene/auxiliary/use_by_macro.rs b/tests/ui/hygiene/auxiliary/use_by_macro.rs
index 791cf0358..791cf0358 100644
--- a/src/test/ui/hygiene/auxiliary/use_by_macro.rs
+++ b/tests/ui/hygiene/auxiliary/use_by_macro.rs
diff --git a/src/test/ui/hygiene/auxiliary/variants.rs b/tests/ui/hygiene/auxiliary/variants.rs
index dbfcce17d..dbfcce17d 100644
--- a/src/test/ui/hygiene/auxiliary/variants.rs
+++ b/tests/ui/hygiene/auxiliary/variants.rs
diff --git a/src/test/ui/hygiene/auxiliary/xcrate.rs b/tests/ui/hygiene/auxiliary/xcrate.rs
index f5a911f57..f5a911f57 100644
--- a/src/test/ui/hygiene/auxiliary/xcrate.rs
+++ b/tests/ui/hygiene/auxiliary/xcrate.rs
diff --git a/src/test/ui/hygiene/cross-crate-codegen-attrs.rs b/tests/ui/hygiene/cross-crate-codegen-attrs.rs
index af6b13343..af6b13343 100644
--- a/src/test/ui/hygiene/cross-crate-codegen-attrs.rs
+++ b/tests/ui/hygiene/cross-crate-codegen-attrs.rs
diff --git a/src/test/ui/hygiene/cross-crate-define-and-use.rs b/tests/ui/hygiene/cross-crate-define-and-use.rs
index 94f1adff6..94f1adff6 100644
--- a/src/test/ui/hygiene/cross-crate-define-and-use.rs
+++ b/tests/ui/hygiene/cross-crate-define-and-use.rs
diff --git a/src/test/ui/hygiene/cross-crate-fields.rs b/tests/ui/hygiene/cross-crate-fields.rs
index 1bcd64573..1bcd64573 100644
--- a/src/test/ui/hygiene/cross-crate-fields.rs
+++ b/tests/ui/hygiene/cross-crate-fields.rs
diff --git a/src/test/ui/hygiene/cross-crate-glob-hygiene.rs b/tests/ui/hygiene/cross-crate-glob-hygiene.rs
index de5576682..de5576682 100644
--- a/src/test/ui/hygiene/cross-crate-glob-hygiene.rs
+++ b/tests/ui/hygiene/cross-crate-glob-hygiene.rs
diff --git a/src/test/ui/hygiene/cross-crate-glob-hygiene.stderr b/tests/ui/hygiene/cross-crate-glob-hygiene.stderr
index 7369e77d0..7369e77d0 100644
--- a/src/test/ui/hygiene/cross-crate-glob-hygiene.stderr
+++ b/tests/ui/hygiene/cross-crate-glob-hygiene.stderr
diff --git a/src/test/ui/hygiene/cross-crate-methods.rs b/tests/ui/hygiene/cross-crate-methods.rs
index 0e6f57c33..0e6f57c33 100644
--- a/src/test/ui/hygiene/cross-crate-methods.rs
+++ b/tests/ui/hygiene/cross-crate-methods.rs
diff --git a/src/test/ui/hygiene/cross-crate-name-collision.rs b/tests/ui/hygiene/cross-crate-name-collision.rs
index 8f118782f..8f118782f 100644
--- a/src/test/ui/hygiene/cross-crate-name-collision.rs
+++ b/tests/ui/hygiene/cross-crate-name-collision.rs
diff --git a/src/test/ui/hygiene/cross-crate-name-hiding-2.rs b/tests/ui/hygiene/cross-crate-name-hiding-2.rs
index 3eacd775c..3eacd775c 100644
--- a/src/test/ui/hygiene/cross-crate-name-hiding-2.rs
+++ b/tests/ui/hygiene/cross-crate-name-hiding-2.rs
diff --git a/src/test/ui/hygiene/cross-crate-name-hiding-2.stderr b/tests/ui/hygiene/cross-crate-name-hiding-2.stderr
index 46314cdd5..46314cdd5 100644
--- a/src/test/ui/hygiene/cross-crate-name-hiding-2.stderr
+++ b/tests/ui/hygiene/cross-crate-name-hiding-2.stderr
diff --git a/src/test/ui/hygiene/cross-crate-name-hiding.rs b/tests/ui/hygiene/cross-crate-name-hiding.rs
index dd76ecc57..dd76ecc57 100644
--- a/src/test/ui/hygiene/cross-crate-name-hiding.rs
+++ b/tests/ui/hygiene/cross-crate-name-hiding.rs
diff --git a/src/test/ui/hygiene/cross-crate-name-hiding.stderr b/tests/ui/hygiene/cross-crate-name-hiding.stderr
index f8840c8f8..f8840c8f8 100644
--- a/src/test/ui/hygiene/cross-crate-name-hiding.stderr
+++ b/tests/ui/hygiene/cross-crate-name-hiding.stderr
diff --git a/src/test/ui/hygiene/cross-crate-redefine.rs b/tests/ui/hygiene/cross-crate-redefine.rs
index 3cb06b4ba..3cb06b4ba 100644
--- a/src/test/ui/hygiene/cross-crate-redefine.rs
+++ b/tests/ui/hygiene/cross-crate-redefine.rs
diff --git a/src/test/ui/hygiene/cross-crate-redefine.stderr b/tests/ui/hygiene/cross-crate-redefine.stderr
index 4f1419de4..4f1419de4 100644
--- a/src/test/ui/hygiene/cross-crate-redefine.stderr
+++ b/tests/ui/hygiene/cross-crate-redefine.stderr
diff --git a/src/test/ui/hygiene/cross-crate-variants.rs b/tests/ui/hygiene/cross-crate-variants.rs
index efc73a21f..efc73a21f 100644
--- a/src/test/ui/hygiene/cross-crate-variants.rs
+++ b/tests/ui/hygiene/cross-crate-variants.rs
diff --git a/src/test/ui/hygiene/dollar-crate-modern.rs b/tests/ui/hygiene/dollar-crate-modern.rs
index eb176fed8..eb176fed8 100644
--- a/src/test/ui/hygiene/dollar-crate-modern.rs
+++ b/tests/ui/hygiene/dollar-crate-modern.rs
diff --git a/src/test/ui/hygiene/duplicate_lifetimes.rs b/tests/ui/hygiene/duplicate_lifetimes.rs
index 8971fb626..8971fb626 100644
--- a/src/test/ui/hygiene/duplicate_lifetimes.rs
+++ b/tests/ui/hygiene/duplicate_lifetimes.rs
diff --git a/src/test/ui/hygiene/duplicate_lifetimes.stderr b/tests/ui/hygiene/duplicate_lifetimes.stderr
index 9f1a75147..9f1a75147 100644
--- a/src/test/ui/hygiene/duplicate_lifetimes.stderr
+++ b/tests/ui/hygiene/duplicate_lifetimes.stderr
diff --git a/src/test/ui/hygiene/eager-from-opaque-2.rs b/tests/ui/hygiene/eager-from-opaque-2.rs
index 220e55267..220e55267 100644
--- a/src/test/ui/hygiene/eager-from-opaque-2.rs
+++ b/tests/ui/hygiene/eager-from-opaque-2.rs
diff --git a/src/test/ui/hygiene/eager-from-opaque.rs b/tests/ui/hygiene/eager-from-opaque.rs
index 6f3215dd6..6f3215dd6 100644
--- a/src/test/ui/hygiene/eager-from-opaque.rs
+++ b/tests/ui/hygiene/eager-from-opaque.rs
diff --git a/src/test/ui/hygiene/expansion-info-reset.rs b/tests/ui/hygiene/expansion-info-reset.rs
index fa5f71212..fa5f71212 100644
--- a/src/test/ui/hygiene/expansion-info-reset.rs
+++ b/tests/ui/hygiene/expansion-info-reset.rs
diff --git a/src/test/ui/hygiene/expansion-info-reset.stderr b/tests/ui/hygiene/expansion-info-reset.stderr
index 64d27e064..64d27e064 100644
--- a/src/test/ui/hygiene/expansion-info-reset.stderr
+++ b/tests/ui/hygiene/expansion-info-reset.stderr
diff --git a/src/test/ui/hygiene/extern-prelude-from-opaque-fail.rs b/tests/ui/hygiene/extern-prelude-from-opaque-fail.rs
index 571017df4..571017df4 100644
--- a/src/test/ui/hygiene/extern-prelude-from-opaque-fail.rs
+++ b/tests/ui/hygiene/extern-prelude-from-opaque-fail.rs
diff --git a/src/test/ui/hygiene/extern-prelude-from-opaque-fail.stderr b/tests/ui/hygiene/extern-prelude-from-opaque-fail.stderr
index e89c19b58..f1f4caee3 100644
--- a/src/test/ui/hygiene/extern-prelude-from-opaque-fail.stderr
+++ b/tests/ui/hygiene/extern-prelude-from-opaque-fail.stderr
@@ -2,10 +2,7 @@ error[E0432]: unresolved import `my_core`
   --> $DIR/extern-prelude-from-opaque-fail.rs:20:9
    |
 LL |     use my_core;
-   |         ^^^^^^^
-   |         |
-   |         no `my_core` in the root
-   |         help: a similar name exists in the module: `my_core`
+   |         ^^^^^^^ no `my_core` in the root
 
 error[E0432]: unresolved import `my_core`
   --> $DIR/extern-prelude-from-opaque-fail.rs:7:13
diff --git a/src/test/ui/hygiene/fields-definition.rs b/tests/ui/hygiene/fields-definition.rs
index 173c357bd..173c357bd 100644
--- a/src/test/ui/hygiene/fields-definition.rs
+++ b/tests/ui/hygiene/fields-definition.rs
diff --git a/src/test/ui/hygiene/fields-definition.stderr b/tests/ui/hygiene/fields-definition.stderr
index 9d091cedd..9d091cedd 100644
--- a/src/test/ui/hygiene/fields-definition.stderr
+++ b/tests/ui/hygiene/fields-definition.stderr
diff --git a/src/test/ui/hygiene/fields-move.rs b/tests/ui/hygiene/fields-move.rs
index 401ad97e3..401ad97e3 100644
--- a/src/test/ui/hygiene/fields-move.rs
+++ b/tests/ui/hygiene/fields-move.rs
diff --git a/src/test/ui/hygiene/fields-move.stderr b/tests/ui/hygiene/fields-move.stderr
index b5b507c7d..b5b507c7d 100644
--- a/src/test/ui/hygiene/fields-move.stderr
+++ b/tests/ui/hygiene/fields-move.stderr
diff --git a/src/test/ui/hygiene/fields-numeric-borrowck.rs b/tests/ui/hygiene/fields-numeric-borrowck.rs
index 9536babc2..9536babc2 100644
--- a/src/test/ui/hygiene/fields-numeric-borrowck.rs
+++ b/tests/ui/hygiene/fields-numeric-borrowck.rs
diff --git a/src/test/ui/hygiene/fields-numeric-borrowck.stderr b/tests/ui/hygiene/fields-numeric-borrowck.stderr
index bc13aa62f..bc13aa62f 100644
--- a/src/test/ui/hygiene/fields-numeric-borrowck.stderr
+++ b/tests/ui/hygiene/fields-numeric-borrowck.stderr
diff --git a/src/test/ui/hygiene/fields.rs b/tests/ui/hygiene/fields.rs
index 7a417b46f..7a417b46f 100644
--- a/src/test/ui/hygiene/fields.rs
+++ b/tests/ui/hygiene/fields.rs
diff --git a/src/test/ui/hygiene/fields.stderr b/tests/ui/hygiene/fields.stderr
index 978120b1f..978120b1f 100644
--- a/src/test/ui/hygiene/fields.stderr
+++ b/tests/ui/hygiene/fields.stderr
diff --git a/src/test/ui/hygiene/for-loop.rs b/tests/ui/hygiene/for-loop.rs
index 2e5ae43a9..2e5ae43a9 100644
--- a/src/test/ui/hygiene/for-loop.rs
+++ b/tests/ui/hygiene/for-loop.rs
diff --git a/src/test/ui/hygiene/for-loop.stderr b/tests/ui/hygiene/for-loop.stderr
index 932c951e7..932c951e7 100644
--- a/src/test/ui/hygiene/for-loop.stderr
+++ b/tests/ui/hygiene/for-loop.stderr
diff --git a/src/test/ui/hygiene/format-args.rs b/tests/ui/hygiene/format-args.rs
index d74889b95..d74889b95 100644
--- a/src/test/ui/hygiene/format-args.rs
+++ b/tests/ui/hygiene/format-args.rs
diff --git a/src/test/ui/hygiene/generate-mod.rs b/tests/ui/hygiene/generate-mod.rs
index 882629354..882629354 100644
--- a/src/test/ui/hygiene/generate-mod.rs
+++ b/tests/ui/hygiene/generate-mod.rs
diff --git a/src/test/ui/hygiene/generate-mod.stderr b/tests/ui/hygiene/generate-mod.stderr
index 32a2e145c..32a2e145c 100644
--- a/src/test/ui/hygiene/generate-mod.stderr
+++ b/tests/ui/hygiene/generate-mod.stderr
diff --git a/src/test/ui/hygiene/generic_params.rs b/tests/ui/hygiene/generic_params.rs
index 3b6216c3e..3b6216c3e 100644
--- a/src/test/ui/hygiene/generic_params.rs
+++ b/tests/ui/hygiene/generic_params.rs
diff --git a/src/test/ui/hygiene/globs.rs b/tests/ui/hygiene/globs.rs
index a3f466ef4..a3f466ef4 100644
--- a/src/test/ui/hygiene/globs.rs
+++ b/tests/ui/hygiene/globs.rs
diff --git a/src/test/ui/hygiene/globs.stderr b/tests/ui/hygiene/globs.stderr
index 1f2a96a4c..c01901be5 100644
--- a/src/test/ui/hygiene/globs.stderr
+++ b/tests/ui/hygiene/globs.stderr
@@ -51,7 +51,7 @@ LL | n!(f);
 LL |         n!(f);
    |            ^ not found in this scope
    |
-   = note: consider importing this function:
+   = help: consider importing this function:
            foo::f
    = note: this error originates in the macro `n` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -64,7 +64,7 @@ LL | n!(f);
 LL |                 f
    |                 ^ not found in this scope
    |
-   = note: consider importing this function:
+   = help: consider importing this function:
            foo::f
    = note: this error originates in the macro `n` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/hygiene/hir-res-hygiene.rs b/tests/ui/hygiene/hir-res-hygiene.rs
index c26cf5fdb..c26cf5fdb 100644
--- a/src/test/ui/hygiene/hir-res-hygiene.rs
+++ b/tests/ui/hygiene/hir-res-hygiene.rs
diff --git a/src/test/ui/hygiene/hygiene-dodging-1.rs b/tests/ui/hygiene/hygiene-dodging-1.rs
index 69e47e82b..69e47e82b 100644
--- a/src/test/ui/hygiene/hygiene-dodging-1.rs
+++ b/tests/ui/hygiene/hygiene-dodging-1.rs
diff --git a/src/test/ui/hygiene/hygiene.rs b/tests/ui/hygiene/hygiene.rs
index fb351cf0f..fb351cf0f 100644
--- a/src/test/ui/hygiene/hygiene.rs
+++ b/tests/ui/hygiene/hygiene.rs
diff --git a/src/test/ui/hygiene/hygienic-label-1.rs b/tests/ui/hygiene/hygienic-label-1.rs
index a06d9255a..a06d9255a 100644
--- a/src/test/ui/hygiene/hygienic-label-1.rs
+++ b/tests/ui/hygiene/hygienic-label-1.rs
diff --git a/src/test/ui/hygiene/hygienic-label-1.stderr b/tests/ui/hygiene/hygienic-label-1.stderr
index deb6a2059..deb6a2059 100644
--- a/src/test/ui/hygiene/hygienic-label-1.stderr
+++ b/tests/ui/hygiene/hygienic-label-1.stderr
diff --git a/src/test/ui/hygiene/hygienic-label-2.rs b/tests/ui/hygiene/hygienic-label-2.rs
index 43e01a934..43e01a934 100644
--- a/src/test/ui/hygiene/hygienic-label-2.rs
+++ b/tests/ui/hygiene/hygienic-label-2.rs
diff --git a/src/test/ui/hygiene/hygienic-label-2.stderr b/tests/ui/hygiene/hygienic-label-2.stderr
index f23e741de..f23e741de 100644
--- a/src/test/ui/hygiene/hygienic-label-2.stderr
+++ b/tests/ui/hygiene/hygienic-label-2.stderr
diff --git a/src/test/ui/hygiene/hygienic-label-3.rs b/tests/ui/hygiene/hygienic-label-3.rs
index ab0559e1b..ab0559e1b 100644
--- a/src/test/ui/hygiene/hygienic-label-3.rs
+++ b/tests/ui/hygiene/hygienic-label-3.rs
diff --git a/src/test/ui/hygiene/hygienic-label-3.stderr b/tests/ui/hygiene/hygienic-label-3.stderr
index cf7f78a99..cf7f78a99 100644
--- a/src/test/ui/hygiene/hygienic-label-3.stderr
+++ b/tests/ui/hygiene/hygienic-label-3.stderr
diff --git a/src/test/ui/hygiene/hygienic-label-4.rs b/tests/ui/hygiene/hygienic-label-4.rs
index a7e1f0e78..a7e1f0e78 100644
--- a/src/test/ui/hygiene/hygienic-label-4.rs
+++ b/tests/ui/hygiene/hygienic-label-4.rs
diff --git a/src/test/ui/hygiene/hygienic-label-4.stderr b/tests/ui/hygiene/hygienic-label-4.stderr
index 1c93da02f..1c93da02f 100644
--- a/src/test/ui/hygiene/hygienic-label-4.stderr
+++ b/tests/ui/hygiene/hygienic-label-4.stderr
diff --git a/src/test/ui/hygiene/hygienic-labels-in-let.rs b/tests/ui/hygiene/hygienic-labels-in-let.rs
index 8cf66f31a..8cf66f31a 100644
--- a/src/test/ui/hygiene/hygienic-labels-in-let.rs
+++ b/tests/ui/hygiene/hygienic-labels-in-let.rs
diff --git a/src/test/ui/hygiene/hygienic-labels.rs b/tests/ui/hygiene/hygienic-labels.rs
index 6a7d81f04..6a7d81f04 100644
--- a/src/test/ui/hygiene/hygienic-labels.rs
+++ b/tests/ui/hygiene/hygienic-labels.rs
diff --git a/src/test/ui/hygiene/impl_items-2.rs b/tests/ui/hygiene/impl_items-2.rs
index 465e444ae..465e444ae 100644
--- a/src/test/ui/hygiene/impl_items-2.rs
+++ b/tests/ui/hygiene/impl_items-2.rs
diff --git a/src/test/ui/hygiene/impl_items-2.stderr b/tests/ui/hygiene/impl_items-2.stderr
index 3c0ffeb10..3c0ffeb10 100644
--- a/src/test/ui/hygiene/impl_items-2.stderr
+++ b/tests/ui/hygiene/impl_items-2.stderr
diff --git a/src/test/ui/hygiene/impl_items.rs b/tests/ui/hygiene/impl_items.rs
index ddb25c06b..ddb25c06b 100644
--- a/src/test/ui/hygiene/impl_items.rs
+++ b/tests/ui/hygiene/impl_items.rs
diff --git a/src/test/ui/hygiene/impl_items.stderr b/tests/ui/hygiene/impl_items.stderr
index 46a250038..46a250038 100644
--- a/src/test/ui/hygiene/impl_items.stderr
+++ b/tests/ui/hygiene/impl_items.stderr
diff --git a/src/test/ui/hygiene/intercrate.rs b/tests/ui/hygiene/intercrate.rs
index d9b5b789e..d9b5b789e 100644
--- a/src/test/ui/hygiene/intercrate.rs
+++ b/tests/ui/hygiene/intercrate.rs
diff --git a/src/test/ui/hygiene/intercrate.stderr b/tests/ui/hygiene/intercrate.stderr
index 91358b279..91358b279 100644
--- a/src/test/ui/hygiene/intercrate.stderr
+++ b/tests/ui/hygiene/intercrate.stderr
diff --git a/src/test/ui/issues/issue-15221.rs b/tests/ui/hygiene/issue-15221.rs
index 4b8319a83..4b8319a83 100644
--- a/src/test/ui/issues/issue-15221.rs
+++ b/tests/ui/hygiene/issue-15221.rs
diff --git a/src/test/ui/hygiene/issue-32922.rs b/tests/ui/hygiene/issue-32922.rs
index 54ec44a1c..54ec44a1c 100644
--- a/src/test/ui/hygiene/issue-32922.rs
+++ b/tests/ui/hygiene/issue-32922.rs
diff --git a/src/test/ui/hygiene/issue-40847.rs b/tests/ui/hygiene/issue-40847.rs
index 087b40ad6..087b40ad6 100644
--- a/src/test/ui/hygiene/issue-40847.rs
+++ b/tests/ui/hygiene/issue-40847.rs
diff --git a/src/test/ui/hygiene/issue-44128.rs b/tests/ui/hygiene/issue-44128.rs
index 5e03bdb8c..5e03bdb8c 100644
--- a/src/test/ui/hygiene/issue-44128.rs
+++ b/tests/ui/hygiene/issue-44128.rs
diff --git a/src/test/ui/hygiene/issue-47311.rs b/tests/ui/hygiene/issue-47311.rs
index 5c2379a8a..5c2379a8a 100644
--- a/src/test/ui/hygiene/issue-47311.rs
+++ b/tests/ui/hygiene/issue-47311.rs
diff --git a/src/test/ui/hygiene/issue-47312.rs b/tests/ui/hygiene/issue-47312.rs
index bbcb3a7f3..bbcb3a7f3 100644
--- a/src/test/ui/hygiene/issue-47312.rs
+++ b/tests/ui/hygiene/issue-47312.rs
diff --git a/src/test/ui/hygiene/issue-61574-const-parameters.rs b/tests/ui/hygiene/issue-61574-const-parameters.rs
index 3634ee004..3634ee004 100644
--- a/src/test/ui/hygiene/issue-61574-const-parameters.rs
+++ b/tests/ui/hygiene/issue-61574-const-parameters.rs
diff --git a/src/test/ui/hygiene/issue-77523-def-site-async-await.rs b/tests/ui/hygiene/issue-77523-def-site-async-await.rs
index 2af60ff6f..2af60ff6f 100644
--- a/src/test/ui/hygiene/issue-77523-def-site-async-await.rs
+++ b/tests/ui/hygiene/issue-77523-def-site-async-await.rs
diff --git a/src/test/ui/hygiene/items.rs b/tests/ui/hygiene/items.rs
index 1c625a972..1c625a972 100644
--- a/src/test/ui/hygiene/items.rs
+++ b/tests/ui/hygiene/items.rs
diff --git a/src/test/ui/hygiene/lambda-var-hygiene.rs b/tests/ui/hygiene/lambda-var-hygiene.rs
index bf06765e5..bf06765e5 100644
--- a/src/test/ui/hygiene/lambda-var-hygiene.rs
+++ b/tests/ui/hygiene/lambda-var-hygiene.rs
diff --git a/src/test/ui/hygiene/legacy_interaction.rs b/tests/ui/hygiene/legacy_interaction.rs
index 52008eed5..52008eed5 100644
--- a/src/test/ui/hygiene/legacy_interaction.rs
+++ b/tests/ui/hygiene/legacy_interaction.rs
diff --git a/src/test/ui/hygiene/lexical.rs b/tests/ui/hygiene/lexical.rs
index 3d25c7209..3d25c7209 100644
--- a/src/test/ui/hygiene/lexical.rs
+++ b/tests/ui/hygiene/lexical.rs
diff --git a/src/test/ui/hygiene/local_inner_macros.rs b/tests/ui/hygiene/local_inner_macros.rs
index 71ffcac40..71ffcac40 100644
--- a/src/test/ui/hygiene/local_inner_macros.rs
+++ b/tests/ui/hygiene/local_inner_macros.rs
diff --git a/src/test/ui/hygiene/macro-metavars-legacy.rs b/tests/ui/hygiene/macro-metavars-legacy.rs
index 09070f0f5..09070f0f5 100644
--- a/src/test/ui/hygiene/macro-metavars-legacy.rs
+++ b/tests/ui/hygiene/macro-metavars-legacy.rs
diff --git a/src/test/ui/hygiene/macro-metavars-transparent.rs b/tests/ui/hygiene/macro-metavars-transparent.rs
index e475b5728..e475b5728 100644
--- a/src/test/ui/hygiene/macro-metavars-transparent.rs
+++ b/tests/ui/hygiene/macro-metavars-transparent.rs
diff --git a/src/test/ui/hygiene/missing-self-diag.rs b/tests/ui/hygiene/missing-self-diag.rs
index f934f793c..f934f793c 100644
--- a/src/test/ui/hygiene/missing-self-diag.rs
+++ b/tests/ui/hygiene/missing-self-diag.rs
diff --git a/src/test/ui/hygiene/missing-self-diag.stderr b/tests/ui/hygiene/missing-self-diag.stderr
index 690bcd032..690bcd032 100644
--- a/src/test/ui/hygiene/missing-self-diag.stderr
+++ b/tests/ui/hygiene/missing-self-diag.stderr
diff --git a/src/test/ui/hygiene/nested-dollar-crate.rs b/tests/ui/hygiene/nested-dollar-crate.rs
index e8703bc77..e8703bc77 100644
--- a/src/test/ui/hygiene/nested-dollar-crate.rs
+++ b/tests/ui/hygiene/nested-dollar-crate.rs
diff --git a/src/test/ui/hygiene/nested_macro_privacy.rs b/tests/ui/hygiene/nested_macro_privacy.rs
index dea9101ee..dea9101ee 100644
--- a/src/test/ui/hygiene/nested_macro_privacy.rs
+++ b/tests/ui/hygiene/nested_macro_privacy.rs
diff --git a/src/test/ui/hygiene/nested_macro_privacy.stderr b/tests/ui/hygiene/nested_macro_privacy.stderr
index 1d11cd0f5..1d11cd0f5 100644
--- a/src/test/ui/hygiene/nested_macro_privacy.stderr
+++ b/tests/ui/hygiene/nested_macro_privacy.stderr
diff --git a/src/test/ui/hygiene/no_implicit_prelude-2018.rs b/tests/ui/hygiene/no_implicit_prelude-2018.rs
index 83ca28167..83ca28167 100644
--- a/src/test/ui/hygiene/no_implicit_prelude-2018.rs
+++ b/tests/ui/hygiene/no_implicit_prelude-2018.rs
diff --git a/src/test/ui/hygiene/no_implicit_prelude-2018.stderr b/tests/ui/hygiene/no_implicit_prelude-2018.stderr
index 02ddc391f..3f31b041b 100644
--- a/src/test/ui/hygiene/no_implicit_prelude-2018.stderr
+++ b/tests/ui/hygiene/no_implicit_prelude-2018.stderr
@@ -4,7 +4,7 @@ error: cannot find macro `print` in this scope
 LL |         print!();
    |         ^^^^^
    |
-   = note: consider importing this macro:
+   = help: consider importing this macro:
            std::print
 
 error: aborting due to previous error
diff --git a/src/test/ui/hygiene/no_implicit_prelude-2021.rs b/tests/ui/hygiene/no_implicit_prelude-2021.rs
index 0fe9ae56c..0fe9ae56c 100644
--- a/src/test/ui/hygiene/no_implicit_prelude-2021.rs
+++ b/tests/ui/hygiene/no_implicit_prelude-2021.rs
diff --git a/src/test/ui/hygiene/no_implicit_prelude.rs b/tests/ui/hygiene/no_implicit_prelude.rs
index e23826e9d..e23826e9d 100644
--- a/src/test/ui/hygiene/no_implicit_prelude.rs
+++ b/tests/ui/hygiene/no_implicit_prelude.rs
diff --git a/src/test/ui/hygiene/no_implicit_prelude.stderr b/tests/ui/hygiene/no_implicit_prelude.stderr
index c48c84035..c48c84035 100644
--- a/src/test/ui/hygiene/no_implicit_prelude.stderr
+++ b/tests/ui/hygiene/no_implicit_prelude.stderr
diff --git a/src/test/ui/hygiene/panic-location.rs b/tests/ui/hygiene/panic-location.rs
index 5cf169dfb..5cf169dfb 100644
--- a/src/test/ui/hygiene/panic-location.rs
+++ b/tests/ui/hygiene/panic-location.rs
diff --git a/src/test/ui/hygiene/panic-location.run.stderr b/tests/ui/hygiene/panic-location.run.stderr
index 0b23b1cc2..0b23b1cc2 100644
--- a/src/test/ui/hygiene/panic-location.run.stderr
+++ b/tests/ui/hygiene/panic-location.run.stderr
diff --git a/src/test/ui/hygiene/pattern-macro.rs b/tests/ui/hygiene/pattern-macro.rs
index e5d6a3aa1..e5d6a3aa1 100644
--- a/src/test/ui/hygiene/pattern-macro.rs
+++ b/tests/ui/hygiene/pattern-macro.rs
diff --git a/src/test/ui/hygiene/pattern-macro.stderr b/tests/ui/hygiene/pattern-macro.stderr
index edd05916e..edd05916e 100644
--- a/src/test/ui/hygiene/pattern-macro.stderr
+++ b/tests/ui/hygiene/pattern-macro.stderr
diff --git a/src/test/ui/hygiene/prelude-import-hygiene.rs b/tests/ui/hygiene/prelude-import-hygiene.rs
index 51e7bed65..51e7bed65 100644
--- a/src/test/ui/hygiene/prelude-import-hygiene.rs
+++ b/tests/ui/hygiene/prelude-import-hygiene.rs
diff --git a/src/test/ui/hygiene/privacy-early.rs b/tests/ui/hygiene/privacy-early.rs
index 58fc74d65..58fc74d65 100644
--- a/src/test/ui/hygiene/privacy-early.rs
+++ b/tests/ui/hygiene/privacy-early.rs
diff --git a/src/test/ui/hygiene/privacy-early.stderr b/tests/ui/hygiene/privacy-early.stderr
index 0375ed56d..0375ed56d 100644
--- a/src/test/ui/hygiene/privacy-early.stderr
+++ b/tests/ui/hygiene/privacy-early.stderr
diff --git a/src/test/ui/hygiene/privacy.rs b/tests/ui/hygiene/privacy.rs
index 78d255553..78d255553 100644
--- a/src/test/ui/hygiene/privacy.rs
+++ b/tests/ui/hygiene/privacy.rs
diff --git a/src/test/ui/hygiene/privacy.stderr b/tests/ui/hygiene/privacy.stderr
index 70a24304d..70a24304d 100644
--- a/src/test/ui/hygiene/privacy.stderr
+++ b/tests/ui/hygiene/privacy.stderr
diff --git a/src/test/ui/hygiene/rustc-macro-transparency.rs b/tests/ui/hygiene/rustc-macro-transparency.rs
index 5f36993af..5f36993af 100644
--- a/src/test/ui/hygiene/rustc-macro-transparency.rs
+++ b/tests/ui/hygiene/rustc-macro-transparency.rs
diff --git a/src/test/ui/hygiene/rustc-macro-transparency.stderr b/tests/ui/hygiene/rustc-macro-transparency.stderr
index 1d2a1e124..1d2a1e124 100644
--- a/src/test/ui/hygiene/rustc-macro-transparency.stderr
+++ b/tests/ui/hygiene/rustc-macro-transparency.stderr
diff --git a/src/test/ui/hygiene/specialization.rs b/tests/ui/hygiene/specialization.rs
index 656aa880a..656aa880a 100644
--- a/src/test/ui/hygiene/specialization.rs
+++ b/tests/ui/hygiene/specialization.rs
diff --git a/src/test/ui/hygiene/stdlib-prelude-from-opaque-early.rs b/tests/ui/hygiene/stdlib-prelude-from-opaque-early.rs
index c8c5c72bf..c8c5c72bf 100644
--- a/src/test/ui/hygiene/stdlib-prelude-from-opaque-early.rs
+++ b/tests/ui/hygiene/stdlib-prelude-from-opaque-early.rs
diff --git a/src/test/ui/hygiene/stdlib-prelude-from-opaque-late.rs b/tests/ui/hygiene/stdlib-prelude-from-opaque-late.rs
index cf65de2bc..cf65de2bc 100644
--- a/src/test/ui/hygiene/stdlib-prelude-from-opaque-late.rs
+++ b/tests/ui/hygiene/stdlib-prelude-from-opaque-late.rs
diff --git a/src/test/ui/hygiene/thread-local-not-in-prelude.rs b/tests/ui/hygiene/thread-local-not-in-prelude.rs
index e5ed09c60..e5ed09c60 100644
--- a/src/test/ui/hygiene/thread-local-not-in-prelude.rs
+++ b/tests/ui/hygiene/thread-local-not-in-prelude.rs
diff --git a/src/test/ui/hygiene/trait_items-2.rs b/tests/ui/hygiene/trait_items-2.rs
index 39edfc37d..39edfc37d 100644
--- a/src/test/ui/hygiene/trait_items-2.rs
+++ b/tests/ui/hygiene/trait_items-2.rs
diff --git a/src/test/ui/hygiene/trait_items.rs b/tests/ui/hygiene/trait_items.rs
index 15c4acbc9..15c4acbc9 100644
--- a/src/test/ui/hygiene/trait_items.rs
+++ b/tests/ui/hygiene/trait_items.rs
diff --git a/src/test/ui/hygiene/trait_items.stderr b/tests/ui/hygiene/trait_items.stderr
index 80bdbe0e2..80bdbe0e2 100644
--- a/src/test/ui/hygiene/trait_items.stderr
+++ b/tests/ui/hygiene/trait_items.stderr
diff --git a/src/test/ui/hygiene/traits-in-scope.rs b/tests/ui/hygiene/traits-in-scope.rs
index 548bb226b..548bb226b 100644
--- a/src/test/ui/hygiene/traits-in-scope.rs
+++ b/tests/ui/hygiene/traits-in-scope.rs
diff --git a/src/test/ui/hygiene/transparent-basic.rs b/tests/ui/hygiene/transparent-basic.rs
index bfa1713e4..bfa1713e4 100644
--- a/src/test/ui/hygiene/transparent-basic.rs
+++ b/tests/ui/hygiene/transparent-basic.rs
diff --git a/src/test/ui/hygiene/unpretty-debug.rs b/tests/ui/hygiene/unpretty-debug.rs
index 6e936bb3d..6e936bb3d 100644
--- a/src/test/ui/hygiene/unpretty-debug.rs
+++ b/tests/ui/hygiene/unpretty-debug.rs
diff --git a/src/test/ui/hygiene/unpretty-debug.stdout b/tests/ui/hygiene/unpretty-debug.stdout
index 51c21043d..51c21043d 100644
--- a/src/test/ui/hygiene/unpretty-debug.stdout
+++ b/tests/ui/hygiene/unpretty-debug.stdout
diff --git a/src/test/ui/hygiene/wrap_unhygienic_example.rs b/tests/ui/hygiene/wrap_unhygienic_example.rs
index 50c6b35ab..50c6b35ab 100644
--- a/src/test/ui/hygiene/wrap_unhygienic_example.rs
+++ b/tests/ui/hygiene/wrap_unhygienic_example.rs
diff --git a/src/test/ui/hygiene/xcrate.rs b/tests/ui/hygiene/xcrate.rs
index 6981ce3f6..6981ce3f6 100644
--- a/src/test/ui/hygiene/xcrate.rs
+++ b/tests/ui/hygiene/xcrate.rs