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

Fix issue 11223: add check for identical guards in lint match_same_arms #12059

Merged
merged 1 commit into from
Feb 19, 2024

Conversation

roife
Copy link
Member

@roife roife commented Dec 30, 2023

fixes #11223

In the current match_same_arms implementation, if arms have guards, they are considered different. This commit adds equality checking for guards: arms are now considered equivalent only when they either both have no guards or their guards are identical.

The portion responsible for checking guard equality is refactored to reuse the existing code for checking body equality. This is abstracted into a function called check_eq_with_pat. To optimize performance, check_same_guard and check_same_body here use closures for lazy evaluation, ensuring that the calculation is only performed when !(backwards_blocking_idxs...) is true.

changelog: [match_same_arms]: Add check for identical guards

@rustbot
Copy link
Collaborator

rustbot commented Dec 30, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Alexendoo (or someone else) soon.

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 Dec 30, 2023
@bors
Copy link
Contributor

bors commented Feb 19, 2024

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

@Alexendoo
Copy link
Member

Thank you! Sorry for taking a while to get around to this

@bors r+

@bors
Copy link
Contributor

bors commented Feb 19, 2024

📌 Commit 087c7c8 has been approved by Alexendoo

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Feb 19, 2024

⌛ Testing commit 087c7c8 with merge fa2a3c5...

@bors
Copy link
Contributor

bors commented Feb 19, 2024

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: Alexendoo
Pushing fa2a3c5 to master...

@bors bors merged commit fa2a3c5 into rust-lang:master Feb 19, 2024
5 checks passed
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.

Identical match arm not detected
4 participants