Skip to content

Commit 6cccea8

Browse files
Remove doc_auto_cfg feature as well
1 parent 9362ab5 commit 6cccea8

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

compiler/rustc_feature/src/removed.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ declare_features! (
101101
Some("never properly implemented; requires significant design work"), 127655),
102102
/// Allows deriving traits as per `SmartPointer` specification
103103
(removed, derive_smart_pointer, "1.84.0", Some(123430), Some("replaced by `CoercePointee`"), 131284),
104+
/// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.
105+
(removed, doc_auto_cfg, "1.58.0", Some(43781), Some("merged into `doc_cfg`"), 138907),
104106
/// Allows `#[doc(cfg_hide(...))]`.
105107
(removed, doc_cfg_hide, "1.57.0", Some(43781), Some("merged into `doc_cfg`"), 138907),
106108
/// Allows using `#[doc(keyword = "...")]`.

compiler/rustc_feature/src/unstable.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,6 @@ declare_features! (
472472
(incomplete, deref_patterns, "1.79.0", Some(87121)),
473473
/// Allows deriving the From trait on single-field structs.
474474
(unstable, derive_from, "1.91.0", Some(144889)),
475-
/// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.
476-
(unstable, doc_auto_cfg, "1.58.0", Some(43781)),
477475
/// Allows `#[doc(cfg(...))]`.
478476
(unstable, doc_cfg, "1.21.0", Some(43781)),
479477
/// Allows `#[doc(masked)]`.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// ignore-tidy-linelength
22

33
#![feature(doc_cfg)]
4-
#![feature(doc_auto_cfg)]
54

65
pub mod another_folder;
76
pub mod another_mod;

tests/rustdoc/doc-cfg/doc-cfg-implicit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![crate_name = "funambulism"]
2-
#![feature(doc_auto_cfg, doc_cfg)]
2+
#![feature(doc_cfg)]
33

44
//@ has 'funambulism/struct.Disorbed.html'
55
//@ count - '//*[@class="stab portability"]' 1

tests/rustdoc/reexport/reexport-cfg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// include `cfg`s from the previous chained items.
33

44
#![crate_name = "foo"]
5-
#![feature(doc_auto_cfg, doc_cfg)]
5+
#![feature(doc_cfg)]
66

77
mod foo {
88
#[cfg(not(feature = "foo"))]

0 commit comments

Comments
 (0)