rustdoc: display doc(cfg(false)) properly #141747
Merged
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
before we had an extra 'on' that was ungramatical. fixes rust-lang#138112
|
rustbot has assigned @GuillaumeGomez. Use |
rustbot
added
S-waiting-on-review
GuillaumeGomez
approved these changes
May 29, 2025
|
Thanks! r=me once CI pass. @bors delegate=lolbinarycat |
|
✌️ @lolbinarycat, you can now approve this pull request! If @GuillaumeGomez told you to " |
bors
added
S-waiting-on-bors
camelid
reviewed
May 30, 2025
| @@ -171,10 +171,15 @@ impl Cfg { | |||
|
|
|||
| /// Renders the configuration for long display, as a long HTML description. | |||
| pub(crate) fn render_long_html(&self) -> String { | |||
| let on = if self.should_use_with_in_description() { "with" } else { "on" }; | |||
| let on = if self.omit_preposition() { | |||
There was a problem hiding this comment.
The render_long_plain function below should also have this change applied. Really it seems like we could extract a shared function that they both delegate to since the only difference is the format AFAICT.
There was a problem hiding this comment.
Good point, sending a PR.
bors
added a commit
that referenced
this pull request
May 30, 2025
Rollup of 8 pull requests Successful merges: - #133823 (Use `cfg_attr_trace` in AST with a placeholder attribute for accurate suggestion) - #141004 (Report text_direction_codepoint_in_literal when parsing) - #141407 (Refactor the two-phase check for impls and impl items) - #141430 (remove `visit_clobber` and move `DummyAstNode` to `rustc_expand`) - #141507 (atomic_load intrinsic: use const generic parameter for ordering) - #141538 (implement `va_arg` for x86_64 systemv) - #141669 (float: Replace some approximate assertions with exact) - #141747 (rustdoc: display doc(cfg(false)) properly) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
May 30, 2025
Rollup merge of #141747 - lolbinarycat:rustdoc-cfg-138112, r=GuillaumeGomez rustdoc: display doc(cfg(false)) properly before we had an extra 'on' that was ungramatical. fixes #138112 this is what it looks like now: 
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
May 31, 2025
Rollup of 8 pull requests Successful merges: - rust-lang/rust#133823 (Use `cfg_attr_trace` in AST with a placeholder attribute for accurate suggestion) - rust-lang/rust#141004 (Report text_direction_codepoint_in_literal when parsing) - rust-lang/rust#141407 (Refactor the two-phase check for impls and impl items) - rust-lang/rust#141430 (remove `visit_clobber` and move `DummyAstNode` to `rustc_expand`) - rust-lang/rust#141507 (atomic_load intrinsic: use const generic parameter for ordering) - rust-lang/rust#141538 (implement `va_arg` for x86_64 systemv) - rust-lang/rust#141669 (float: Replace some approximate assertions with exact) - rust-lang/rust#141747 (rustdoc: display doc(cfg(false)) properly) r? `@ghost` `@rustbot` modify labels: rollup
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 13, 2025
…ring, r=camelid Merge `Cfg::render_long_html` and `Cfg::render_long_plain` methods common code Follow-up of rust-lang#141747. Thanks `@camelid` for spotting it! r? `@camelid`
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Jun 14, 2025
…amelid Merge `Cfg::render_long_html` and `Cfg::render_long_plain` methods common code Follow-up of rust-lang/rust#141747. Thanks `@camelid` for spotting it! r? `@camelid`
github-actions bot
pushed a commit
to rust-lang/rustc-dev-guide
that referenced
this pull request
Jun 16, 2025
…amelid Merge `Cfg::render_long_html` and `Cfg::render_long_plain` methods common code Follow-up of rust-lang/rust#141747. Thanks `@camelid` for spotting it! r? `@camelid`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
before we had an extra 'on' that was
ungramatical.
fixes #138112
this is what it looks like now:
