(fix) conflicting negative impl marker#130311
Merged
bors merged 1 commit intorust-lang:masterfrom Sep 14, 2024
Merged
Conversation
Collaborator
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Nadrieril (or someone else) some time within the next two weeks. Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (
|
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
fmease
approved these changes
Sep 13, 2024
tests/ui/coherence/coherence-conflicting-repeated-negative-trait-impl-70849.rs
Outdated
Show resolved
Hide resolved
Contributor
Author
|
@fmease thanks for the guidance! It's a bit late for me right now so I'm gonna squash tmr if CI passes |
fmease
added
S-waiting-on-author
heiseish
force-pushed
the
issue-70849-fix
branch
from
1398d54 to
b0db3a7
Compare
Contributor
Author
|
@rustbot ready |
rustbot
added
S-waiting-on-review
heiseish
changed the title
fmease
approved these changes
Sep 14, 2024
Member
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 14, 2024
Rollup of 4 pull requests Successful merges: - rust-lang#130053 (fix doc comments for Peekable::next_if(_eq)) - rust-lang#130267 (small_data_threshold.rs: Adapt to LLVM head changes) - rust-lang#130311 ((fix) conflicting negative impl marker) - rust-lang#130334 (Fix `SDKROOT` ignore on macOS) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 14, 2024
Rollup merge of rust-lang#130311 - heiseish:issue-70849-fix, r=fmease (fix) conflicting negative impl marker ## Context This MR fixes the error message for conflicting negative trait impls by adding the corresponding the polarity marker to the trait name. ## Issues - closes rust-lang#70849 r? `@fmease`
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
6 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.
Context
This MR fixes the error message for conflicting negative trait impls by adding the corresponding the polarity marker to the trait name.
Issues
r? @fmease