cleanup our region error API #110220
Merged
cleanup our region error API #110220
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
- require `TypeErrCtxt` to always result in an error - move `resolve_regions_and_report_errors` to the `ObligationCtxt` - merge `process_registered_region_obligations` into `resolve_regions`
rustbot
added
S-waiting-on-review
|
Some changes occurred in engine.rs, potentially modifying the public API of |
compiler-errors
approved these changes
Apr 12, 2023
| @@ -1763,7 +1763,9 @@ impl<'tcx> InferCtxtPrivExt<'tcx> for TypeErrCtxt<'_, 'tcx> { | |||
|
|
|||
| // constrain inference variables a bit more to nested obligations from normalize so | |||
| // we can have more helpful errors. | |||
| ocx.select_where_possible(); | |||
| // | |||
| // we intentionally errors from normalization here. | |||
There was a problem hiding this comment.
Suggested change
| // we intentionally errors from normalization here. | |
| // we intentionally drop errors from normalization here, | |
| // since the normalization is just done to make the types better. |
| if let Some(_) = self.infcx.tcx.sess.has_errors_or_delayed_span_bugs() { | ||
| // ok, emitted an error. | ||
| } else { | ||
| self.infcx |
There was a problem hiding this comment.
This might create a problem if we create an error then cancel it, but I guess we can just wait until the ICE is filed :)
There was a problem hiding this comment.
yeah, imo that should not happen. Once you start using the err_ctxt() you should only cancel if we already emit an error somewhere else.
There was a problem hiding this comment.
I think this caused rust-lang/rust-clippy#10645 🙈
compiler-errors
added
S-waiting-on-author
|
@bors r=compiler-errors rollup |
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Apr 13, 2023
cleanup our region error API - require `TypeErrCtxt` to always result in an error, closing rust-lang#108810 - move `resolve_regions_and_report_errors` to the `ObligationCtxt` - call `process_registered_region_obligations` in `resolve_regions` - move `resolve_regions` into the `outlives` submodule - add `#[must_use]` to functions returning lists of errors r? types
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 13, 2023
cleanup our region error API - require `TypeErrCtxt` to always result in an error, closing rust-lang#108810 - move `resolve_regions_and_report_errors` to the `ObligationCtxt` - call `process_registered_region_obligations` in `resolve_regions` - move `resolve_regions` into the `outlives` submodule - add `#[must_use]` to functions returning lists of errors r? types
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 13, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#110072 (Stabilize IsTerminal) - rust-lang#110195 (Erase lifetimes above `ty::INNERMOST` when probing ambiguous types) - rust-lang#110218 (Remove `ToRegionVid`) - rust-lang#110220 (cleanup our region error API) - rust-lang#110234 (Fix btree `CursorMut::insert_after` check) - rust-lang#110262 (Update unwind_safe.rs) 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.
TypeErrCtxtto always result in an error, closing creating aTypeErrCtxtshould only be possible if we emit an error #108810resolve_regions_and_report_errorsto theObligationCtxtprocess_registered_region_obligationsinresolve_regionsresolve_regionsinto theoutlivessubmodule#[must_use]to functions returning lists of errorsr? types