Correctly handle target_feature in rustdoc cfg

Author: GuillaumeGomez

src/librustdoc/clean/types.rs

@@ -8,7 +8,7 @@ use itertools::Either;
 use rustc_abi::{ExternAbi, VariantIdx};
 use rustc_ast::ast::{LitKind, MetaItemInner, MetaItemKind};
 use rustc_attr_data_structures::{
-    AttributeKind, ConstStability, Deprecation, Stability, StableSince, find_attr,
+    AttributeKind, ConstStability, Deprecation, Stability, StableSince,
 };
 use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap, FxIndexSet};
 use rustc_hir::def::{CtorKind, DefKind, Res};
@@ -1236,35 +1236,20 @@ pub(crate) fn extract_cfg_from_attrs<'a, I: Iterator<Item = &'a hir::Attribute>
     // If there is no `doc(cfg())`, then we retrieve the `cfg()` attributes (because
     // `doc(cfg())` overrides `cfg()`).
     for attr in attrs {
-        let Some(ident) = attr.ident() else { continue };
-        match ident.name {
-            sym::cfg | sym::cfg_trace if !cfg_info.parent_is_doc_cfg => {
-                if let Some(attr) = single(attr.meta_item_list()?)
-                    && let Ok(new_cfg) = Cfg::parse(&attr)
-                {
-                    cfg_info.current_cfg &= new_cfg;
-                }
-            }
+        if let hir::Attribute::Parsed(AttributeKind::TargetFeature(features, _)) = attr {
             // treat #[target_feature(enable = "feat")] attributes as if they were
             // #[doc(cfg(target_feature = "feat"))] attributes as well
-            sym::target_feature
-                if let Some(attrs) = attr.meta_item_list() =>
-            {
-                for attr in attrs {
-                    if attr.has_name(sym::enable) && attr.value_str().is_some() {
-                        // Clone `enable = "feat"`, change to `target_feature = "feat"`.
-                        // Unwrap is safe because `value_str` succeeded above.
-                        let mut meta = attr.meta_item().unwrap().clone();
-                        meta.path =
-                            ast::Path::from_ident(Ident::with_dummy_span(sym::target_feature));
-
-                        if let Ok(feat_cfg) = Cfg::parse(&ast::MetaItemInner::MetaItem(meta)) {
-                            cfg_info.current_cfg &= feat_cfg;
-                        }
-                    }
-                }
+            for (feature, _) in features {
+                cfg_info.current_cfg &= Cfg::Cfg(sym::target_feature, Some(*feature));
             }
-            _ => {}
+            continue;
+        } else if !cfg_info.parent_is_doc_cfg
+            && let Some(ident) = attr.ident()
+            && matches!(ident.name, sym::cfg | sym::cfg_trace)
+            && let Some(attr) = single(attr.meta_item_list()?)
+            && let Ok(new_cfg) = Cfg::parse(&attr)
+        {
+            cfg_info.current_cfg &= new_cfg;
         }
     }