Skip to content

Rework #[doc(cfg(..))] checks as distinct pass in rustdoc #141746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2025

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented May 29, 2025

This PR reworks how rustdoc calls rustc_attr_parsing::cfg_matches to be in a separate pass, instead of being wired-up in a ad-hoc way, which is causing problems in #138907 (comment).

This un-does most part of #140894, but the result is IMO much cleaner, easier to reason about, and most importantly no longer interfears with #138907.

r? @GuillaumeGomez

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels May 29, 2025
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented May 29, 2025

Thanks a lot!

r=me once CI pass

@Urgau
Copy link
Member Author

Urgau commented May 29, 2025

@bors r=GuillaumeGomez rollup

@bors
Copy link
Collaborator

bors commented May 29, 2025

📌 Commit 9d0845a has been approved by GuillaumeGomez

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 29, 2025
bors added a commit that referenced this pull request May 30, 2025
Rollup of 5 pull requests

Successful merges:

 - #141703 (Structurally normalize types as needed in `projection_ty_core`)
 - #141719 (Add tls_model for cygwin and enable has_thread_local)
 - #141736 (resolve stage0 sysroot from rustc)
 - #141746 (Rework `#[doc(cfg(..))]` checks as distinct pass in rustdoc)
 - #141749 (Remove RUSTC_RETRY_LINKER_ON_SEGFAULT hack)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4aac899 into rust-lang:master May 30, 2025
9 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 30, 2025
rust-timer added a commit that referenced this pull request May 30, 2025
Rollup merge of #141746 - Urgau:rework-doc_cfg-checks, r=GuillaumeGomez

Rework `#[doc(cfg(..))]` checks as distinct pass in rustdoc

This PR reworks how rustdoc calls `rustc_attr_parsing::cfg_matches` to be in a separate pass, instead of being wired-up in a ad-hoc way, which is causing problems in #138907 (comment).

This un-does most part of #140894, but the result is IMO much cleaner, easier to reason about, and most importantly no longer interfears with #138907.

r? `@GuillaumeGomez`
@jhpratt
Copy link
Member

jhpratt commented May 31, 2025

still in the queue after being merged

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants