Remove doc_cfg, doc_auto_cfg and doc_cfg_hide features

Author: GuillaumeGomez

compiler/rustc_ast_passes/src/feature_gate.rs

@@ -165,8 +165,6 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
 
                 gate_doc!(
                     "experimental" {
-                        cfg => doc_cfg
-                        cfg_hide => doc_cfg_hide
                         masked => doc_masked
                         notable_trait => doc_notable_trait
                     }

compiler/rustc_feature/src/unstable.rs

@@ -462,12 +462,6 @@ declare_features! (
     (unstable, deprecated_suggestion, "1.61.0", Some(94785)),
     /// Allows deref patterns.
     (incomplete, deref_patterns, "1.79.0", Some(87121)),
-    /// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.
-    (unstable, doc_auto_cfg, "1.58.0", Some(43781)),
-    /// Allows `#[doc(cfg(...))]`.
-    (unstable, doc_cfg, "1.21.0", Some(43781)),
-    /// Allows `#[doc(cfg_hide(...))]`.
-    (unstable, doc_cfg_hide, "1.57.0", Some(43781)),
     /// Allows `#[doc(masked)]`.
     (unstable, doc_masked, "1.21.0", Some(44027)),
     /// Allows `dyn* Trait` objects.

compiler/rustc_passes/src/check_attr.rs

@@ -1283,14 +1283,14 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
                         self.tcx.emit_node_span_lint(
                             INVALID_DOC_ATTRIBUTES,
                             hir_id,
-                            meta.span,
+                            item.span(),
                             errors::DocAutoCfgExpectsHideOrShow,
                         );
                     } else if item.meta_item_list().is_none() {
                         self.tcx.emit_node_span_lint(
                             INVALID_DOC_ATTRIBUTES,
                             hir_id,
-                            meta.span,
+                            item.span(),
                             errors::DocAutoCfgHideShowExpectsList { attr_name: attr_name.as_str() },
                         );
                     }

compiler/rustc_span/src/symbol.rs

@@ -824,9 +824,6 @@ symbols! {
         do_not_recommend,
         doc,
         doc_alias,
-        doc_auto_cfg,
-        doc_cfg,
-        doc_cfg_hide,
         doc_keyword,
         doc_masked,
         doc_notable_trait,

library/alloc/src/lib.rs

@@ -204,8 +204,8 @@
 // tidy-alphabetical-end
 //
 // Rustdoc features:
-#![feature(doc_cfg)]
-#![feature(doc_cfg_hide)]
+#![cfg_attr(bootstrap, feature(doc_cfg))]
+#![cfg_attr(bootstrap, feature(doc_cfg_hide))]
 // Technically, this is a bug in rustdoc: rustdoc sees the documentation on `#[lang = slice_alloc]`
 // blocks is for `&[T]`, which also has documentation using this feature in `core`, and gets mad
 // that the feature-gate isn't enabled. Ideally, it wouldn't check for the feature gate for docs

library/core/src/lib.rs

@@ -172,8 +172,8 @@
 #![feature(const_trait_impl)]
 #![feature(decl_macro)]
 #![feature(deprecated_suggestion)]
-#![feature(doc_cfg)]
-#![feature(doc_cfg_hide)]
+#![cfg_attr(bootstrap, feature(doc_cfg))]
+#![cfg_attr(bootstrap, feature(doc_cfg_hide))]
 #![feature(doc_notable_trait)]
 #![feature(extern_types)]
 #![feature(f128)]

library/std/src/lib.rs

@@ -301,8 +301,8 @@
 #![feature(concat_idents)]
 #![feature(decl_macro)]
 #![feature(deprecated_suggestion)]
-#![feature(doc_cfg)]
-#![feature(doc_cfg_hide)]
+#![cfg_attr(bootstrap, feature(doc_cfg))]
+#![cfg_attr(bootstrap, feature(doc_cfg_hide))]
 #![feature(doc_masked)]
 #![feature(doc_notable_trait)]
 #![feature(dropck_eyepatch)]

src/librustdoc/clean/types.rs

@@ -1030,34 +1030,20 @@ impl Default for CfgInfo {
     }
 }
 
-fn handle_auto_cfg_hide_show(
-    tcx: TyCtxt<'_>,
-    cfg_info: &mut CfgInfo,
-    sub_attr: &MetaItemInner,
-    is_show: bool,
-) {
+fn handle_auto_cfg_hide_show(cfg_info: &mut CfgInfo, sub_attr: &MetaItemInner, is_show: bool) {
     if let MetaItemInner::MetaItem(item) = sub_attr
         && let MetaItemKind::List(items) = &item.kind
     {
         for item in items {
-            match Cfg::parse(item) {
-                Ok(cfg) => {
-                    if is_show {
-                        cfg_info.hidden_cfg.remove(&cfg);
-                    } else {
-                        cfg_info.hidden_cfg.insert(cfg);
-                    }
-                }
-                Err(_) => {
-                    tcx.sess
-                        .dcx()
-                        .struct_span_err(sub_attr.span(), "unexpected `auto_cfg` value")
-                        .emit();
+            // Errors should already have been reported in `rustc_passes::check_attr`.
+            if let Ok(cfg) = Cfg::parse(item) {
+                if is_show {
+                    cfg_info.hidden_cfg.remove(&cfg);
+                } else {
+                    cfg_info.hidden_cfg.insert(cfg);
                 }
             }
         }
-    } else {
-        tcx.sess.dcx().struct_span_err(sub_attr.span(), "unexpected `auto_cfg` value kind").emit();
     }
 }
 
@@ -1143,14 +1129,7 @@ pub(crate) fn extract_cfg_from_attrs<'a, I: Iterator<Item = &'a hir::Attribute>
             sym::doc if let Some(attrs) = attr.meta_item_list() => {
                 for attr in attrs.iter().filter(|attr| attr.has_name(sym::auto_cfg)) {
                     let MetaItemInner::MetaItem(attr) = attr else {
-                        tcx.sess
-                            .dcx()
-                            .struct_span_err(
-                                attr.span(),
-                                "unexpected value in `auto_cfg` attribute",
-                            )
-                            .emit();
-                        break 'main;
+                        continue;
                     };
                     match &attr.kind {
                         MetaItemKind::Word => {
@@ -1175,14 +1154,6 @@ pub(crate) fn extract_cfg_from_attrs<'a, I: Iterator<Item = &'a hir::Attribute>
                                     changed_auto_active_status = Some(attr.span);
                                 }
                                 cfg_info.doc_auto_cfg_active = value;
-                            } else {
-                                tcx.sess
-                                    .dcx()
-                                    .struct_span_err(
-                                        attr.span,
-                                        "unexpected value for `auto_cfg` attribute",
-                                    )
-                                    .emit();
                             }
                         }
                         MetaItemKind::List(sub_attrs) => {
@@ -1197,34 +1168,14 @@ pub(crate) fn extract_cfg_from_attrs<'a, I: Iterator<Item = &'a hir::Attribute>
                             // Whatever happens next, the feature is enabled again.
                             cfg_info.doc_auto_cfg_active = true;
                             for sub_attr in sub_attrs.iter() {
-                                let Some(ident) = sub_attr.ident() else {
-                                    tcx.sess
-                                        .dcx()
-                                        .struct_span_err(
-                                            attr.span,
-                                            "unexpected value for `auto_cfg` attribute",
-                                        )
-                                        .emit();
-                                    continue;
-                                };
-                                if ident.name == sym::show || ident.name == sym::hide {
+                                if let Some(ident) = sub_attr.ident()
+                                    && (ident.name == sym::show || ident.name == sym::hide)
+                                {
                                     handle_auto_cfg_hide_show(
-                                        tcx,
                                         cfg_info,
                                         &sub_attr,
                                         ident.name == sym::show,
                                     );
-                                } else {
-                                    tcx.sess
-                                        .dcx()
-                                        .struct_span_err(
-                                            attr.span,
-                                            format!(
-                                                "unknown value `{}` for `auto_cfg` attribute",
-                                                ident.name
-                                            ),
-                                        )
-                                        .emit();
                                 }
                             }
                         }

tests/rustdoc-gui/src/lib2/lib.rs

@@ -1,8 +1,5 @@
 // ignore-tidy-linelength
 
-#![feature(doc_cfg)]
-#![feature(doc_auto_cfg)]
-
 pub mod another_folder;
 pub mod another_mod;
 

tests/rustdoc-gui/src/test_docs/lib.rs

@@ -5,7 +5,6 @@
 #![crate_name = "test_docs"]
 #![allow(internal_features)]
 #![feature(rustdoc_internals)]
-#![feature(doc_cfg)]
 #![feature(associated_type_defaults)]
 
 /*!