fix: Wrong closure kind deduction for closures with predicates #16630
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
Veykril
reviewed
Feb 26, 2024
crates/hir-ty/src/infer/closure.rs
Outdated
Comment on lines
179
to
189
| fn fn_trait_kind_from_trait_id(&self, trait_id: hir_def::TraitId) -> Option<FnTrait> { | ||
| utils::fn_traits(self.db.upcast(), self.owner.module(self.db.upcast()).krate()) | ||
| .enumerate() | ||
| .find_map(|(i, t)| (t == trait_id).then_some(i)) | ||
| .map(|i| match i { | ||
| 0 => FnTrait::Fn, | ||
| 1 => FnTrait::FnMut, | ||
| 2 => FnTrait::FnOnce, | ||
| _ => unreachable!(), | ||
| }) | ||
| } |
There was a problem hiding this comment.
Suggested change
| fn fn_trait_kind_from_trait_id(&self, trait_id: hir_def::TraitId) -> Option<FnTrait> { | |
| utils::fn_traits(self.db.upcast(), self.owner.module(self.db.upcast()).krate()) | |
| .enumerate() | |
| .find_map(|(i, t)| (t == trait_id).then_some(i)) | |
| .map(|i| match i { | |
| 0 => FnTrait::Fn, | |
| 1 => FnTrait::FnMut, | |
| 2 => FnTrait::FnOnce, | |
| _ => unreachable!(), | |
| }) | |
| } | |
| fn fn_trait_kind_from_trait_id(&self, trait_id: hir_def::TraitId) -> Option<FnTrait> { | |
| FnTrait::from_lang_item(self.db.lang_attr(trait_id.into())?) | |
| } |
Something like this should be a bit more performant (less db lookups)
Comment on lines
+44
to
+46
| let obligations = pending_obligations | ||
| .iter() | ||
| .filter_map(|obligation| match obligation.value.value.goal.data(Interner) { |
There was a problem hiding this comment.
Could make use of https://doc.rust-lang.org/std/vec/struct.Vec.html#method.retain I think?
There was a problem hiding this comment.
Since we are not mutating pending_obligations - it should be returned back to its original place self.table.pending_obligations - I think that to use Vec::retain(), we should clone the whole pending_obligations
Veykril
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #16669) made this pull request unmergeable. Please resolve the merge conflicts. |
ShoyuVanilla
force-pushed
the
fix-closure-kind-inference
branch
from
6983e8f to
46cdce1
Compare
Veykril
approved these changes
Feb 27, 2024
|
Thanks! |
|
☀️ Test successful - checks-actions |
This was referenced May 9, 2024
This was referenced May 28, 2024
This was referenced Jun 12, 2024
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.
Completes #16472, fixes #16421
The changed closure kind deduction is mostly simlar to
rustc_hir_typeck/src/closure.rs.Porting closure sig deduction from it seems possible too and I'm considering doing it with another PR