Skip to content

[rustdoc] Fix doc_cfg feature on reexports#156073

Merged
rust-bors[bot] merged 3 commits intorust-lang:mainfrom
GuillaumeGomez:doc-cfg-reexports
May 3, 2026
Merged

[rustdoc] Fix doc_cfg feature on reexports#156073
rust-bors[bot] merged 3 commits intorust-lang:mainfrom
GuillaumeGomez:doc-cfg-reexports

Conversation

@GuillaumeGomez
Copy link
Copy Markdown
Member

@GuillaumeGomez GuillaumeGomez commented May 2, 2026

Part of #150268.

I don't mark the issue as fixed as I need to check the third case described in the issue. First commit comes from #156020, will need to rebase this PR once the original is merged.

r? @Urgau

@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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels May 2, 2026
Comment thread tests/rustdoc-html/doc-cfg/reexports.rs Outdated
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 3, 2026

This PR was rebased onto a different main 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.

Copy link
Copy Markdown
Member

@Urgau Urgau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Urgau
Copy link
Copy Markdown
Member

Urgau commented May 3, 2026

@bors r+

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 3, 2026

📌 Commit ba27564 has been approved by Urgau

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 3, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request May 3, 2026
…r=Urgau

[rustdoc] Fix `doc_cfg` feature on reexports

Part of rust-lang#150268.

I don't mark the issue as fixed as I need to check the third case described in the issue. First commit comes from rust-lang#156020, will need to rebase this PR once the original is merged.

r? @Urgau
rust-bors Bot pushed a commit that referenced this pull request May 3, 2026
…uwer

Rollup of 3 pull requests

Successful merges:

 - #156073 ([rustdoc] Fix `doc_cfg` feature on reexports)
 - #155433 (Rip out rustc_layout_scalar_valid_range_* attribute support)
 - #155957 (Revert const hacks and use const closures in std)
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 3, 2026

⌛ Testing commit ba27564 with merge 5bc49ce...

Workflow: https://github.com/rust-lang/rust/actions/runs/25281218345

rust-bors Bot pushed a commit that referenced this pull request May 3, 2026
[rustdoc] Fix `doc_cfg` feature on reexports

Part of #150268.

I don't mark the issue as fixed as I need to check the third case described in the issue. First commit comes from #156020, will need to rebase this PR once the original is merged.

r? @Urgau
@JonathanBrouwer
Copy link
Copy Markdown
Contributor

@bors yield
Yielding to enclosing rollup

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 3, 2026

Auto build was cancelled. Cancelled workflows:

The next pull request likely to be tested is #156111.

rust-bors Bot pushed a commit that referenced this pull request May 3, 2026
…uwer

Rollup of 4 pull requests

Successful merges:

 - #156073 ([rustdoc] Fix `doc_cfg` feature on reexports)
 - #152216 (Fix 'assign to data in an index of' collection suggestions)
 - #155433 (Rip out rustc_layout_scalar_valid_range_* attribute support)
 - #156098 (Hand-implement `impl Debug for NumBuffer` to avoid constraining `T` or printing MaybeUninit)
@rust-bors rust-bors Bot merged commit bc6d9b1 into rust-lang:main May 3, 2026
11 of 12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 3, 2026
rust-timer added a commit that referenced this pull request May 3, 2026
Rollup merge of #156073 - GuillaumeGomez:doc-cfg-reexports, r=Urgau

[rustdoc] Fix `doc_cfg` feature on reexports

Part of #150268.

I don't mark the issue as fixed as I need to check the third case described in the issue. First commit comes from #156020, will need to rebase this PR once the original is merged.

r? @Urgau
@GuillaumeGomez GuillaumeGomez deleted the doc-cfg-reexports branch May 3, 2026 21:51
github-actions Bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request May 4, 2026
…uwer

Rollup of 4 pull requests

Successful merges:

 - rust-lang/rust#156073 ([rustdoc] Fix `doc_cfg` feature on reexports)
 - rust-lang/rust#152216 (Fix 'assign to data in an index of' collection suggestions)
 - rust-lang/rust#155433 (Rip out rustc_layout_scalar_valid_range_* attribute support)
 - rust-lang/rust#156098 (Hand-implement `impl Debug for NumBuffer` to avoid constraining `T` or printing MaybeUninit)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants