Repository navigation
Fix missing syntax context in lifetime hygiene debug output - #151817
Merged
rust-bors[bot] merged 1 commit intoJan 30, 2026
Merged
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
rustbot has assigned @jdonszelmann. Use |
This comment has been minimized.
This comment has been minimized.
`-Zunpretty=expanded,hygiene` was not printing the syntax context for lifetimes. For example, two macro-generated lifetimes `'a` with different hygiene would both print as `/* 2538 */` instead of `/* 2538#0 */` and `/* 2538#1 */`, making it impossible to distinguish them. This was fixed by changing `print_lifetime` to call `ann_post()` with the full `Ident`, matching how regular identifiers are handled in `print_ident`.
aytey
force-pushed
the
fix_lifetime_unpretty_hygiene
branch
from
January 29, 2026 12:07
6bc4b5f to
a333f6f
Compare
Contributor
|
@bors r+ rollup |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jan 29, 2026
…e, r=jdonszelmann Fix missing syntax context in lifetime hygiene debug output `-Zunpretty=expanded,hygiene` was not printing the syntax context for lifetimes. For example, two macro-generated lifetimes `'a` with different hygiene would both print as `/* 2538 */` instead of `/* 2538#0 */` and `/* 2538#1 */`, making it impossible to distinguish them. This was fixed by changing `print_lifetime` to call `ann_post()` with the full `Ident`, matching how regular identifiers are handled in `print_ident`. Closes: rust-lang#151797
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jan 29, 2026
…e, r=jdonszelmann Fix missing syntax context in lifetime hygiene debug output `-Zunpretty=expanded,hygiene` was not printing the syntax context for lifetimes. For example, two macro-generated lifetimes `'a` with different hygiene would both print as `/* 2538 */` instead of `/* 2538#0 */` and `/* 2538#1 */`, making it impossible to distinguish them. This was fixed by changing `print_lifetime` to call `ann_post()` with the full `Ident`, matching how regular identifiers are handled in `print_ident`. Closes: rust-lang#151797
rust-bors Bot
pushed a commit
that referenced
this pull request
Jan 29, 2026
…uwer Rollup of 4 pull requests Successful merges: - #151808 (Document a safety condition for `TypedArena::alloc_raw_slice`) - #151811 (Fix false positive in unused_parens caused by break) - #151817 (Fix missing syntax context in lifetime hygiene debug output) - #151836 (Fix flakyness issue with `tests/rustdoc-gui/globals.goml` test)
rust-bors Bot
pushed a commit
that referenced
this pull request
Jan 30, 2026
…uwer Rollup of 4 pull requests Successful merges: - #151808 (Document a safety condition for `TypedArena::alloc_raw_slice`) - #151811 (Fix false positive in unused_parens caused by break) - #151817 (Fix missing syntax context in lifetime hygiene debug output) - #151836 (Fix flakyness issue with `tests/rustdoc-gui/globals.goml` test)
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Jan 30, 2026
…e, r=jdonszelmann Fix missing syntax context in lifetime hygiene debug output `-Zunpretty=expanded,hygiene` was not printing the syntax context for lifetimes. For example, two macro-generated lifetimes `'a` with different hygiene would both print as `/* 2538 */` instead of `/* 2538#0 */` and `/* 2538#1 */`, making it impossible to distinguish them. This was fixed by changing `print_lifetime` to call `ann_post()` with the full `Ident`, matching how regular identifiers are handled in `print_ident`. Closes: rust-lang#151797
rust-bors Bot
pushed a commit
that referenced
this pull request
Jan 30, 2026
Rollup of 6 pull requests Successful merges: - #151777 ( Reduce generics use in the query system.) - #151808 (Document a safety condition for `TypedArena::alloc_raw_slice`) - #151811 (Fix false positive in unused_parens caused by break) - #151817 (Fix missing syntax context in lifetime hygiene debug output) - #151836 (Fix flakyness issue with `tests/rustdoc-gui/globals.goml` test) - #151844 (rustc-dev-guide subtree update)
rust-bors Bot
pushed a commit
that referenced
this pull request
Jan 30, 2026
Rollup of 5 pull requests Successful merges: - #151777 ( Reduce generics use in the query system.) - #151808 (Document a safety condition for `TypedArena::alloc_raw_slice`) - #151811 (Fix false positive in unused_parens caused by break) - #151817 (Fix missing syntax context in lifetime hygiene debug output) - #151844 (rustc-dev-guide subtree update)
rust-timer
added a commit
that referenced
this pull request
Jan 30, 2026
Rollup merge of #151817 - aytey:fix_lifetime_unpretty_hygiene, r=jdonszelmann Fix missing syntax context in lifetime hygiene debug output `-Zunpretty=expanded,hygiene` was not printing the syntax context for lifetimes. For example, two macro-generated lifetimes `'a` with different hygiene would both print as `/* 2538 */` instead of `/* 2538#0 */` and `/* 2538#1 */`, making it impossible to distinguish them. This was fixed by changing `print_lifetime` to call `ann_post()` with the full `Ident`, matching how regular identifiers are handled in `print_ident`. Closes: #151797
github-actions Bot
pushed a commit
to rust-lang/rustc-dev-guide
that referenced
this pull request
Jan 31, 2026
Rollup of 5 pull requests Successful merges: - rust-lang/rust#151777 ( Reduce generics use in the query system.) - rust-lang/rust#151808 (Document a safety condition for `TypedArena::alloc_raw_slice`) - rust-lang/rust#151811 (Fix false positive in unused_parens caused by break) - rust-lang/rust#151817 (Fix missing syntax context in lifetime hygiene debug output) - rust-lang/rust#151844 (rustc-dev-guide subtree update)
Member
|
The test you added here has very strange behavior. Just look at its git history: I think it's because this normalization doesn't normalize away newline differences. |
Contributor
Author
|
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 3, 2026
… r=fmease Avoid oscillating line wrapping due to symbol indices A comment against PR rust-lang#151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 3, 2026
… r=fmease Avoid oscillating line wrapping due to symbol indices A comment against PR rust-lang#151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 3, 2026
… r=fmease Avoid oscillating line wrapping due to symbol indices A comment against PR rust-lang#151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 3, 2026
… r=fmease Avoid oscillating line wrapping due to symbol indices A comment against PR rust-lang#151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 3, 2026
… r=fmease Avoid oscillating line wrapping due to symbol indices A comment against PR rust-lang#151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 3, 2026
… r=fmease Avoid oscillating line wrapping due to symbol indices A comment against PR rust-lang#151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 3, 2026
… r=fmease Avoid oscillating line wrapping due to symbol indices A comment against PR rust-lang#151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 3, 2026
… r=fmease Avoid oscillating line wrapping due to symbol indices A comment against PR rust-lang#151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 3, 2026
… r=fmease Avoid oscillating line wrapping due to symbol indices A comment against PR rust-lang#151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 4, 2026
Rollup merge of #162608 - aytey:unpretty-hygiene-test-churn, r=fmease Avoid oscillating line wrapping due to symbol indices A comment against PR #151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
RalfJung
pushed a commit
to RalfJung/miri
that referenced
this pull request
Nov 4, 2026
Avoid oscillating line wrapping due to symbol indices A comment against PR rust-lang/rust#151817 mentioned that the test file added in this PR kept causing "arbitrary" test file changes. This is because one line of the expanded output sits *just* at 78 columns, which is the pretty-printer's margin. Adding or removing a symbol shifts every index after it, and when one of those gains or loses a digit, the wrapping moves. We cannot use `normalize-stdout` as the layout is decided before normalization runs. We fix this by avoiding a strict golden comparison, and instead using a regex to directly test that the expected syntax contexts exist in the expanded output. **LLM disclosure**: I used an LLM to help me understand the problem and how the regex would look, which the LLM then actioned. I reviewed the diff and the commit (along with the message) was performed by hand with me (with the LLM checking the content of the commit message, but the commit message was, indeed, written by a human).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
-Zunpretty=expanded,hygienewas not printing the syntax context for lifetimes. For example, two macro-generated lifetimes'awith different hygiene would both print as/* 2538 */instead of/* 2538#0 */and/* 2538#1 */, making it impossible to distinguish them.This was fixed by changing
print_lifetimeto callann_post()with the fullIdent, matching how regular identifiers are handled inprint_ident.Closes: #151797