Misc cleanups from reading some borrowck code #150141
Open
+98
−117
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
rustbot
added
S-waiting-on-review
BoxyUwU
commented
Dec 18, 2025
| let identity_args = GenericArgs::identity_for_item(tcx, typeck_root_def_id); | ||
| if self.mir_def.to_def_id() == typeck_root_def_id | ||
| // Do not ICE when checking default_field_values consts with lifetimes (#135649) | ||
| && DefKind::Field != tcx.def_kind(tcx.parent(typeck_root_def_id)) |
Member
Author
There was a problem hiding this comment.
BoxyUwU
commented
Dec 18, 2025
| let arg_mapping = iter::zip(identity_args.regions(), fr_args.regions().map(|r| r.as_var())); | ||
| // This relies on typeck roots being generics_of parents with their | ||
| // parameters at the start of nested bodies' generics. | ||
| assert!(renumbered_args.len() >= identity_args.len()); |
Member
Author
There was a problem hiding this comment.
I don't know how valuable this assert is in practice? I also would expect us to be relying on this invariant in more places in the compiler than just here 🤔 feels like more generally we expect all typeck parents to be generics_of parents and if that doesn't hold we probably want to yell somewhere other than here 🤔
BoxyUwU
commented
Dec 18, 2025
|
|
||
| mod opaque; | ||
|
|
||
| fn anon_const_type_of<'tcx>(icx: &ItemCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx> { |
Member
Author
There was a problem hiding this comment.
ive just moved this down because it's weird for type_of to be sandwiched between helper functions both on top and below :3 no actual changes here
This comment has been minimized.
This comment has been minimized.
BoxyUwU
force-pushed
the
borrowck_cleanup_1
branch
from
9ef21f0 to
9304256
Compare
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.
title
r? lcnr