Tweaks to writeback and Obligation -> Goal conversion
#138846
Merged
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
|
r? lcnr |
|
r? @Nadrieril rustbot has assigned @Nadrieril. Use |
rustbot
added
S-waiting-on-review
|
Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor changes to |
compiler-errors
commented
Mar 23, 2025
| self.handle_term(ct, ty::Const::outer_exclusive_binder, |tcx, guar| { | ||
| ty::Const::new_error(tcx, guar) | ||
| }) | ||
| .super_fold_with(self) |
There was a problem hiding this comment.
No need to super fold b/c it should be fully resolved :)
compiler-errors
changed the title
Obligation -> Goal conversion
lcnr
reviewed
Mar 23, 2025
| self.typeck_results.offset_of_data_mut().insert(hir_id, (container, indices.clone())); | ||
| } | ||
| } | ||
|
|
||
| fn resolve<T>(&mut self, value: T, span: &dyn Locatable) -> T | ||
| fn resolve<T>(&mut self, value: T, span: &dyn Locatable, should_normalize: bool) -> T |
There was a problem hiding this comment.
having a bool argument for this seems confusing.
Please either change this to a custom enum or split this into (normalize_and_)resolve and resolve_delayed_obligations
There was a problem hiding this comment.
i think normalize_and_resolve + resolve_delayed_coroutine_obligations is fine. a bit of code duplication, but I also dislike all the , true additions.
lcnr
reviewed
Mar 23, 2025
compiler-errors
force-pushed
the
stall-prereqs
branch
from
e7d27ba to
fad34c6
Compare
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 24, 2025
Rollup of 10 pull requests Successful merges: - rust-lang#137593 (fix download-llvm logic for subtree sync branches) - rust-lang#137736 (Don't attempt to export compiler-builtins symbols from rust dylibs) - rust-lang#138135 (Simplify `PartialOrd` on tuples containing primitives) - rust-lang#138321 ([bootstrap] Distribute split debuginfo if present) - rust-lang#138574 (rustdoc: be more strict about "Methods from Deref") - rust-lang#138606 (Fix missing rustfmt in msi installer - cont) - rust-lang#138671 (Fix `FileType` `PartialEq` implementation on Windows) - rust-lang#138728 (Update `compiler-builtins` to 0.1.152) - rust-lang#138783 (Cache current_dll_path output) - rust-lang#138846 (Tweaks to writeback and `Obligation -> Goal` conversion) Failed merges: - rust-lang#138755 ([rustdoc] Remove duplicated loop when computing doc cfgs) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 24, 2025
Rollup merge of rust-lang#138846 - compiler-errors:stall-prereqs, r=lcnr Tweaks to writeback and `Obligation -> Goal` conversion Each of these commits are self-contained, but are prerequisites that I'd like to land before rust-lang#138845, which still needs some cleaning. The ""most controversial"" one is probably [Explicitly don't fold coroutine obligations in writeback](rust-lang@e7d27ba), which I prefer because I think using `fold_predicate` to control against not normalizing predicates seems... easy to mess up 🤔, and we could have *other things* that we don't want to normalize. Explicitly noting whether we want `resolve` to normalize is a lot clearer (and currently in writeback is limited to resolving stalled coroutine obligations), since we can attach it to a comment that explains *why*.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Each of these commits are self-contained, but are prerequisites that I'd like to land before #138845, which still needs some cleaning.
The ""most controversial"" one is probably Explicitly don't fold coroutine obligations in writeback, which I prefer because I think using
fold_predicateto control against not normalizing predicates seems... easy to mess up 🤔, and we could have other things that we don't want to normalize.Explicitly noting whether we want
resolveto normalize is a lot clearer (and currently in writeback is limited to resolving stalled coroutine obligations), since we can attach it to a comment that explains why.