[squash before merge] rebase fallout.

Author: aDotInTheVoid

src/librustdoc/clean/types.rs

@@ -763,8 +763,7 @@ impl Item {
     ///
     /// Only used by the HTML output-format.
     fn attributes_without_repr(&self, tcx: TyCtxt<'_>) -> Vec<String> {
-        const ALLOWED_ATTRIBUTES: &[Symbol] =
-            &[sym::export_name, sym::link_section, sym::non_exhaustive];
+        const ALLOWED_ATTRIBUTES: &[Symbol] = &[sym::non_exhaustive];
         self.attrs
             .other_attrs
             .iter()

src/librustdoc/json/conversions.rs

@@ -901,14 +901,8 @@ fn maybe_from_hir_attr(
         // and eventually be removed as all attributes gain a strutured representation in
         // HIR.
         hir::Attribute::Unparsed(_) => {
-            return Some(if attr.has_name(sym::non_exhaustive) {
-                Attribute::NonExhaustive
-            } else if attr.has_name(sym::automatically_derived) {
+            return Some(if attr.has_name(sym::automatically_derived) {
                 Attribute::AutomaticallyDerived
-            } else if attr.has_name(sym::export_name) {
-                Attribute::ExportName(
-                    attr.value_str().expect("checked by attr validation").to_string(),
-                )
             } else {
                 // FIXME: We should handle `#[doc(hidden)]` here.
                 other_attr(tcx, attr)
@@ -927,7 +921,14 @@ fn maybe_from_hir_attr(
             tcx,
             item_id.as_def_id().expect("all items that could have #[repr] have a DefId"),
         ),
+        AK::ExportName { name, span: _ } => Attribute::ExportName(name.to_string()),
+        AK::LinkSection { name, span: _ } => Attribute::LinkSection(name.to_string()),
+
         AK::NoMangle(_) => Attribute::NoMangle,
+        AK::NonExhaustive(_) => Attribute::NonExhaustive,
+        AK::TargetFeature(features, _span) => Attribute::TargetFeature(
+            features.iter().map(|(feat, _span)| feat.to_string()).collect(),
+        ),
 
         _ => other_attr(tcx, attr),
     })

src/rustdoc-json-types/lib.rs

@@ -214,13 +214,14 @@ pub enum Attribute {
     NonExhaustive,
 
     /// `#[must_use]`
-    MustUse {
-        reason: Option<String>,
-    },
+    MustUse { reason: Option<String> },
 
     /// `#[export_name = "name"]`
     ExportName(String),
 
+    /// `#[link_section = "name"]`
+    LinkSection(String),
+
     /// `#[automatically_derived]`
     AutomaticallyDerived,
 
@@ -230,6 +231,9 @@ pub enum Attribute {
     /// `#[no_mangle]`
     NoMangle,
 
+    /// #[target_feature(enable = "feature1", enable = "feature2")]
+    TargetFeature(Vec<String>),
+
     /// Something else.
     ///
     /// Things here are explicitly *not* covered by the [`FORMAT_VERSION`]

tests/rustdoc-json/attrs/link_section_2021.rs

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

tests/rustdoc-json/attrs/link_section_2024.rs

@@ -4,6 +4,7 @@
 // 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\"]"]'
+//@ count "$.index[?(@.name=='example')].attrs[*]" 1
+//@ is "$.index[?(@.name=='example')].attrs[*].link_section" '".text"'
 #[unsafe(link_section = ".text")]
 pub extern "C" fn example() {}

tests/rustdoc-json/attrs/target_feature.rs

@@ -1,17 +1,25 @@
-//@ only-x86_64
-
-//@ is "$.index[?(@.name=='test1')].attrs" '["#[target_feature(enable=\"avx\")]"]'
+//@ count "$.index[?(@.name=='test1')].attrs[*]" 1
+//@ is    "$.index[?(@.name=='test1')].attrs[*].target_feature" '["avx"]'
 #[target_feature(enable = "avx")]
 pub fn test1() {}
 
-//@ is "$.index[?(@.name=='test2')].attrs" '["#[target_feature(enable=\"avx\", enable=\"avx2\")]"]'
+//@ count "$.index[?(@.name=='test2')].attrs[*]" 1
+//@ is    "$.index[?(@.name=='test2')].attrs[*].target_feature" '["avx", "avx2"]'
 #[target_feature(enable = "avx,avx2")]
 pub fn test2() {}
 
-//@ is "$.index[?(@.name=='test3')].attrs" '["#[target_feature(enable=\"avx\", enable=\"avx2\")]"]'
+//@ count "$.index[?(@.name=='test3')].attrs[*]" 1
+//@ is    "$.index[?(@.name=='test3')].attrs[*].target_feature" '["avx", "avx2"]'
 #[target_feature(enable = "avx", enable = "avx2")]
 pub fn test3() {}
 
-//@ is "$.index[?(@.name=='test4')].attrs" '["#[target_feature(enable=\"avx\", enable=\"avx2\", enable=\"avx512f\")]"]'
+//@ count "$.index[?(@.name=='test4')].attrs[*]" 1
+//@ is    "$.index[?(@.name=='test4')].attrs[*].target_feature" '["avx", "avx2", "avx512f"]'
 #[target_feature(enable = "avx", enable = "avx2,avx512f")]
 pub fn test4() {}
+
+//@ count "$.index[?(@.name=='test5')].attrs[*]" 1
+//@ is    "$.index[?(@.name=='test5')].attrs[*].target_feature" '["avx", "avx2"]'
+#[target_feature(enable = "avx")]
+#[target_feature(enable = "avx2")]
+pub fn test5() {}