Fix undocumented_unsafe_block recognize safety comments inside blocks and on same line in macros
#16339
+288
−138
Conversation
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
rustbot
added
the
S-waiting-on-review
|
Lintcheck changes for d37d04a
This comment will be updated if you push new changes |
llogiq
reviewed
Jan 6, 2026
| // We only check the first (immediate preceding) line for this pattern. | ||
| let comment_start = [line.find("//"), line.find("/*")].into_iter().flatten().min(); | ||
| if let Some(comment_start) = comment_start | ||
| && let Some(safety_offset) = line[comment_start..].to_ascii_uppercase().find("SAFETY:") |
Contributor
There was a problem hiding this comment.
This will find things like // This has no safety: comment. I think we should ask there be nothing but whitespace between the start of the comment and the Safety: prefix.
Contributor
Author
There was a problem hiding this comment.
Good edge case. Will apply fix thanks
borngraced
force-pushed
the
fix-undocumented-unsafe-blocks
branch
from
aee94d7 to
45b38ba
Compare
Collaborator
|
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
allow only whitespace between the comment marker and `SAFETY:`
borngraced
force-pushed
the
fix-undocumented-unsafe-blocks
branch
from
03d8acd to
d37d04a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
fixes false positives for
undocumented_unsafe_blocks#16210Same-line comments in macros
(e.g., let _x =// SAFETY: ...)and inner safety comments(e.g., unsafe { // SAFETY: ... })were not recognized becauserust-clippy/clippy_lints/src/undocumented_unsafe_blocks.rs
Line 794 in 4882141
note:
block_has_inner_safety_commentdoes not respectaccept-comment-above-statementoraccept-comment-above-attributes. These configs control comments above statements or attributes; inner comments are inside the block, so no ambiguity exists.r? @llogiq