Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix generics_of on traits new RPITITs and also migrate from ImplTraitPlaceholder to is_impl_trait_in_trait #109140

Closed
wants to merge 6 commits into from
Closed

Fix generics_of on traits new RPITITs and also migrate from ImplTraitPlaceholder to is_impl_trait_in_trait #109140

wants to merge 6 commits into from

Conversation

spastorino
Copy link
Member

r? @compiler-errors

This is still kind of a draft because I'd like to add some comments and check some things a bit better, but anyway I'd also benefit from reviews.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 14, 2023
compiler-errors
compiler-errors reviewed Mar 14, 2023
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a few comments for FIXMEs or things that need to be fixed.

Also, I said FIXME(-Z...) but I was just too lazy to put the whole name, so replace that with -Zlower-impl-trait-blah-blah-blah whatever the full name is.

compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs Outdated Show resolved Hide resolved
compiler/rustc_ty_utils/src/ty.rs Show resolved Hide resolved
compiler/rustc_hir_analysis/src/check/wfcheck.rs Show resolved Hide resolved
compiler/rustc_hir_analysis/src/variance/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_middle/src/ty/mod.rs Outdated Show resolved Hide resolved
@spastorino
Copy link
Member Author

Addressed some of the comments and rebased. Still need to go over the rest of the comments.

@spastorino spastorino force-pushed the new-rpitit-10 branch 3 times, most recently from ccc16a9 to 0827254 Compare March 15, 2023 19:42
@spastorino
Copy link
Member Author

@compiler-errors this is ready, added FIXMEs to some of these things for now.

@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 15, 2023

📌 Commit c5c4340 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 15, 2023
@compiler-errors compiler-errors mentioned this pull request Mar 16, 2023
Merged
@spastorino spastorino mentioned this pull request Mar 16, 2023
Merged
@compiler-errors
Copy link
Member

Closing in favor of landing these commits together with #109198.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 16, 2023
@matthiaskrgr
Rollup merge of rust-lang#109198 - compiler-errors:new-rpitit-default…
e9f4cae 
…-body, r=spastorino

Install projection from RPITIT to default trait method opaque correctly

1. For new lowering strategy `-Zlower-impl-trait-in-trait-to-assoc-ty`, install the correct default trait method projection predicates (RPITIT -> opaque). This makes default trait body tests pass!

2. Fix two WF-checking bugs -- first, we want to make sure that we're always looking for an opaque type in `check_return_position_impl_trait_in_trait_bounds`. That's because the RPITIT projections are normalized to opaques during wfcheck. Second, fix RPITIT's param-envs by not adding the projection predicates that we install on trait methods to make default RPITITs work -- I left a comment why.

3. Also, just a small drive-by for `rustc_on_unimplemented`. Not sure if it affects any tests, but can't hurt.

r? `@spastorino,` based off of rust-lang#109140
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
@matthiaskrgr
Rollup merge of rust-lang#109198 - compiler-errors:new-rpitit-default…
ca2ca85 
…-body, r=spastorino

Install projection from RPITIT to default trait method opaque correctly

1. For new lowering strategy `-Zlower-impl-trait-in-trait-to-assoc-ty`, install the correct default trait method projection predicates (RPITIT -> opaque). This makes default trait body tests pass!

2. Fix two WF-checking bugs -- first, we want to make sure that we're always looking for an opaque type in `check_return_position_impl_trait_in_trait_bounds`. That's because the RPITIT projections are normalized to opaques during wfcheck. Second, fix RPITIT's param-envs by not adding the projection predicates that we install on trait methods to make default RPITITs work -- I left a comment why.

3. Also, just a small drive-by for `rustc_on_unimplemented`. Not sure if it affects any tests, but can't hurt.

r? ``@spastorino,`` based off of rust-lang#109140
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
@matthiaskrgr
Rollup merge of rust-lang#109198 - compiler-errors:new-rpitit-default…
28bf3db 
…-body, r=spastorino

Install projection from RPITIT to default trait method opaque correctly

1. For new lowering strategy `-Zlower-impl-trait-in-trait-to-assoc-ty`, install the correct default trait method projection predicates (RPITIT -> opaque). This makes default trait body tests pass!

2. Fix two WF-checking bugs -- first, we want to make sure that we're always looking for an opaque type in `check_return_position_impl_trait_in_trait_bounds`. That's because the RPITIT projections are normalized to opaques during wfcheck. Second, fix RPITIT's param-envs by not adding the projection predicates that we install on trait methods to make default RPITITs work -- I left a comment why.

3. Also, just a small drive-by for `rustc_on_unimplemented`. Not sure if it affects any tests, but can't hurt.

r? ```@spastorino,``` based off of rust-lang#109140
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
@matthiaskrgr
Rollup merge of rust-lang#109198 - compiler-errors:new-rpitit-default…
246d989 
…-body, r=spastorino

Install projection from RPITIT to default trait method opaque correctly

1. For new lowering strategy `-Zlower-impl-trait-in-trait-to-assoc-ty`, install the correct default trait method projection predicates (RPITIT -> opaque). This makes default trait body tests pass!

2. Fix two WF-checking bugs -- first, we want to make sure that we're always looking for an opaque type in `check_return_position_impl_trait_in_trait_bounds`. That's because the RPITIT projections are normalized to opaques during wfcheck. Second, fix RPITIT's param-envs by not adding the projection predicates that we install on trait methods to make default RPITITs work -- I left a comment why.

3. Also, just a small drive-by for `rustc_on_unimplemented`. Not sure if it affects any tests, but can't hurt.

r? ````@spastorino,```` based off of rust-lang#109140
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors left review comments

Assignees

@compiler-errors compiler-errors

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@spastorino @compiler-errors @bors @rustbot