fix: Port and refactor more stuff to match rustc#22141
Merged
ShoyuVanilla merged 7 commits intorust-lang:masterfrom Apr 23, 2026
Merged
fix: Port and refactor more stuff to match rustc#22141ShoyuVanilla merged 7 commits intorust-lang:masterfrom
ShoyuVanilla merged 7 commits intorust-lang:masterfrom
Conversation
ChayimFriedman2
force-pushed
the
more-port
branch
from
6ec611f to
ec1a1aa
Compare
rustbot
added
the
S-waiting-on-review
And make `InferenceTable` used by inference only.
Some usages were converted into `demand_eqtype()` which is the name in rustc and also reports diagnostics, and others should use a different method.
The obligation `Type: ParentTrait` for a path used to be registered three(!) times. Leave it registered implicitly as one of the generic predicates of the item.
- Do not eagerly normalize the `IntoFuture::Output` projection - Store `IntoFuture` and `IntoFuture::Output` in `LangItems`, to save computing them every time. They are not really lang items, but are similar in nature.
This is what rustc does. It's more performant, but we couldn't do that so far because old code relied on also restoring the obligations, i.e. it was registering maybe-incorrect obligations in the `InferenceTable` without first checking them in a separate `ObligationCtxt`. That code is now gone.
ChayimFriedman2
force-pushed
the
more-port
branch
from
ec1a1aa to
b3b27b4
Compare
Collaborator
|
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
ShoyuVanilla
approved these changes
Apr 23, 2026
rustbot
removed
the
S-waiting-on-review
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.
Best reviewed commit by commit. The commits messages are also important. The commits are completely separate and could be split to multiple PRs if needed.
Blocked on #22134.