Skip to content

Commit 69e8b5e

Browse files
authored
Unrolled build for #147123
Rollup merge of #147123 - DJMcNab:doc_cfg_merge_version, r=fmease Fix removed version numbers of `doc_auto_cfg` and `doc_cfg_hide` Tracking issue: #43781 The `doc_auto_cfg` and `doc_cfg_hide` features were removed in a recent nightly (by #138907). I believe that the rustc version numbers at which the features were declared to be removed were incorrect, however, and should both be "1.92" (±1). As evidence in favour of this, the error we get from using this was: ```text error[E0557]: feature has been removed --> src/lib.rs:22:29 | 22 | #![cfg_attr(docsrs, feature(doc_auto_cfg))] | ^^^^^^^^^^^^ feature has been removed | = note: removed in 1.58.0; see <#138907> for more information = note: merged into `doc_cfg` ``` Note especially the "removed in 1.58" claim. Further evidence is found in the comment further up this file: https://github.com/rust-lang/rust/blob/4ffeda10e10d4fa0c8edbd0dd9642d8ae7d3e66e/compiler/rustc_feature/src/removed.rs#L49-L53 I've chosen 1.92 as that was the milestone which #138907 was added to. cc `@GuillaumeGomez`
2 parents 128b36a + 04ee991 commit 69e8b5e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compiler/rustc_feature/src/removed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ declare_features! (
102102
/// Allows deriving traits as per `SmartPointer` specification
103103
(removed, derive_smart_pointer, "1.84.0", Some(123430), Some("replaced by `CoercePointee`"), 131284),
104104
/// Tells rustdoc to automatically generate `#[doc(cfg(...))]`.
105-
(removed, doc_auto_cfg, "1.58.0", Some(43781), Some("merged into `doc_cfg`"), 138907),
105+
(removed, doc_auto_cfg, "CURRENT_RUSTC_VERSION", Some(43781), Some("merged into `doc_cfg`"), 138907),
106106
/// Allows `#[doc(cfg_hide(...))]`.
107-
(removed, doc_cfg_hide, "1.57.0", Some(43781), Some("merged into `doc_cfg`"), 138907),
107+
(removed, doc_cfg_hide, "CURRENT_RUSTC_VERSION", Some(43781), Some("merged into `doc_cfg`"), 138907),
108108
/// Allows using `#[doc(keyword = "...")]`.
109109
(removed, doc_keyword, "1.58.0", Some(51315),
110110
Some("merged into `#![feature(rustdoc_internals)]`"), 90420),

0 commit comments

Comments
 (0)