Normalize both arguments of equate_normalized_input_or_output
#90801
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
rust-highfive
added
the
S-waiting-on-review
b-naber
force-pushed
the
missing_normalization_equate_inputs_output
branch
from
8399cf1
to
d8d2c3b
Compare
This comment has been minimized.
This comment has been minimized.
|
Don't understand why this fails to build in CI, compiles locally. Is |
Quoting the doc: |
jackh726
requested changes
Nov 11, 2021
| &mut self, | ||
| t: Ty<'tcx>, | ||
| constraints: &'b mut Vec<Lrc<QueryRegionConstraints<'tcx>>>, | ||
| ) -> Fallible<Ty<'tcx>> { |
There was a problem hiding this comment.
Why not just return both the Ty and constraints together?
There was a problem hiding this comment.
Or better...just add the constraints here because we have self.
|
|
||
| pub(crate) fn add_constraints( | ||
| &mut self, | ||
| constraints: &mut Vec<Lrc<QueryRegionConstraints<'tcx>>>, |
There was a problem hiding this comment.
And just take constraints by value.
| @@ -0,0 +1,43 @@ | |||
| // check-pass | |||
|
|
|||
| #![feature(generic_associated_types)] | |||
There was a problem hiding this comment.
I think both these tests would be better with the other normalize under binder tests. This one uses GATs, but is not a GATs issue. The other doesn't even use GATs.
| //check-pass | ||
|
|
||
| #![feature(generic_associated_types)] | ||
| #![allow(incomplete_features)] |
b-naber
force-pushed
the
missing_normalization_equate_inputs_output
branch
from
d8d2c3b
to
4b977f3
Compare
Thanks for the answer. |
|
@jackh726 thanks for the review, addressed your comments. |
jackh726
requested changes
Nov 12, 2021
| @@ -0,0 +1,43 @@ | |||
| // check-pass | |||
|
|
|||
| #![feature(generic_associated_types)] | |||
There was a problem hiding this comment.
Sorry, for the location I meant src/test/ui/higher-rank-trait-bounds/normalize-under-binder
| @@ -207,4 +200,27 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| pub(crate) fn normalize_and_add_constraints(&mut self, t: Ty<'tcx>) -> Fallible<Ty<'tcx>> { | |||
| let TypeOpOutput { output: norm_ty, constraints, .. } = | |||
There was a problem hiding this comment.
I forget, what are we not destructoring? For a bit, I thought we were ignoring obligations, but then I realized we switched to using a TypeOp (good idea).
There was a problem hiding this comment.
canonicalized_query: Option<Canonical<'tcx, Op>>, which is only used for diagnostics purposes.
b-naber
force-pushed
the
missing_normalization_equate_inputs_output
branch
from
4b977f3
to
7a4aa65
Compare
|
📌 Commit 7a4aa65 has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 13, 2021
…e_inputs_output, r=jackh726 Normalize both arguments of `equate_normalized_input_or_output` Fixes rust-lang#90638 Fixes rust-lang#90612 Temporary fix for a more complex underlying problem stemming from an inability to normalize closure substs during typecheck. r? `@jackh726`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 13, 2021
…e_inputs_output, r=jackh726 Normalize both arguments of `equate_normalized_input_or_output` Fixes rust-lang#90638 Fixes rust-lang#90612 Temporary fix for a more complex underlying problem stemming from an inability to normalize closure substs during typecheck. r? ``@jackh726``
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 13, 2021
…e_inputs_output, r=jackh726 Normalize both arguments of `equate_normalized_input_or_output` Fixes rust-lang#90638 Fixes rust-lang#90612 Temporary fix for a more complex underlying problem stemming from an inability to normalize closure substs during typecheck. r? ```@jackh726```
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 13, 2021
…e_inputs_output, r=jackh726 Normalize both arguments of `equate_normalized_input_or_output` Fixes rust-lang#90638 Fixes rust-lang#90612 Temporary fix for a more complex underlying problem stemming from an inability to normalize closure substs during typecheck. r? ````@jackh726````
|
⌛ Testing commit 7a4aa65 with merge 72afa80651f79e7abbf08a41813ba7cf0ed7ef5f... |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
@bors retry |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 15, 2021
…e_inputs_output, r=jackh726 Normalize both arguments of `equate_normalized_input_or_output` Fixes rust-lang#90638 Fixes rust-lang#90612 Temporary fix for a more complex underlying problem stemming from an inability to normalize closure substs during typecheck. r? `@jackh726`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 15, 2021
…e_inputs_output, r=jackh726 Normalize both arguments of `equate_normalized_input_or_output` Fixes rust-lang#90638 Fixes rust-lang#90612 Temporary fix for a more complex underlying problem stemming from an inability to normalize closure substs during typecheck. r? ``@jackh726``
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Nov 16, 2021
…e_inputs_output, r=jackh726 Normalize both arguments of `equate_normalized_input_or_output` Fixes rust-lang#90638 Fixes rust-lang#90612 Temporary fix for a more complex underlying problem stemming from an inability to normalize closure substs during typecheck. r? ```@jackh726```
This was referenced Nov 16, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 16, 2021
Rollup of 8 pull requests Successful merges: - rust-lang#86455 (check where-clause for explicit `Sized` before suggesting `?Sized`) - rust-lang#90801 (Normalize both arguments of `equate_normalized_input_or_output`) - rust-lang#90803 (Suggest `&str.chars()` on attempt to `&str.iter()`) - rust-lang#90819 (Fixes incorrect handling of TraitRefs when emitting suggestions.) - rust-lang#90910 (fix getting the discriminant of a zero-variant enum) - rust-lang#90925 (rustc_mir_build: reorder bindings) - rust-lang#90928 (Use a different server for checking clock drift) - rust-lang#90936 (Add a regression test for rust-lang#80772) 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.
Fixes #90638
Fixes #90612
Temporary fix for a more complex underlying problem stemming from an inability to normalize closure substs during typecheck.
r? @jackh726