Borrowck cleanups part trois - #163357
Merged
rust-bors[bot] merged 5 commits intoSep 26, 2026
Merged
Borrowck cleanups part trois#163357
Conversation
we previously always created an unsolved regioncx to immediately solve it, but can create the solved regioncx in a single step. this is done by merging `UnsolvedRegionInferenceContext`'s `new` and `solve` into one constructor.
rustbot
added
S-waiting-on-review
Member
|
@bors r+ |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
rust-bors Bot
pushed a commit
that referenced
this pull request
Sep 26, 2026
Rollup of 13 pull requests Successful merges: - #160695 (Detect bad number of generics caused by bad derive) - #162883 (No longer auto-inline `f16` and `f128` on well-supported platforms) - #163133 ([rustdoc] Fix invalid jump to def link when `#[rustc_allow_incoherent_impl]` is involved) - #163215 (Fix suggestion for Option to bool with proper precedence handling) - #163266 (More deferred liveness cleanups) - #163274 (Support -Z merge-functions with gcc and add stack-protector asm tests) - #163290 (Merge `ForceWarning`/`Allow`/`Expect` into `Warning`) - #163298 (Don't emit sugg for pub-reexport extern std) - #163312 (Add rustdoc regression test for glob import of a crate that re-exports) - #163357 (Borrowck cleanups part trois) - #161710 (Stabilize `mem::conjure_zst`) - #163332 (Add some docs to `Global`) - #163362 (simplify ndk compiler test)
rust-bors Bot
pushed a commit
that referenced
this pull request
Sep 26, 2026
Rollup merge of #163357 - lqd:deferred-liveness-tokyo-drift, r=jackh726 Borrowck cleanups part trois As discussed on zulip, this followup to #163266 contains a few cleanups (and much like the Godfather Trilogy, the 3rd one is not as good as the previous 2): - small renamings we forgot last time - there are some regioncx functions that panic when called on the pre-solved regionx, so I moved them to the immutable context so that they don't panic - so I also reduced a bunch of fields visibility to limit the API surface as well - merges the `new` and `solve` functions into a unique `RegionInferenceContext::solve` entry point, because it was indeed funny to only do both of these together. This is the biggest change in the PR but is mostly moving these two functions' code into one, and renaming `self` 3 or 4 times at most. This makes me realize we surely broke some tiny parts of consumers.rs in the previous (because functions that were pub are now pub(crate)) but since we don't know what they're used for, on the immutable or mutable regioncx, it's impossible to know how to fix until the consumers tell us. It's fine. r? @jackh726
pull Bot
pushed a commit
to LeeeeeeM/miri
that referenced
this pull request
Sep 27, 2026
Rollup of 13 pull requests Successful merges: - rust-lang/rust#160695 (Detect bad number of generics caused by bad derive) - rust-lang/rust#162883 (No longer auto-inline `f16` and `f128` on well-supported platforms) - rust-lang/rust#163133 ([rustdoc] Fix invalid jump to def link when `#[rustc_allow_incoherent_impl]` is involved) - rust-lang/rust#163215 (Fix suggestion for Option to bool with proper precedence handling) - rust-lang/rust#163266 (More deferred liveness cleanups) - rust-lang/rust#163274 (Support -Z merge-functions with gcc and add stack-protector asm tests) - rust-lang/rust#163290 (Merge `ForceWarning`/`Allow`/`Expect` into `Warning`) - rust-lang/rust#163298 (Don't emit sugg for pub-reexport extern std) - rust-lang/rust#163312 (Add rustdoc regression test for glob import of a crate that re-exports) - rust-lang/rust#163357 (Borrowck cleanups part trois) - rust-lang/rust#161710 (Stabilize `mem::conjure_zst`) - rust-lang/rust#163332 (Add some docs to `Global`) - rust-lang/rust#163362 (simplify ndk compiler test)
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
3 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.
As discussed on zulip, this followup to #163266 contains a few cleanups (and much like the Godfather Trilogy, the 3rd one is not as good as the previous 2):
newandsolvefunctions into a uniqueRegionInferenceContext::solveentry point, because it was indeed funny to only do both of these together. This is the biggest change in the PR but is mostly moving these two functions' code into one, and renamingself3 or 4 times at most.This makes me realize we surely broke some tiny parts of consumers.rs in the previous (because functions that were pub are now pub(crate)) but since we don't know what they're used for, on the immutable or mutable regioncx, it's impossible to know how to fix until the consumers tell us. It's fine.
r? @jackh726