Jonathan Brouwer e103550588 Rollup merge of #153308 - aytey:macro_meta_hygiene, r=jdonszelmann ...

Add hygiene annotations for tokens in `macro_rules!` bodies

`-Zunpretty=expanded,hygiene` was not printing syntax context annotations for identifiers and lifetimes inside `macro_rules!` bodies. These tokens are printed via `print_tt()` → `token_to_string_ext()`, which converts tokens to strings without calling `ann_post()`. This meant that macro-generated `macro_rules!` definitions with hygienic metavar parameters (e.g. multiple `$marg` distinguished only by hygiene) were printed with no way to tell them apart.

This was fixed by adding a match on `token.kind` in `print_tt()` to call `ann_post()` for `Ident`, `NtIdent`, `Lifetime`, and `NtLifetime` tokens, matching how `print_ident()` and `print_lifetime()` already handle AST-level identifiers and lifetimes.

2026-03-19 13:42:34 +01:00

..

auxiliary

Gate 2015 UI tests

2025-11-27 11:19:00 -05:00

arguments.rs

remove invalid ignore-pretty

2023-04-03 09:24:11 +02:00

arguments.stderr

Merge E0412 into E0425

2025-12-02 18:25:13 +00:00

assoc_item_ctxt.rs

remove invalid ignore-pretty

2023-04-03 09:24:11 +02:00

assoc_item_ctxt.stderr

remove invalid ignore-pretty

2023-04-03 09:24:11 +02:00

assoc_ty_bindings.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

cross-crate-codegen-attrs.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

cross-crate-define-and-use.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

cross-crate-fields.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

cross-crate-glob-hygiene.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

cross-crate-glob-hygiene.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

cross-crate-methods.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

cross-crate-name-collision.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

cross-crate-name-hiding-2.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

cross-crate-name-hiding-2.stderr

resolve: Replace Macros20NormalizedIdent with IdentKey

2026-01-27 18:11:52 +03:00

cross-crate-name-hiding.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

cross-crate-name-hiding.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

cross-crate-redefine.rs

resolve: Consistently use old decls before new decls in interfaces

2026-01-14 19:58:33 +03:00

cross-crate-redefine.stderr

resolve: Consistently use old decls before new decls in interfaces

2026-01-14 19:58:33 +03:00

cross-crate-variants.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

dollar-crate-modern.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

duplicate_lifetimes.rs

Finish transition from semitransparent to semiopaque for rustc_macro_transparency

2026-01-08 19:14:45 +01:00

duplicate_lifetimes.stderr

…

eager-from-opaque-2.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

eager-from-opaque.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

expansion-info-reset.rs

…

expansion-info-reset.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

extern-prelude-from-opaque-fail-2018.rs

Unify wording of resolve error

2026-02-17 16:51:44 +00:00

extern-prelude-from-opaque-fail-2018.stderr

Unify wording of resolve error

2026-02-17 16:51:44 +00:00

extern-prelude-from-opaque-fail.rs

Unify wording of resolve error

2026-02-17 16:51:44 +00:00

extern-prelude-from-opaque-fail.stderr

Unify wording of resolve error

2026-02-17 16:51:44 +00:00

fields-definition.rs

…

fields-definition.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

fields-move.rs

…

fields-move.stderr

…

fields-numeric-borrowck.rs

…

fields-numeric-borrowck.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

fields.rs

remove invalid ignore-pretty

2023-04-03 09:24:11 +02:00

fields.stderr

remove invalid ignore-pretty

2023-04-03 09:24:11 +02:00

for-loop.rs

…

for-loop.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

format-args.rs

Explicitly export core and std macros

2026-01-13 08:47:48 +01:00

generate-mod.rs

…

generate-mod.stderr

Merge E0412 into E0425

2025-12-02 18:25:13 +00:00

generic_params.rs

Finish transition from semitransparent to semiopaque for rustc_macro_transparency

2026-01-08 19:14:45 +01:00

globs.rs

Gate 2015 UI tests

2025-11-27 11:19:00 -05:00

globs.stderr

Gate 2015 UI tests

2025-11-27 11:19:00 -05:00

hir-res-hygiene.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

hygiene-dodging-1.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

hygiene.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

hygienic-label-1.rs

…

hygienic-label-1.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

hygienic-label-2.rs

…

hygienic-label-2.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

hygienic-label-3.rs

…

hygienic-label-3.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

hygienic-label-4.rs

…

hygienic-label-4.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

hygienic-labels-in-let.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

hygienic-labels.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

impl_items-2.rs

…

impl_items-2.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

impl_items.rs

remove invalid ignore-pretty

2023-04-03 09:24:11 +02:00

impl_items.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

intercrate.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

intercrate.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

issue-15221.rs

tests: remove //@ pretty-expanded usages

2024-11-26 02:50:48 +08:00

issue-29746.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

issue-32922.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

issue-40847.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

issue-44128.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

issue-47311.rs

Gate 2015 UI tests

2025-11-27 11:19:00 -05:00

issue-47312.rs

Gate 2015 UI tests

2025-11-27 11:19:00 -05:00

issue-61574-const-parameters.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

issue-77523-def-site-async-await.rs

Ignore more failing ui tests for GCC backend

2025-09-26 15:33:48 +02:00

items.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

lambda-var-hygiene.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

legacy_interaction.rs

Gate 2015 UI tests

2025-11-27 11:19:00 -05:00

lexical.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

local_inner_macros.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

macro-metavars-legacy.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

macro-metavars-transparent.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

missing-self-diag.rs

…

missing-self-diag.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

nested_macro_privacy.rs

…

nested_macro_privacy.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

nested-dollar-crate.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

no_implicit_prelude-2018.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

no_implicit_prelude-2018.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

no_implicit_prelude-2021.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

no_implicit_prelude.rs

Unify wording of resolve error

2026-02-17 16:51:44 +00:00

no_implicit_prelude.stderr

Unify wording of resolve error

2026-02-17 16:51:44 +00:00

panic-location.rs

Normalize away the maybe remapped paths to the compiler and std

2025-12-18 21:18:05 +01:00

panic-location.run.stderr

Remove most #[track_caller] from allocating Vec methods

2025-09-25 20:52:03 +02:00

pattern-macro.rs

…

pattern-macro.stderr

Check identifiers defined in macros when suggesting identifiers hidden by hygiene

2025-12-04 14:58:46 +08:00

prelude-import-hygiene.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

privacy-early.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

privacy-early.stderr

Show number in error message even for one error

2023-11-24 19:15:52 +01:00

privacy.rs

Gate 2015 UI tests

2025-11-27 11:19:00 -05:00

privacy.stderr

Gate 2015 UI tests

2025-11-27 11:19:00 -05:00

rustc-macro-transparency.rs

Finish transition from semitransparent to semiopaque for rustc_macro_transparency

2026-01-08 19:14:45 +01:00

rustc-macro-transparency.stderr

Make typo in field and name suggestions verbose

2025-12-09 17:29:23 +00:00

specialization.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

stdlib-prelude-from-opaque-early.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

stdlib-prelude-from-opaque-late.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

thread-local-not-in-prelude.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

trait_items-2.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

trait_items.rs

Gate 2015 UI tests

2025-11-27 11:19:00 -05:00

trait_items.stderr

Gate 2015 UI tests

2025-11-27 11:19:00 -05:00

traits-in-scope.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

transparent-basic.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

unpretty-debug-lifetimes.rs

Fix missing syntax context in lifetime hygiene debug output

2026-01-29 12:07:01 +00:00

unpretty-debug-lifetimes.stdout

Add hygiene annotations for tokens in macro_rules! bodies

2026-03-02 20:28:16 +00:00

unpretty-debug-metavars.rs

Add regression tests for token hygiene annotations in macro bodies

2026-03-03 13:06:55 +00:00

unpretty-debug-metavars.stdout

Add regression tests for token hygiene annotations in macro bodies

2026-03-03 13:06:55 +00:00

unpretty-debug-shadow.rs

Add regression tests for token hygiene annotations in macro bodies

2026-03-03 13:06:55 +00:00

unpretty-debug-shadow.stdout

Add regression tests for token hygiene annotations in macro bodies

2026-03-03 13:06:55 +00:00

unpretty-debug.rs

Remove the -test suffix from normalize directives

2024-12-27 19:58:16 +11:00

unpretty-debug.stdout

Add hygiene annotations for tokens in macro_rules! bodies

2026-03-02 20:28:16 +00:00

wrap_unhygienic_example.rs

[AUTO-GENERATED] Migrate ui tests from // to //@ directives

2024-02-16 20:02:50 +00:00

xcrate.rs

Remove unused features in tests

2026-03-04 08:06:45 +08:00