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 mismatch errors for RPITITs on -Zlower-impl-trait-in-trait-to-assoc-ty #109238

Merged
merged 2 commits into from
Mar 18, 2023
Merged

Fix generics mismatch errors for RPITITs on -Zlower-impl-trait-in-trait-to-assoc-ty #109238

merged 2 commits into from
Mar 18, 2023

Conversation

spastorino
Copy link
Member

This PR stops reporting errors due to different count of generics on the new synthesized associated types for RPITITs. Those were already reported when we compare the function on the triat with the function on the impl.

r? @compiler-errors

@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. labels Mar 16, 2023
compiler-errors
compiler-errors reviewed Mar 16, 2023
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This is a similar test case that I'm not sure if we have a test for, but should probably:

#![feature(async_fn_in_trait)]

trait Foo {
    async fn foo<T>();
}

impl Foo for () {
    async fn foo<const N: usize>() {}
}

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_analysis/src/check/compare_impl_item.rs Outdated Show resolved Hide resolved
@spastorino
Copy link
Member Author

Addressed the comments and added the new test case.

@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 17, 2023

📌 Commit a12665a 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 17, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 17, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
@matthiaskrgr
Rollup merge of rust-lang#109238 - spastorino:new-rpitit-12, r=compil…
de0fbeb 
…er-errors

Fix generics mismatch errors for RPITITs on -Zlower-impl-trait-in-trait-to-assoc-ty

This PR stops reporting errors due to different count of generics on the new synthesized associated types for RPITITs. Those were already reported when we compare the function on the triat with the function on the impl.

r? `@compiler-errors`
@matthiaskrgr
Copy link
Member

@bors r-
https://github.com/rust-lang/rust/actions/runs/4445054357/jobs/7803829788#step:26:1702

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 17, 2023
@spastorino
Copy link
Member Author

It seems like the async tests' revision depends on @compiler-errors open PR to land. I've removed the revision and I can add it afterwards in the other PR where I'm pushing tests.

@bors r=compiler-errors rollup

@bors
Copy link
Contributor

bors commented Mar 17, 2023

📌 Commit d6705ff0aef3747956685d9de4ba2f7806dd67ce 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 17, 2023
@spastorino
Copy link
Member Author

@bors r=compiler-errors rollup

@bors
Copy link
Contributor

bors commented Mar 17, 2023

📌 Commit 2c57655 has been approved by compiler-errors

It is now in the queue for this repository.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
@matthiaskrgr
Rollup merge of rust-lang#109238 - spastorino:new-rpitit-12, r=compil…
6958548 
…er-errors

Fix generics mismatch errors for RPITITs on -Zlower-impl-trait-in-trait-to-assoc-ty

This PR stops reporting errors due to different count of generics on the new synthesized associated types for RPITITs. Those were already reported when we compare the function on the triat with the function on the impl.

r? `@compiler-errors`
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 17, 2023
Closed
@spastorino
Copy link
Member Author

@bors r=compiler-errors rollup

@bors
Copy link
Contributor

bors commented Mar 17, 2023

📌 Commit ae7fa1d has been approved by compiler-errors

It is now in the queue for this repository.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
@matthiaskrgr
Rollup merge of rust-lang#109238 - spastorino:new-rpitit-12, r=compil…
ba18bcc 
…er-errors

Fix generics mismatch errors for RPITITs on -Zlower-impl-trait-in-trait-to-assoc-ty

This PR stops reporting errors due to different count of generics on the new synthesized associated types for RPITITs. Those were already reported when we compare the function on the triat with the function on the impl.

r? `@compiler-errors`
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 17, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 18, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2023
@bors
Auto merge of rust-lang#109303 - matthiaskrgr:rollup-usj4ef5, r=matth…
f177b7c 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#107416 (Error code E0794 for late-bound lifetime parameter error.)
 - rust-lang#108772 (Speed up tidy quite a lot)
 - rust-lang#109193 (Add revisions for -Zlower-impl-trait-in-trait-to-assoc-ty fixed tests)
 - rust-lang#109234 (Tweak implementation of overflow checking assertions)
 - rust-lang#109238 (Fix generics mismatch errors for RPITITs on -Zlower-impl-trait-in-trait-to-assoc-ty)
 - rust-lang#109283 (rustdoc: reduce allocations in `visibility_to_src_with_space`)
 - rust-lang#109287 (Use `size_of_val` instead of manual calculation)
 - rust-lang#109288 (Stabilise `unix_socket_abstract`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8417c93 into rust-lang:master Mar 18, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 18, 2023
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.
Projects
None yet
Milestone
1.70.0
Development

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