Wip

Author: JonathanBrouwer

src/librustdoc/clean/mod.rs

@@ -2673,14 +2673,12 @@ fn add_without_unwanted_attributes<'hir>(
                     import_parent,
                 ));
             }
-            hir::Attribute::Unparsed(normal) if let [ident] = &*normal.path.segments => {
-                if is_inline || ident.name != sym::cfg_trace {
-                    // If it's not a `cfg()` attribute, we keep it.
-                    attrs.push((Cow::Borrowed(attr), 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(..) => {
+            hir::Attribute::Parsed(parsed) => {
+                if 
                 attrs.push((Cow::Borrowed(attr), import_parent));
             }
             _ => {}

src/librustdoc/passes/propagate_doc_cfg.rs

@@ -2,7 +2,6 @@
 
 use rustc_hir::Attribute;
 use rustc_hir::attrs::{AttributeKind, DocAttribute};
-use rustc_span::symbol::sym;
 
 use crate::clean::inline::{load_attrs, merge_attrs};
 use crate::clean::{CfgInfo, Crate, Item, ItemKind};
@@ -39,10 +38,7 @@ fn add_only_cfg_attributes(attrs: &mut Vec<Attribute>, new_attrs: &[Attribute])
             let mut new_attr = DocAttribute::default();
             new_attr.cfg = d.cfg.clone();
             attrs.push(Attribute::Parsed(AttributeKind::Doc(Box::new(new_attr))));
-        } else if let Attribute::Unparsed(normal) = attr
-            && let [ident] = &*normal.path.segments
-            && ident.name == sym::cfg_trace
-        {
+        } else if let Attribute::Parsed(AttributeKind::CfgTrace(..)) = attr {
             // If it's a `cfg()` attribute, we keep it.
             attrs.push(attr.clone());
         }