Remove save_and_restore_in_snapshot_flag, use ObligationCtxt more
#104206
Conversation
This file contains 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
compiler-errors
force-pushed
the
ocx-more-2
branch
from
12682b4
to
4f1e71f
Compare
lcnr
reviewed
Nov 9, 2022
| engine.register_predicate_obligations(infcx, obligations.chain(more_obligations)); | ||
|
|
||
| let errors = engine.select_all_or_error(infcx); | ||
| match &errors[..] { |
There was a problem hiding this comment.
can this just be if errors.is_empty() instead of matching?
There was a problem hiding this comment.
We still need to have access to errors for the debug! below, but I can refactor this into an if !errors.is_empty() which is how most other select_all_or_error callsites do it.
| // to push them onto the stack to be expanded. | ||
| for ty in constraints.dtorck_types.drain(..) { | ||
| let Normalized { value: ty, obligations } = | ||
| ocx.infcx.at(&cause, param_env).normalize(ty)?; |
There was a problem hiding this comment.
why do we use the query normalizer instead of normalize here?
wanted to really look into the difference between these two in the near future anyways, so I can figure that out myself over the next weeks 😁
considering that this is preexisting, this is not blocking this PR
compiler-errors
force-pushed
the
ocx-more-2
branch
from
4f1e71f
to
63217e0
Compare
|
@bors r=lcnr |
bors
added
S-waiting-on-bors
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Nov 10, 2022
Remove `save_and_restore_in_snapshot_flag`, use `ObligationCtxt` more r? `@lcnr`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 10, 2022
Remove `save_and_restore_in_snapshot_flag`, use `ObligationCtxt` more r? ``@lcnr``
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
Nov 11, 2022
Remove `save_and_restore_in_snapshot_flag`, use `ObligationCtxt` more r? ``@lcnr``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 12, 2022
Rollup of 7 pull requests Successful merges: - rust-lang#102049 (Add the `#[derive_const]` attribute) - rust-lang#103970 (Unhide unknown spans) - rust-lang#104206 (Remove `save_and_restore_in_snapshot_flag`, use `ObligationCtxt` more) - rust-lang#104214 (Emit error in `collecting_trait_impl_trait_tys` on mismatched signatures) - rust-lang#104267 (rustdoc: use checkbox instead of switch for settings toggles) - rust-lang#104302 (Update cargo) - rust-lang#104303 (UI tests can be assigned to T-compiler) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
r? @lcnr