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.

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

[single_match]: Fix duplicate diagnostics #12448

Merged
merged 1 commit into from
Mar 11, 2024

Conversation

WeiTheShinobi
Copy link
Contributor

@WeiTheShinobi WeiTheShinobi commented Mar 9, 2024

Relates to #12379

edit two test file
tests/ui/single_match_else.rs
tests/ui/single_match.rs

those two test file point to the same lint


changelog: [single_match] Fix duplicate diagnostics

@rustbot
Copy link
Collaborator

rustbot commented Mar 9, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @dswij (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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Mar 9, 2024
@bors
Copy link
Contributor

bors commented Mar 10, 2024

☔ The latest upstream changes (presumably #12440) made this pull request unmergeable. Please resolve the merge conflicts.

Copy link
Member

@dswij dswij left a comment

Choose a reason for hiding this comment

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

those two test file point to the same lint

FYI, there are two lints defined in single_match.

let lint = if els.is_some() { SINGLE_MATCH_ELSE } else { SINGLE_MATCH };

@dswij
Copy link
Member

dswij commented Mar 11, 2024

Thank you!

@bors r+

@bors
Copy link
Contributor

bors commented Mar 11, 2024

📌 Commit 8e55bbf has been approved by dswij

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 11, 2024

⌛ Testing commit 8e55bbf with merge 6ff4e71...

@bors
Copy link
Contributor

bors commented Mar 11, 2024

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: dswij
Pushing 6ff4e71 to master...

@bors bors merged commit 6ff4e71 into rust-lang:master Mar 11, 2024
5 checks passed
@WeiTheShinobi WeiTheShinobi deleted the fix_single_match branch May 30, 2024 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants