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) conflicting negative impl marker #130311

Merged
merged 1 commit into from
Sep 14, 2024
Merged

(fix) conflicting negative impl marker #130311

merged 1 commit into from
Sep 14, 2024

Conversation

heiseish
Copy link
Contributor

@heiseish heiseish commented Sep 13, 2024 •
edited
Loading

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

@rustbot
Copy link
Collaborator

rustbot commented Sep 13, 2024

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 (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@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 Sep 13, 2024
@fmease fmease assigned fmease and unassigned Nadrieril Sep 13, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
fmease
fmease approved these changes Sep 13, 2024
View reviewed changes
Copy link
Member

@fmease fmease 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.

Thanks! Two small nitpicks & squashing into one commit, then we're good to go!

compiler/rustc_type_ir/src/predicate.rs Outdated Show resolved Hide resolved
tests/ui/coherence/coherence-conflicting-repeated-negative-trait-impl-70849.rs Outdated Show resolved Hide resolved
@heiseish
Copy link
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 fmease 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 13, 2024
@heiseish
Copy link
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 14, 2024
@heiseish heiseish changed the title (fix) conflicting negative impl marker and add tests (fix) conflicting negative impl marker Sep 14, 2024
@heiseish heiseish requested a review from fmease September 14, 2024 08:25
@fmease
Copy link
Member

fmease commented Sep 14, 2024

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 14, 2024

📌 Commit b0db3a7 has been approved by fmease

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 Sep 14, 2024
@Zalathar Zalathar mentioned this pull request Sep 14, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 14, 2024
@bors
Auto merge of rust-lang#130348 - Zalathar:rollup-5d0b7a9, r=Zalathar
02b1be1 
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
@bors bors merged commit 517e7ce into rust-lang:master Sep 14, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 14, 2024
@rust-timer
Unrolled build for rust-lang#130311
4845d98 
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`
@heiseish heiseish deleted the issue-70849-fix branch September 16, 2024 01:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmease fmease fmease approved these changes

Assignees

@fmease fmease

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.83.0
Development

Successfully merging this pull request may close these issues.

Negative trait impl gives wrong error message
6 participants
@heiseish @rustbot @rust-log-analyzer @fmease @bors @Nadrieril