Use ObligationCtxt in custom type ops
#111741
Merged
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
|
r? @TaKO8Ki (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
rust-cloud-vms
bot
force-pushed
the
custom-type-op
branch
from
be3161d
to
02cb5c4
Compare
This comment has been minimized.
This comment has been minimized.
rust-cloud-vms
bot
force-pushed
the
custom-type-op
branch
from
02cb5c4
to
8b6961d
Compare
|
r? @lcnr feel free to reassign (maybe to oli) |
lcnr
reviewed
May 24, 2023
| // delay more bugs than accidentally not delay a bug at all. | ||
| self.type_checker.tcx().sess.delay_span_bug( | ||
| self.locations.span(self.type_checker.body), | ||
| format!("errors selecting obligation during MIR typeck"), |
There was a problem hiding this comment.
Suggested change
| format!("errors selecting obligation during MIR typeck"), | |
| "errors selecting obligation during MIR typeck", |
when can we hit that case, given that we previously used unwrap here?
There was a problem hiding this comment.
Happens because if we hit an error while processing the region obligations, we return Err(NoSolution) instead of just Ok. Shouldn't matter anyways because we delay a bug both here and within scrape, but it's probably better to migrate to returning ErrorGuaranteed like you said below. I'll do it in a quick follow-up to avoid having re-review 😅
compiler/rustc_trait_selection/src/traits/query/type_op/custom.rs
Outdated
Show resolved
Hide resolved
Comment on lines
+78
to
+81
| infcx.tcx.sess.delay_span_bug( | ||
| DUMMY_SP, | ||
| format!("errors selecting obligation during MIR typeck: {:?}", errors), | ||
| ); |
There was a problem hiding this comment.
I feel like we may want to move that delay span bug out of the commit_if_ok and change scrape_region_constraints to return ErrorGuaranteed, think that may be more involved though so it doesn't have to be in this PR
rust-cloud-vms
bot
force-pushed
the
custom-type-op
branch
from
8b6961d
to
521a0bc
Compare
|
@bors r=lcnr |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 25, 2023
…earth Rollup of 5 pull requests Successful merges: - rust-lang#111741 (Use `ObligationCtxt` in custom type ops) - rust-lang#111840 (Expose more information in `get_body_with_borrowck_facts`) - rust-lang#111876 (Roll compiler_builtins to 0.1.92) - rust-lang#111912 (Use `Option::is_some_and` and `Result::is_ok_and` in the compiler ) - rust-lang#111915 (libtest: Improve error when missing `-Zunstable-options`) r? `@ghost` `@rustbot` modify labels: rollup
compiler-errors
added a commit
to compiler-errors/rust
that referenced
this pull request
May 26, 2023
…r, r=lcnr Use `ErrorGuaranteed` more in MIR type ops Delay bugs more eagerly and pass them through type op infra instead of delaying them at all the usage-sites. Follow up to: rust-lang#111741 (comment) r? `@lcnr`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 26, 2023
… r=lcnr Use `ErrorGuaranteed` more in MIR type ops Delay bugs more eagerly and pass them through type op infra instead of delaying them at all the usage-sites. Follow up to: rust-lang#111741 (comment) r? `@lcnr`
saethlin
pushed a commit
to saethlin/miri
that referenced
this pull request
May 26, 2023
Use `ErrorGuaranteed` more in MIR type ops Delay bugs more eagerly and pass them through type op infra instead of delaying them at all the usage-sites. Follow up to: rust-lang/rust#111741 (comment) r? `@lcnr`
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.
We already make one when evaluating the
CustomTypeOp, so it's simpler to just pass it to the user. Removes a redundantObligationCtxt::new_in_snapshotusage and simplifies some other code.This makes several refactorings related to opaque types in the new solver simpler, but those are not included in this PR.