Wip

src/librustdoc/clean/cfg.rs

@@ -859,12 +859,16 @@ pub(crate) fn extract_cfg_from_attrs<'a, I: Iterator<Item = &'a hir::Attribute>
             }
             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)
+            && let hir::Attribute::Parsed(AttributeKind::CfgTrace(cfgs, _)) = attr
+
+            // && 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;
+            for new_cfg in cfgs {
+                cfg_info.current_cfg &= Cfg(new_cfg.clone());
+            }
         }
     }
 

src/librustdoc/clean/mod.rs

@@ -2673,15 +2673,11 @@ fn add_without_unwanted_attributes<'hir>(
                     import_parent,
                 ));
             }
-            hir::Attribute::Unparsed(..) => {
-            attrs.push((Cow::Borrowed(attr), import_parent));
-            }
-            // FIXME: make sure to exclude `#[cfg_trace]` here when it is ported to the new parsers
-            hir::Attribute::Parsed(parsed) => {
-                if 
+            // If it's not a `cfg()` attribute, we keep it.
+            hir::Attribute::Parsed(AttributeKind::CfgTrace(..)) if !is_inline => {}
+            _ => {
                 attrs.push((Cow::Borrowed(attr), import_parent));
             }
-            _ => {}
         }
     }
 }