Do not use desugared local names in tail_expr_drop_order diagnostics#157942
Merged
rust-bors[bot] merged 2 commits intoJun 21, 2026
Merged
Conversation
rustbot
added
S-waiting-on-author
qaijuang
marked this pull request as ready for review
June 16, 2026 00:25
rustbot
added
the
S-waiting-on-review
Collaborator
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
rustbot
removed
the
S-waiting-on-author
Collaborator
|
rustbot has assigned @JonathanBrouwer. Use Why was this reviewer chosen?The reviewer was selected based on:
|
JonathanBrouwer
approved these changes
Jun 21, 2026
Contributor
rust-bors
Bot
added
S-waiting-on-bors
rust-timer
added a commit
that referenced
this pull request
Jun 21, 2026
Rollup merge of #157942 - qaijuang:issue-136206-tail-expr-drop-order-awaitee, r=JonathanBrouwer Do not use desugared local names in tail_expr_drop_order diagnostics `tail_expr_drop_order` labels values using names from `body.var_debug_info`. That works for user-written bindings, but `.await` lowering also introduces a synthetic `__awaitee` binding for debuginfo. This can leak into the user-facing lint diagnostic. This PR filters collected diagnostic names through `LocalDecl::from_compiler_desugaring()`, so compiler-generated locals fall back to the existing `#N` temporary labels. This does not change async lowering or the `__awaitee` debuginfo name itself. A user-written binding named `__awaitee` is still treated as user-written and is still shown by name. Fixes #136206
pull Bot
pushed a commit
to xtqqczze/rust-lang-miri
that referenced
this pull request
Jun 22, 2026
…uwer Rollup of 4 pull requests Successful merges: - rust-lang/rust#155439 (Enable Cargo's new build-dir layout) - rust-lang/rust#157942 (Do not use desugared local names in tail_expr_drop_order diagnostics) - rust-lang/rust#158193 (Remove `has_delayed_lints` optimization) - rust-lang/rust#158204 (More general assert in Interner const fn check)
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
3 participants
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.
tail_expr_drop_orderlabels values using names frombody.var_debug_info.That works for user-written bindings, but
.awaitlowering also introduces a synthetic__awaiteebinding for debuginfo. This can leak into the user-facing lint diagnostic.This PR filters collected diagnostic names through
LocalDecl::from_compiler_desugaring(), so compiler-generated locals fall back to the existing#Ntemporary labels. This does not change async lowering or the__awaiteedebuginfo name itself.A user-written binding named
__awaiteeis still treated as user-written and is still shown by name.Fixes #136206