Fix removed version numbers of doc_auto_cfg and doc_cfg_hide#147123
Fix removed version numbers of doc_auto_cfg and doc_cfg_hide#147123bors merged 1 commit intorust-lang:masterfrom
doc_auto_cfg and doc_cfg_hide#147123Conversation
This comment has been minimized.
This comment has been minimized.
|
The tidy check's requirement of using Procedurally, do I need to now squash this PR? Is there a way to do that from the web, or will I need to clone locally? Also hey Boxy! |
|
Thanks! Yes, please squash, then I'll approve. |
It happens earlier in the release process, namely when beta branches from master (cc https://forge.rust-lang.org/release/process.html#beta-pr). The PR you've linked is a bootstrap bump which just cherry-picks the previously created commit containing the placeholder replacements (cc https://forge.rust-lang.org/release/process.html#default-branch-bootstrap-update-tuesday). Anyway, there's no rush; it'll take some time till the next beta bump. Both PRs will be part of 1.92, no worries :) |
7062937 to
26a31e2
Compare
|
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
26a31e2 to
04ee991
Compare
|
Thanks again! @bors r+ rollup |
Rollup of 5 pull requests Successful merges: - #146653 (improve diagnostics for empty attributes) - #146987 (impl Ord for params and use unstable sort) - #147101 (Use `Iterator::eq` and (dogfood) `eq_by` in compiler and library ) - #147123 (Fix removed version numbers of `doc_auto_cfg` and `doc_cfg_hide`) - #147149 (add joboet to library review rotation) r? `@ghost` `@rustbot` modify labels: rollup
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`
Rollup of 5 pull requests Successful merges: - rust-lang/rust#146653 (improve diagnostics for empty attributes) - rust-lang/rust#146987 (impl Ord for params and use unstable sort) - rust-lang/rust#147101 (Use `Iterator::eq` and (dogfood) `eq_by` in compiler and library ) - rust-lang/rust#147123 (Fix removed version numbers of `doc_auto_cfg` and `doc_cfg_hide`) - rust-lang/rust#147149 (add joboet to library review rotation) r? `@ghost` `@rustbot` modify labels: rollup
Rollup of 5 pull requests Successful merges: - rust-lang/rust#146653 (improve diagnostics for empty attributes) - rust-lang/rust#146987 (impl Ord for params and use unstable sort) - rust-lang/rust#147101 (Use `Iterator::eq` and (dogfood) `eq_by` in compiler and library ) - rust-lang/rust#147123 (Fix removed version numbers of `doc_auto_cfg` and `doc_cfg_hide`) - rust-lang/rust#147149 (add joboet to library review rotation) r? `@ghost` `@rustbot` modify labels: rollup
Rollup of 5 pull requests Successful merges: - rust-lang/rust#146653 (improve diagnostics for empty attributes) - rust-lang/rust#146987 (impl Ord for params and use unstable sort) - rust-lang/rust#147101 (Use `Iterator::eq` and (dogfood) `eq_by` in compiler and library ) - rust-lang/rust#147123 (Fix removed version numbers of `doc_auto_cfg` and `doc_cfg_hide`) - rust-lang/rust#147149 (add joboet to library review rotation) r? `@ghost` `@rustbot` modify labels: rollup
Rollup of 5 pull requests Successful merges: - rust-lang/rust#146653 (improve diagnostics for empty attributes) - rust-lang/rust#146987 (impl Ord for params and use unstable sort) - rust-lang/rust#147101 (Use `Iterator::eq` and (dogfood) `eq_by` in compiler and library ) - rust-lang/rust#147123 (Fix removed version numbers of `doc_auto_cfg` and `doc_cfg_hide`) - rust-lang/rust#147149 (add joboet to library review rotation) r? `@ghost` `@rustbot` modify labels: rollup
Rollup of 5 pull requests Successful merges: - rust-lang/rust#146653 (improve diagnostics for empty attributes) - rust-lang/rust#146987 (impl Ord for params and use unstable sort) - rust-lang/rust#147101 (Use `Iterator::eq` and (dogfood) `eq_by` in compiler and library ) - rust-lang/rust#147123 (Fix removed version numbers of `doc_auto_cfg` and `doc_cfg_hide`) - rust-lang/rust#147149 (add joboet to library review rotation) r? `@ghost` `@rustbot` modify labels: rollup
Tracking issue: #43781
The
doc_auto_cfganddoc_cfg_hidefeatures 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:
Note especially the "removed in 1.58" claim. Further evidence is found in the comment further up this file:
rust/compiler/rustc_feature/src/removed.rs
Lines 49 to 53 in 4ffeda1
I've chosen 1.92 as that was the milestone which #138907 was added to.
cc @GuillaumeGomez