Make sure to scrape region constraints from deeply normalizing type outlives assumptions in borrowck #134940
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
lcnr
reviewed
Jan 6, 2025
Comment on lines
237
to
260
| let Ok(TypeOpOutput { | ||
| output: normalized_outlives, | ||
| constraints: constraints_normalize, | ||
| error_info: _, | ||
| }) = CustomTypeOp::new( | ||
| |ocx| { | ||
| ocx.deeply_normalize( | ||
| &ObligationCause::dummy_with_span(span), | ||
| self.param_env, | ||
| outlives, | ||
| ) | ||
| .map_err(|_: Vec<ScrubbedTraitError<'tcx>>| NoSolution) | ||
| }, | ||
| "normalize type outlives obligation", | ||
| ) | ||
| .fully_perform(self.infcx, span) | ||
| else { | ||
| self.infcx.dcx().delayed_bug(format!("could not normalize {outlives:?}")); | ||
| continue; | ||
| }; | ||
| outlives = normalized_outlives; | ||
| if let Some(c) = constraints_normalize { | ||
| constraints.push(c); | ||
| } |
There was a problem hiding this comment.
can you move this into a sub-fn
The function is already quite complex imo and this code isn't straightforward (I don't think it can be made less so, really)
…utlives assumptions in borrowck
compiler-errors
force-pushed
the
scrape
branch
from
ac3d0a4 to
5775190
Compare
|
Pulled it out into a separate function @bors r=lcnr |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 14, 2025
Make sure to scrape region constraints from deeply normalizing type outlives assumptions in borrowck Otherwise we're just randomly registering these region relations into the infcx which isn't good r? lcnr
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 14, 2025
Make sure to scrape region constraints from deeply normalizing type outlives assumptions in borrowck Otherwise we're just randomly registering these region relations into the infcx which isn't good r? lcnr
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 15, 2025
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#134940 (Make sure to scrape region constraints from deeply normalizing type outlives assumptions in borrowck) - rust-lang#135047 (Add gpu-kernel calling convention) - rust-lang#135228 (Improve `DispatchFromDyn` and `CoerceUnsized` impl validation) - rust-lang#135264 (Consider more erroneous layouts as `LayoutError::ReferencesError` to suppress spurious errors) - rust-lang#135302 (for purely return-type based searches, deprioritize clone-like functions) - rust-lang#135380 (Make sure we can produce `ConstArgHasWrongType` errors for valtree consts) - rust-lang#135425 (Do not consider traits that have unsatisfied const conditions to be conditionally const) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 15, 2025
…kingjubilee Rollup of 11 pull requests Successful merges: - rust-lang#134913 (bootstrap: do not rely on LIBRARY_PATH env variable) - rust-lang#134940 (Make sure to scrape region constraints from deeply normalizing type outlives assumptions in borrowck) - rust-lang#135228 (Improve `DispatchFromDyn` and `CoerceUnsized` impl validation) - rust-lang#135264 (Consider more erroneous layouts as `LayoutError::ReferencesError` to suppress spurious errors) - rust-lang#135302 (for purely return-type based searches, deprioritize clone-like functions) - rust-lang#135353 (re-add --disable-minification to rustdoc) - rust-lang#135380 (Make sure we can produce `ConstArgHasWrongType` errors for valtree consts) - rust-lang#135423 (Enforce syntactical stability of const traits in HIR) - rust-lang#135425 (Do not consider traits that have unsatisfied const conditions to be conditionally const) - rust-lang#135499 (fix underlining of hovered intra-doc links.) - rust-lang#135505 (Fix clippy lints in rustdoc) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 15, 2025
Rollup merge of rust-lang#134940 - compiler-errors:scrape, r=lcnr Make sure to scrape region constraints from deeply normalizing type outlives assumptions in borrowck Otherwise we're just randomly registering these region relations into the infcx which isn't good 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.
Otherwise we're just randomly registering these region relations into the infcx which isn't good
r? lcnr