Use inner span in undocumented_unsafe_blocks

profetia · profetia · commit 91d20cbb82f0 · 2025-03-01T20:35:18.000+08:00
diff --git a/clippy_lints/src/undocumented_unsafe_blocks.rs b/clippy_lints/src/undocumented_unsafe_blocks.rs
@@ -606,15 +606,32 @@ fn span_from_macro_expansion_has_safety_comment(cx: &LateContext<'_>, span: Span
 
 fn get_body_search_span(cx: &LateContext<'_>) -> Option<Span> {
     let body = cx.enclosing_body?;
+    let mut maybe_mod_item = None;
+
     for (_, parent_node) in cx.tcx.hir_parent_iter(body.hir_id) {
         match parent_node {
             Node::Crate(mod_) => return Some(mod_.spans.inner_span),
+            Node::Item(hir::Item {
+                kind: ItemKind::Mod(mod_),
+                span,
+                ..
+            }) => {
+                return maybe_mod_item
+                    .and_then(|item| comment_start_before_item_in_mod(cx, mod_, *span, &item))
+                    .map(|comment_start| mod_.spans.inner_span.with_lo(comment_start))
+                    .or(Some(*span));
+            },
             node if let Some((span, _)) = span_and_hid_of_item_alike_node(&node)
                 && !is_const_or_static(&node) =>
             {
                 return Some(span);
             },
-            _ => {},
+            Node::Item(item) => {
+                maybe_mod_item = Some(*item);
+            },
+            _ => {
+                maybe_mod_item = None;
+            },
         }
     }
     None
diff --git a/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.default.stderr b/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.default.stderr
@@ -311,39 +311,39 @@ LL |             let bar = unsafe {};
    = help: consider adding a safety comment on the preceding line
 
 error: unsafe block missing a safety comment
-  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:592:52
+  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:638:52
    |
 LL |         const NO_SAFETY_IN_TRAIT_BUT_IN_IMPL: u8 = unsafe { 0 };
    |                                                    ^^^^^^^^^^^^
    |
    = help: consider adding a safety comment on the preceding line
 
 error: unsafe block missing a safety comment
-  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:601:41
+  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:647:41
    |
 LL |         const NO_SAFETY_IN_TRAIT: i32 = unsafe { 1 };
    |                                         ^^^^^^^^^^^^
    |
    = help: consider adding a safety comment on the preceding line
 
 error: unsafe block missing a safety comment
-  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:611:42
+  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:657:42
    |
 LL |         const HAS_SAFETY_IN_TRAIT: i32 = unsafe { 3 };
    |                                          ^^^^^^^^^^^^
    |
    = help: consider adding a safety comment on the preceding line
 
 error: unsafe block missing a safety comment
-  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:616:40
+  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:662:40
    |
 LL |         const NO_SAFETY_IN_IMPL: i32 = unsafe { 1 };
    |                                        ^^^^^^^^^^^^
    |
    = help: consider adding a safety comment on the preceding line
 
 error: unsafe block missing a safety comment
-  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:627:9
+  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:673:9
    |
 LL |         unsafe { here_is_another_variable_with_long_name };
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.disabled.stderr b/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.disabled.stderr
@@ -391,39 +391,39 @@ LL |     unsafe {}
    = help: consider adding a safety comment on the preceding line
 
 error: unsafe block missing a safety comment
-  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:592:52
+  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:638:52
    |
 LL |         const NO_SAFETY_IN_TRAIT_BUT_IN_IMPL: u8 = unsafe { 0 };
    |                                                    ^^^^^^^^^^^^
    |
    = help: consider adding a safety comment on the preceding line
 
 error: unsafe block missing a safety comment
-  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:601:41
+  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:647:41
    |
 LL |         const NO_SAFETY_IN_TRAIT: i32 = unsafe { 1 };
    |                                         ^^^^^^^^^^^^
    |
    = help: consider adding a safety comment on the preceding line
 
 error: unsafe block missing a safety comment
-  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:611:42
+  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:657:42
    |
 LL |         const HAS_SAFETY_IN_TRAIT: i32 = unsafe { 3 };
    |                                          ^^^^^^^^^^^^
    |
    = help: consider adding a safety comment on the preceding line
 
 error: unsafe block missing a safety comment
-  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:616:40
+  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:662:40
    |
 LL |         const NO_SAFETY_IN_IMPL: i32 = unsafe { 1 };
    |                                        ^^^^^^^^^^^^
    |
    = help: consider adding a safety comment on the preceding line
 
 error: unsafe block missing a safety comment
-  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:627:9
+  --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:673:9
    |
 LL |         unsafe { here_is_another_variable_with_long_name };
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs b/tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs
@@ -671,6 +671,7 @@ fn issue_13024() {
     // SAFETY: good
     just_a_simple_variable_with_a_very_long_name_that_has_seventy_eight_characters =
         unsafe { here_is_another_variable_with_long_name };
+    //~^ undocumented_unsafe_blocks
 }
 
 fn main() {}

Original file line number	Diff line number	Diff line change
`@@ -311,39 +311,39 @@ LL \| let bar = unsafe {};`
`311`	`311`	`= help: consider adding a safety comment on the preceding line`
`312`	`312`
`313`	`313`	`error: unsafe block missing a safety comment`
`314`		`- --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:592:52`
	`314`	`+ --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:638:52`
`315`	`315`	`\|`
`316`	`316`	`LL \| const NO_SAFETY_IN_TRAIT_BUT_IN_IMPL: u8 = unsafe { 0 };`
`317`	`317`	`\| ^^^^^^^^^^^^`
`318`	`318`	`\|`
`319`	`319`	`= help: consider adding a safety comment on the preceding line`
`320`	`320`
`321`	`321`	`error: unsafe block missing a safety comment`
`322`		`- --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:601:41`
	`322`	`+ --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:647:41`
`323`	`323`	`\|`
`324`	`324`	`LL \| const NO_SAFETY_IN_TRAIT: i32 = unsafe { 1 };`
`325`	`325`	`\| ^^^^^^^^^^^^`
`326`	`326`	`\|`
`327`	`327`	`= help: consider adding a safety comment on the preceding line`
`328`	`328`
`329`	`329`	`error: unsafe block missing a safety comment`
`330`		`- --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:611:42`
	`330`	`+ --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:657:42`
`331`	`331`	`\|`
`332`	`332`	`LL \| const HAS_SAFETY_IN_TRAIT: i32 = unsafe { 3 };`
`333`	`333`	`\| ^^^^^^^^^^^^`
`334`	`334`	`\|`
`335`	`335`	`= help: consider adding a safety comment on the preceding line`
`336`	`336`
`337`	`337`	`error: unsafe block missing a safety comment`
`338`		`- --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:616:40`
	`338`	`+ --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:662:40`
`339`	`339`	`\|`
`340`	`340`	`LL \| const NO_SAFETY_IN_IMPL: i32 = unsafe { 1 };`
`341`	`341`	`\| ^^^^^^^^^^^^`
`342`	`342`	`\|`
`343`	`343`	`= help: consider adding a safety comment on the preceding line`
`344`	`344`
`345`	`345`	`error: unsafe block missing a safety comment`
`346`		`- --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:627:9`
	`346`	`+ --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:673:9`
`347`	`347`	`\|`
`348`	`348`	`LL \| unsafe { here_is_another_variable_with_long_name };`
`349`	`349`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -391,39 +391,39 @@ LL \| unsafe {}`
`391`	`391`	`= help: consider adding a safety comment on the preceding line`
`392`	`392`
`393`	`393`	`error: unsafe block missing a safety comment`
`394`		`- --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:592:52`
	`394`	`+ --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:638:52`
`395`	`395`	`\|`
`396`	`396`	`LL \| const NO_SAFETY_IN_TRAIT_BUT_IN_IMPL: u8 = unsafe { 0 };`
`397`	`397`	`\| ^^^^^^^^^^^^`
`398`	`398`	`\|`
`399`	`399`	`= help: consider adding a safety comment on the preceding line`
`400`	`400`
`401`	`401`	`error: unsafe block missing a safety comment`
`402`		`- --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:601:41`
	`402`	`+ --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:647:41`
`403`	`403`	`\|`
`404`	`404`	`LL \| const NO_SAFETY_IN_TRAIT: i32 = unsafe { 1 };`
`405`	`405`	`\| ^^^^^^^^^^^^`
`406`	`406`	`\|`
`407`	`407`	`= help: consider adding a safety comment on the preceding line`
`408`	`408`
`409`	`409`	`error: unsafe block missing a safety comment`
`410`		`- --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:611:42`
	`410`	`+ --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:657:42`
`411`	`411`	`\|`
`412`	`412`	`LL \| const HAS_SAFETY_IN_TRAIT: i32 = unsafe { 3 };`
`413`	`413`	`\| ^^^^^^^^^^^^`
`414`	`414`	`\|`
`415`	`415`	`= help: consider adding a safety comment on the preceding line`
`416`	`416`
`417`	`417`	`error: unsafe block missing a safety comment`
`418`		`- --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:616:40`
	`418`	`+ --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:662:40`
`419`	`419`	`\|`
`420`	`420`	`LL \| const NO_SAFETY_IN_IMPL: i32 = unsafe { 1 };`
`421`	`421`	`\| ^^^^^^^^^^^^`
`422`	`422`	`\|`
`423`	`423`	`= help: consider adding a safety comment on the preceding line`
`424`	`424`
`425`	`425`	`error: unsafe block missing a safety comment`
`426`		`- --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:627:9`
	`426`	`+ --> tests/ui-toml/undocumented_unsafe_blocks/undocumented_unsafe_blocks.rs:673:9`
`427`	`427`	`\|`
`428`	`428`	`LL \| unsafe { here_is_another_variable_with_long_name };`
`429`	`429`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -671,6 +671,7 @@ fn issue_13024() {`
`671`	`671`	`// SAFETY: good`
`672`	`672`	`just_a_simple_variable_with_a_very_long_name_that_has_seventy_eight_characters =`
`673`	`673`	`unsafe { here_is_another_variable_with_long_name };`
	`674`	`+ //~^ undocumented_unsafe_blocks`
`674`	`675`	`}`
`675`	`676`
`676`	`677`	`fn main() {}`