Check generics parity before collecting return-position impl Traits in trait#104295
Merged
bors merged 3 commits intorust-lang:masterfrom Nov 22, 2022
Merged
Check generics parity before collecting return-position impl Traits in trait#104295bors merged 3 commits intorust-lang:masterfrom
impl Traits in trait#104295bors merged 3 commits intorust-lang:masterfrom
Conversation
Collaborator
|
r? @eholk (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
Collaborator
|
☔ The latest upstream changes (presumably #104310) made this pull request unmergeable. Please resolve the merge conflicts. |
compiler-errors
force-pushed
the
rpitit-generics-parity
branch
from
b6abaaf to
2ce39aa
Compare
This comment has been minimized.
This comment has been minimized.
compiler-errors
force-pushed
the
rpitit-generics-parity
branch
from
55b4426 to
96355cd
Compare
Collaborator
|
☔ The latest upstream changes (presumably #104600) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
|
Looks good. Thanks for the extra comments as well! I think I'd prefer to see the error deduplicated here rather than relying on cargo, but if it's really annoying to do that I think it's fine this way. Your choice. Feel free to r=me after resolving the merge conflicts. |
compiler-errors
force-pushed
the
rpitit-generics-parity
branch
from
96355cd to
df5f247
Compare
Contributor
Author
|
@bors r=eholk |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 22, 2022
Rollup of 6 pull requests Successful merges: - rust-lang#104295 (Check generics parity before collecting return-position `impl Trait`s in trait) - rust-lang#104464 (Reduce exceptions overallocation on non Windows x86_64) - rust-lang#104615 (Create def_id for async fns during lowering) - rust-lang#104669 (Only declare bindings for if-let guards once per arm) - rust-lang#104701 (Remove a lifetime resolution hack from `compare_predicate_entailment`) - rust-lang#104710 (disable strict-provenance-violating doctests in Miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
The only thing is that this duplicates the error message for number of generics mismatch, but we already deduplicate that error message in Cargo. I could add a flag to delay the error if the reviewer cares.
Fixes #104281
Also drive-by adds a few comments to the
collect_trait_impl_trait_tysmethod, and removes an unused argument fromcompare_number_of_generics.