[rustdoc] Display unsafe attrs with edition 2024 unsafe() wrappers.

Author: obi1kenobi

src/librustdoc/clean/types.rs

@@ -767,15 +767,15 @@ impl Item {
             .iter()
             .filter_map(|attr| {
                 if let hir::Attribute::Parsed(AttributeKind::LinkSection { name, .. }) = attr {
-                    Some(format!("#[link_section = \"{name}\"]"))
+                    Some(format!("#[unsafe(link_section = \"{name}\")]"))
                 }
                 // NoMangle is special cased, as it appears in HTML output, and we want to show it in source form, not HIR printing.
                 // It is also used by cargo-semver-checks.
                 else if let hir::Attribute::Parsed(AttributeKind::NoMangle(..)) = attr {
-                    Some("#[no_mangle]".to_string())
+                    Some("#[unsafe(no_mangle)]".to_string())
                 } else if let hir::Attribute::Parsed(AttributeKind::ExportName { name, .. }) = attr
                 {
-                    Some(format!("#[export_name = \"{name}\"]"))
+                    Some(format!("#[unsafe(export_name = \"{name}\")]"))
                 } else if let hir::Attribute::Parsed(AttributeKind::NonExhaustive(..)) = attr {
                     Some("#[non_exhaustive]".to_string())
                 } else if is_json {

src/rustdoc-json-types/lib.rs

@@ -37,8 +37,8 @@ pub type FxHashMap<K, V> = HashMap<K, V>; // re-export for use in src/librustdoc
 // will instead cause conflicts. See #94591 for more. (This paragraph and the "Latest feature" line
 // are deliberately not in a doc comment, because they need not be in public docs.)
 //
-// Latest feature: Pretty printing of no_mangle attributes changed
-pub const FORMAT_VERSION: u32 = 53;
+// Latest feature: Added edition 2024 style `unsafe()` wrappers around attrs
+pub const FORMAT_VERSION: u32 = 54;
 
 /// The root of the emitted JSON blob.
 ///

tests/rustdoc-json/attrs/export_name_2021.rs

@@ -1,6 +1,6 @@
 //@ edition: 2021
 #![no_std]
 
-//@ is "$.index[?(@.name=='example')].attrs" '["#[export_name = \"altered\"]"]'
+//@ is "$.index[?(@.name=='example')].attrs" '["#[unsafe(export_name = \"altered\")]"]'
 #[export_name = "altered"]
 pub extern "C" fn example() {}

tests/rustdoc-json/attrs/export_name_2024.rs

@@ -1,9 +1,6 @@
 //@ edition: 2024
 #![no_std]
 
-// The representation of `#[unsafe(export_name = ..)]` in rustdoc in edition 2024
-// is still `#[export_name = ..]` without the `unsafe` attribute wrapper.
-
-//@ is "$.index[?(@.name=='example')].attrs" '["#[export_name = \"altered\"]"]'
+//@ is "$.index[?(@.name=='example')].attrs" '["#[unsafe(export_name = \"altered\")]"]'
 #[unsafe(export_name = "altered")]
 pub extern "C" fn example() {}

tests/rustdoc-json/attrs/link_section_2021.rs

@@ -1,6 +1,6 @@
 //@ edition: 2021
 #![no_std]
 
-//@ is "$.index[?(@.name=='example')].attrs" '["#[link_section = \".text\"]"]'
+//@ is "$.index[?(@.name=='example')].attrs" '["#[unsafe(link_section = \".text\")]"]'
 #[link_section = ".text"]
 pub extern "C" fn example() {}

tests/rustdoc-json/attrs/link_section_2024.rs

@@ -1,9 +1,6 @@
 //@ edition: 2024
 #![no_std]
 
-// Since the 2024 edition the link_section attribute must use the unsafe qualification.
-// However, the unsafe qualification is not shown by rustdoc.
-
-//@ is "$.index[?(@.name=='example')].attrs" '["#[link_section = \".text\"]"]'
+//@ is "$.index[?(@.name=='example')].attrs" '["#[unsafe(link_section = \".text\")]"]'
 #[unsafe(link_section = ".text")]
 pub extern "C" fn example() {}

tests/rustdoc-json/attrs/no_mangle_2021.rs

@@ -1,6 +1,6 @@
 //@ edition: 2021
 #![no_std]
 
-//@ is "$.index[?(@.name=='example')].attrs" '["#[no_mangle]"]'
+//@ is "$.index[?(@.name=='example')].attrs" '["#[unsafe(no_mangle)]"]'
 #[no_mangle]
 pub extern "C" fn example() {}

tests/rustdoc-json/attrs/no_mangle_2024.rs

@@ -1,9 +1,6 @@
 //@ edition: 2024
 #![no_std]
 
-// The representation of `#[unsafe(no_mangle)]` in rustdoc in edition 2024
-// is still `#[no_mangle]` without the `unsafe` attribute wrapper.
-
-//@ is "$.index[?(@.name=='example')].attrs" '["#[no_mangle]"]'
+//@ is "$.index[?(@.name=='example')].attrs" '["#[unsafe(no_mangle)]"]'
 #[unsafe(no_mangle)]
 pub extern "C" fn example() {}

tests/rustdoc/attribute-rendering.rs

@@ -1,7 +1,7 @@
 #![crate_name = "foo"]
 
 //@ has 'foo/fn.f.html'
-//@ has - //*[@'class="rust item-decl"]' '#[export_name = "f"] pub fn f()'
-#[export_name = "\
-f"]
+//@ has - //*[@'class="rust item-decl"]' '#[unsafe(export_name = "f")] pub fn f()'
+#[unsafe(export_name = "\
+f")]
 pub fn f() {}

tests/rustdoc/attributes-2021-edition.rs

@@ -0,0 +1,14 @@
+//@ edition: 2021
+#![crate_name = "foo"]
+
+//@ has foo/fn.f.html '//pre[@class="rust item-decl"]' '#[unsafe(no_mangle)]'
+#[no_mangle]
+pub extern "C" fn f() {}
+
+//@ has foo/fn.g.html '//pre[@class="rust item-decl"]' '#[unsafe(export_name = "bar")]'
+#[export_name = "bar"]
+pub extern "C" fn g() {}
+
+//@ has foo/fn.example.html '//pre[@class="rust item-decl"]' '#[unsafe(link_section = ".text")]'
+#[link_section = ".text"]
+pub extern "C" fn example() {}