-
-
Notifications
You must be signed in to change notification settings - Fork 14.3k
rustdoc: fix duplicate Re-exports sections #150362
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
bors
merged 1 commit into
rust-lang:main
from
heathdutton:fix-rustdoc-duplicate-reexports-150211
Dec 27, 2025
Merged
rustdoc: fix duplicate Re-exports sections #150362
bors
merged 1 commit into
rust-lang:main
from
heathdutton:fix-rustdoc-duplicate-reexports-150211
Dec 27, 2025
+48
−10
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
Collaborator
|
r? @notriddle rustbot has assigned @notriddle. Use |
This comment has been minimized.
This comment has been minimized.
Comment on lines
3
to
7
| // Regression test for issue #150211. | ||
| // When a module has both `pub extern crate` and `pub use` items, | ||
| // they should both appear under a single "Re-exports" section, | ||
| // not two separate sections. | ||
| // https://github.com/rust-lang/rust/issues/150211 |
Member
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggested change
| // Regression test for issue #150211. | |
| // When a module has both `pub extern crate` and `pub use` items, | |
| // they should both appear under a single "Re-exports" section, | |
| // not two separate sections. | |
| // https://github.com/rust-lang/rust/issues/150211 | |
| // Regression test for issue <https://github.com/rust-lang/rust/issues/150211>. | |
| // When a module has both `pub extern crate` and `pub use` items, | |
| // they should both appear under a single "Re-exports" section, | |
| // not two separate sections. |
I don't think there's a need to duplicate issue numbers.
This comment has been minimized.
This comment has been minimized.
When a module contains both `pub extern crate` and `pub use` items, they were being rendered under two separate "Re-exports" section headers instead of one. This happened because the code iterated over each ItemType separately and rendered a section header for each, even though both ExternCrate and Import map to the same ItemSection. This fix tracks the current section and only renders a new header when the section actually changes, consolidating items that belong to the same section under a single header.
1e1f75f to
b2f19ea
Compare
Contributor
|
@bors r+ |
Collaborator
notriddle
approved these changes
Dec 27, 2025
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Dec 27, 2025
…reexports-150211, r=notriddle rustdoc: fix duplicate Re-exports sections Fixes rust-lang#150211 When a module contains both `pub extern crate` and `pub use` items, they were being rendered under two separate "Re-exports" section headers instead of one. This fix tracks the current section and only renders a new header when the section actually changes, consolidating items that belong to the same section under a single header.
This was referenced Dec 27, 2025
bors
added a commit
that referenced
this pull request
Dec 27, 2025
…uwer Rollup of 4 pull requests Successful merges: - #150362 (rustdoc: fix duplicate Re-exports sections) - #150397 (Update hir.rs: fix typo ("aligement" -> "alignment"), conform to max_width) - #150410 (Document default SOCK_CLOEXEC flag on new UnixStream) - #150429 (Improve missing core error for tier 3 targets) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Dec 27, 2025
Rollup merge of #150362 - heathdutton:fix-rustdoc-duplicate-reexports-150211, r=notriddle rustdoc: fix duplicate Re-exports sections Fixes #150211 When a module contains both `pub extern crate` and `pub use` items, they were being rendered under two separate "Re-exports" section headers instead of one. This fix tracks the current section and only renders a new header when the section actually changes, consolidating items that belong to the same section under a single header.
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.
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.
Fixes #150211
When a module contains both
pub extern crateandpub useitems, they were being rendered under two separate "Re-exports" section headers instead of one.This fix tracks the current section and only renders a new header when the section actually changes, consolidating items that belong to the same section under a single header.