Keep a list of CfgEntry instead of just one

Author: GuillaumeGomez

compiler/rustc_attr_parsing/src/attributes/doc.rs

@@ -225,7 +225,7 @@ impl DocParser {
         args: &ArgParser<'_>,
     ) {
         if let Some(cfg_entry) = super::cfg::parse_cfg(cx, args) {
-            self.attribute.cfg = Some(cfg_entry);
+            self.attribute.cfg.push(cfg_entry);
         }
     }
 
@@ -524,6 +524,9 @@ impl<S: Stage> AttributeParser<S> for DocParser {
 
     fn finalize(self, _cx: &FinalizeContext<'_, '_, S>) -> Option<AttributeKind> {
         if self.nb_doc_attrs != 0 {
+            if std::env::var("LOL").is_ok() {
+                eprintln!("+++++> {:#?}", self.attribute);
+            }
             Some(AttributeKind::Doc(Box::new(self.attribute)))
         } else {
             None

compiler/rustc_hir/src/attrs/data_structures.rs

@@ -479,7 +479,7 @@ pub struct DocAttribute {
     pub inline: Option<(DocInline, Span)>,
 
     // unstable
-    pub cfg: Option<CfgEntry>,
+    pub cfg: ThinVec<CfgEntry>,
     pub auto_cfg: ThinVec<CfgHideShow>,
     /// This is for `#[doc(auto_cfg = false|true)]`.
     pub auto_cfg_change: Option<(bool, Span)>,
@@ -512,7 +512,7 @@ impl Default for DocAttribute {
             aliases: FxIndexMap::default(),
             hidden: None,
             inline: None,
-            cfg: None,
+            cfg: ThinVec::new(),
             auto_cfg: ThinVec::new(),
             auto_cfg_change: None,
             fake_variadic: None,

src/librustdoc/clean/cfg.rs

@@ -24,7 +24,7 @@ use crate::html::escape::Escape;
 #[cfg(test)]
 mod tests;
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Clone, Debug, Hash)]
 pub(crate) struct Cfg(CfgEntry);
 
 #[derive(PartialEq, Debug)]
@@ -299,13 +299,13 @@ impl Cfg {
     ///
     /// See `tests::test_simplify_with` for examples.
     pub(crate) fn simplify_with(&self, assume: &Self) -> Option<Self> {
-        if self == assume {
+        if self.0.is_equivalent_to(&assume.0) {
             None
         } else if let CfgEntry::All(a, _) = &self.0 {
             let mut sub_cfgs: ThinVec<CfgEntry> = if let CfgEntry::All(b, _) = &assume.0 {
-                a.iter().filter(|a| !b.contains(a)).cloned().collect()
+                a.iter().filter(|a| !b.iter().any(|b| a.is_equivalent_to(b))).cloned().collect()
             } else {
-                a.iter().filter(|&a| *a != assume.0).cloned().collect()
+                a.iter().filter(|&a| !a.is_equivalent_to(&assume.0)).cloned().collect()
             };
             let len = sub_cfgs.len();
             match len {
@@ -314,7 +314,7 @@ impl Cfg {
                 _ => Some(Cfg(CfgEntry::All(sub_cfgs, DUMMY_SP))),
             }
         } else if let CfgEntry::All(b, _) = &assume.0
-            && b.contains(&self.0)
+            && b.iter().any(|b| b.is_equivalent_to(&self.0))
         {
             None
         } else {
@@ -838,7 +838,7 @@ pub(crate) fn extract_cfg_from_attrs<'a, I: Iterator<Item = &'a hir::Attribute>
             cfg_info.parent_is_doc_cfg = true;
         }
         for attr in doc_cfg {
-            if let Some(new_cfg) = attr.cfg.clone() {
+            for new_cfg in attr.cfg.clone() {
                 cfg_info.current_cfg &= Cfg(new_cfg);
             }
         }

src/librustdoc/passes/collect_trait_impls.rs

@@ -67,7 +67,7 @@ pub(crate) fn collect_trait_impls(mut krate: Crate, cx: &mut DocContext<'_>) ->
             let mut parent = Some(tcx.parent(impl_def_id));
             while let Some(did) = parent {
                 attr_buf.extend(tcx.get_all_attrs(did).iter().filter_map(|attr| match attr {
-                    Attribute::Parsed(AttributeKind::Doc(d)) if d.cfg.is_some() => {
+                    Attribute::Parsed(AttributeKind::Doc(d)) if !d.cfg.is_empty() => {
                         let mut new_attr = DocAttribute::default();
                         new_attr.cfg = d.cfg.clone();
                         Some(Attribute::Parsed(AttributeKind::Doc(Box::new(new_attr))))

src/librustdoc/passes/propagate_doc_cfg.rs

@@ -34,7 +34,7 @@ struct CfgPropagator<'a, 'tcx> {
 fn add_only_cfg_attributes(attrs: &mut Vec<Attribute>, new_attrs: &[Attribute]) {
     for attr in new_attrs {
         if let Attribute::Parsed(AttributeKind::Doc(d)) = attr
-            && d.cfg.is_some()
+            && !d.cfg.is_empty()
         {
             let mut new_attr = DocAttribute::default();
             new_attr.cfg = d.cfg.clone();