Fix removed version numbers of doc_auto_cfg and doc_cfg_hide
#147123
Merged
+2
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
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 :) |
fmease
added
S-waiting-on-author
DJMcNab
force-pushed
the
doc_cfg_merge_version
branch
from
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. |
DJMcNab
force-pushed
the
doc_cfg_merge_version
branch
from
26a31e2 to
04ee991
Compare
rustbot
added
S-waiting-on-review
fmease
approved these changes
Sep 29, 2025
|
Thanks again! @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Sep 29, 2025
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
rust-timer
added a commit
that referenced
this pull request
Sep 29, 2025
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`
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Sep 30, 2025
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
github-actions bot
pushed a commit
to rust-lang/rust-analyzer
that referenced
this pull request
Oct 2, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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