Show named lifetime in closure upvar diagnostics#153724
Open
arferreira wants to merge 1 commit intorust-lang:mainfrom
Open
Show named lifetime in closure upvar diagnostics#153724arferreira wants to merge 1 commit intorust-lang:mainfrom
arferreira wants to merge 1 commit intorust-lang:mainfrom
Conversation
Collaborator
|
r? @jieyouxu rustbot has assigned @jieyouxu. Use Why was this reviewer chosen?The reviewer was selected based on:
|
d4a45ab to
99e1940
Compare
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.
Fixes #153545.
When a closure captures a variable whose type involves a named lifetime from the parent function (e.g.,
'a), the borrow checker's region renumbering creates a separateRegionVidfor each occurrence of the erased lifetime in the closure's upvar type. These newRegionVids have noexternal_name, so diagnostics fall back to synthetic names like'1.This PR recovers the original lifetime name by matching the closure's upvar type against the parent function's parameter type (obtained via
liberate_late_bound_regions). Both types have the same structure but different region representations, the parent hasReLateParam/ReEarlyParamwith real names, the closure hasReVarfrom renumbering. Walking them in parallel withfor_each_free_regionlets us find which named lifetime corresponds to the anonymousRegionVid.Before:
After:
The fix gracefully falls back to the existing
'1naming when it can't match, nested closures, local variables (not parameters), destructuring patterns, or partial captures where the type structures diverge.