Remove check-cfg condition

Author: GuillaumeGomez

src/librustdoc/clean/cfg.rs

@@ -8,7 +8,6 @@ use std::{fmt, mem, ops};
 use itertools::Either;
 use rustc_ast::{LitKind, MetaItem, MetaItemInner, MetaItemKind, MetaItemLit};
 use rustc_data_structures::fx::FxHashSet;
-use rustc_session::parse::ParseSess;
 use rustc_span::Span;
 use rustc_span::symbol::{Symbol, sym};
 
@@ -128,20 +127,6 @@ impl Cfg {
         Self::parse_nested(cfg, &FxHashSet::default()).map(|ret| ret.unwrap())
     }
 
-    /// Checks whether the given configuration can be matched in the current session.
-    ///
-    /// Equivalent to `attr::cfg_matches`.
-    pub(crate) fn matches(&self, psess: &ParseSess) -> bool {
-        match *self {
-            Cfg::False => false,
-            Cfg::True => true,
-            Cfg::Not(ref child) => !child.matches(psess),
-            Cfg::All(ref sub_cfgs) => sub_cfgs.iter().all(|sub_cfg| sub_cfg.matches(psess)),
-            Cfg::Any(ref sub_cfgs) => sub_cfgs.iter().any(|sub_cfg| sub_cfg.matches(psess)),
-            Cfg::Cfg(name, value) => psess.config.contains(&(name, value)),
-        }
-    }
-
     /// Whether the configuration consists of just `Cfg` or `Not`.
     fn is_simple(&self) -> bool {
         match self {

src/librustdoc/clean/types.rs

@@ -1037,7 +1037,7 @@ pub(crate) fn hir_attr_lists<'a, I: IntoIterator<Item = &'a hir::Attribute>>(
 /// This type keeps track of (doc) cfg information as we go down the item tree.
 #[derive(Clone, Debug)]
 pub(crate) struct CfgInfo {
-    /// List of currently active `doc(auto_cfg(hide(...)))` cfgs,minus currently active
+    /// List of currently active `doc(auto_cfg(hide(...)))` cfgs, minus currently active
     /// `doc(auto_cfg(show(...)))` cfgs.
     hidden_cfg: FxHashSet<Cfg>,
     /// Current computed `cfg`. Each time we enter a new item, this field is updated as well while
@@ -1054,13 +1054,11 @@ pub(crate) struct CfgInfo {
 impl Default for CfgInfo {
     fn default() -> Self {
         Self {
-            hidden_cfg: [
+            hidden_cfg: FxHashSet::from_iter([
                 Cfg::Cfg(sym::test, None),
                 Cfg::Cfg(sym::doc, None),
                 Cfg::Cfg(sym::doctest, None),
-            ]
-            .into_iter()
-            .collect(),
+            ]),
             current_cfg: Cfg::True,
             auto_cfg_active: true,
             parent_is_doc_cfg: false,

src/librustdoc/doctest/rust.rs

@@ -14,7 +14,7 @@ use rustc_span::source_map::SourceMap;
 use rustc_span::{BytePos, DUMMY_SP, FileName, Pos, Span, sym};
 
 use super::{DocTestVisitor, ScrapedDocTest};
-use crate::clean::{Attributes, CfgInfo, extract_cfg_from_attrs};
+use crate::clean::Attributes;
 use crate::html::markdown::{self, ErrorCodes, LangString, MdRelLine};
 
 struct RustCollector {
@@ -119,13 +119,6 @@ impl HirCollector<'_> {
         nested: F,
     ) {
         let ast_attrs = self.tcx.hir_attrs(self.tcx.local_def_id_to_hir_id(def_id));
-        if let Some(ref cfg) =
-            extract_cfg_from_attrs(ast_attrs.iter(), self.tcx, &mut CfgInfo::default())
-            && !cfg.matches(&self.tcx.sess.psess)
-        {
-            return;
-        }
-
         // Try collecting `#[doc(test(attr(...)))]`
         let old_global_crate_attrs_len = self.collector.global_crate_attrs.len();
         for doc_test_attrs in ast_attrs