Fix single_match lint being emitted when it should not
#13765
Merged
+85
−22
Conversation
This file contains 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
rustbot
added
the
S-waiting-on-review
llogiq
reviewed
Dec 7, 2024
| @@ -1059,7 +1061,28 @@ impl<'tcx> LateLintPass<'tcx> for Matches { | |||
| } | |||
|
|
|||
| redundant_pattern_match::check_match(cx, expr, ex, arms); | |||
| single_match::check(cx, ex, arms, expr); | |||
| let source_map = cx.tcx.sess.source_map(); | |||
| let mut match_comments = span_extract_comments(source_map, expr.span); | |||
There was a problem hiding this comment.
Wouldn't it be better to extract the comment spans instead of the text to compare?
What if we have the same comment text twice?
There was a problem hiding this comment.
It's a Vec, not a map. So if a comment is present more than once, not an issue since it'll still remain one at the end. Gonna add a test for this case though.
As for using spans, it's possible but would likely make the code much less readable as we manipulate InnerSpans here since we parse a snippet and not use AST comments.
|
@rustbot author |
rustbot
added
S-waiting-on-author
GuillaumeGomez
force-pushed
the
fix-single_match
branch
from
436be6a to
771b0ec
Compare
|
@rustbot ready |
rustbot
added
S-waiting-on-review
GuillaumeGomez
force-pushed
the
fix-single_match
branch
from
771b0ec to
efe3fe9
Compare
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We realized when running
clippy --fixon rustdoc (PR comment here) that some comments were removed, which is problematic. This PR checks that comments outside ofmatcharms are taken into account before emitting the lint.changelog: Fix
single_matchlint being emitted when it should not