Miscellaneous cleanups to borrowck related code #150550
Open
Conversation
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
Collaborator
rustbot
added
S-waiting-on-review
BoxyUwU
commented
Dec 31, 2025
BoxyUwU
commented
Dec 31, 2025
| /// Returns whether borrows represented by this kind are allowed to be split into separate | ||
| /// Reservation and Activation phases. | ||
| pub fn allows_two_phase_borrow(&self) -> bool { | ||
| pub fn is_two_phase_borrow(&self) -> bool { |
Member
Author
There was a problem hiding this comment.
in some sense its always a two phase borrow, just sometimes its activated at the same point its created I think?
The previous name confused me because it made it sound like a reference may or may not be a two phase borrow and then we went on to unconditionally treat it as two phase without ever checking if it "actually is".
BoxyUwU
commented
Dec 31, 2025
lcnr
reviewed
Jan 6, 2026
| // and we know that `&'a T::Out` is WF, then we want to imply `U: 'a`. | ||
| let normalized_ty = ocx | ||
| .deeply_normalize(&ObligationCause::dummy_with_span(span), param_env, ty) | ||
| .map_err(|_| NoSolution)?; |
Contributor
There was a problem hiding this comment.
did you test removing the normalized_ty here and does that break anything?
lcnr
reviewed
Jan 6, 2026
Comment on lines
+297
to
+307
| let old_value = self.pending_activations.insert(temp, idx); | ||
| if let Some(old_index) = old_value { | ||
| span_bug!( | ||
| self.body.source_info(location).span, | ||
| "found already pending activation for temp: {:?} \ | ||
| at idx: {:?} with associated data {:?}", | ||
| temp, | ||
| old_index, | ||
| self.location_map[old_index.as_usize()] | ||
| ); | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| let old_value = self.pending_activations.insert(temp, idx); | |
| if let Some(old_index) = old_value { | |
| span_bug!( | |
| self.body.source_info(location).span, | |
| "found already pending activation for temp: {:?} \ | |
| at idx: {:?} with associated data {:?}", | |
| temp, | |
| old_index, | |
| self.location_map[old_index.as_usize()] | |
| ); | |
| } | |
| let prev = self.pending_activations.insert(temp, idx); | |
| assert_eq!(prev, None); |
I feel like this if let is too much code for an assert and it was actually slightly confusing to me
Contributor
|
nits, then r=me |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
r? lcnr