fix: consider outer binders when folding captured items' type #14971
Conversation
This file contains 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
rustbot
added
the
S-waiting-on-review
lowr
commented
Jun 4, 2023
lowr
force-pushed
the
fix/captured-item-ty-outer-binder
branch
from
2eb0881
to
585965a
Compare
- use `DefWithBodyId::as_generic_def_id()` - add comments on `InferenceResult` invariant - move local helper function to bottom to comply with style guide
HKalbasi
approved these changes
Jun 4, 2023
lowr
force-pushed
the
fix/captured-item-ty-outer-binder
branch
from
585965a
to
a3789ea
Compare
|
Split into two commits since it was getting obscure what the fix is. |
Veykril
reviewed
Jun 4, 2023
| @@ -575,6 +579,8 @@ impl<'a> InferenceContext<'a> { | |||
| // used this function for another workaround, mention it here. If you really need this function and believe that | |||
| // there is no problem in it being `pub(crate)`, remove this comment. | |||
| pub(crate) fn resolve_all(self) -> InferenceResult { | |||
| // NOTE: `InferenceResult::closure_info` is `resolve_completely()`'d during | |||
| // `InferenceContext::infer_closures()` (in `HirPlace::ty()` specifically). | |||
| let InferenceContext { mut table, mut result, .. } = self; | |||
There was a problem hiding this comment.
given your comment, it might help to destructure result here so that when a new field is added it will error here
There was a problem hiding this comment.
Great idea, I'll do that!
Veykril
approved these changes
Jun 4, 2023
so that whenever new fields are added we don't forget to handle them.
|
@bors r+ |
|
☀️ Test successful - checks-actions |
Kmeakin
pushed a commit
to Kmeakin/rust-analyzer
that referenced
this pull request
Jun 5, 2023
…r, r=HKalbasi fix: consider outer binders when folding captured items' type Fixes rust-lang#14966 Basically, the crash is caused by us producing a broken type and passing it to chalk: `&dyn for<type> [for<> Implemented(^1.0: A<^0.0>)]` (notice the innermost bound var `^0.0` has no corresponding binder). It's created in `CapturedItemWithoutTy::with_ty()`, which didn't consider outer binders when folding types to replace placeholders with bound variables. The fix is one-liner, but I've also refactored the surrounding code a little.
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 #14966
Basically, the crash is caused by us producing a broken type and passing it to chalk:
&dyn for<type> [for<> Implemented(^1.0: A<^0.0>)](notice the innermost bound var^0.0has no corresponding binder). It's created inCapturedItemWithoutTy::with_ty(), which didn't consider outer binders when folding types to replace placeholders with bound variables.The fix is one-liner, but I've also refactored the surrounding code a little.