Skip to content

Clean up librustdoc::html::render to be better encapsulated #138605

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 2 commits into from
Apr 10, 2025
Merged

Clean up librustdoc::html::render to be better encapsulated #138605

merged 2 commits into from
Apr 10, 2025
+17 −20

Conversation

xizheyin
Copy link
Contributor

@xizheyin xizheyin commented Mar 17, 2025 •
edited
Loading

Closes #138567

@rustbot
Copy link
Collaborator

rustbot commented Mar 17, 2025

r? @fmease

rustbot has assigned @fmease.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Mar 17, 2025
@xizheyin xizheyin mentioned this pull request Mar 18, 2025
Closed
@bors
Copy link
Collaborator

bors commented Mar 24, 2025

☔ The latest upstream changes (presumably #138873) made this pull request unmergeable. Please resolve the merge conflicts.

@xizheyin
Clean up librustdoc::html::render to be better encapsulated
e89c849 
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
@xizheyin
Copy link
Contributor Author

xizheyin commented Apr 9, 2025

r? rustdoc

@rustbot rustbot assigned GuillaumeGomez and unassigned fmease Apr 9, 2025
GuillaumeGomez
GuillaumeGomez reviewed Apr 9, 2025
View reviewed changes
GuillaumeGomez
GuillaumeGomez requested changes Apr 9, 2025
View reviewed changes
Copy link
Member

@GuillaumeGomez GuillaumeGomez left a comment

Choose a reason for hiding this comment

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

Apart the IndexItem::new method that needs to be removed, the rest is a nice improvement. 👍

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 9, 2025
@xizheyin
librustdoc: remove IndexItem::new, use previous fields constructor
32c8f7d 
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
@GuillaumeGomez
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 9, 2025

📌 Commit 32c8f7d 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 9, 2025
Zalathar added a commit to Zalathar/rust that referenced this pull request Apr 10, 2025
@Zalathar
Rollup merge of rust-lang#138605 - xizheyin:issue-138567, r=Guillaume…
3a9ab8d 
…Gomez

Clean up librustdoc::html::render to be better encapsulated

Closes rust-lang#138567
@Zalathar Zalathar mentioned this pull request Apr 10, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 10, 2025
@bors
Auto merge of rust-lang#139612 - Zalathar:rollup-7twdm9m, r=Zalathar
2bec972 
Rollup of 18 pull requests

Successful merges:

 - rust-lang#137412 (Ensure `swap_nonoverlapping` is really always untyped)
 - rust-lang#138167 (Small code improvement in rustdoc hidden stripper)
 - rust-lang#138605 (Clean up librustdoc::html::render to be better encapsulated)
 - rust-lang#138682 (Allow drivers to supply a list of extra symbols to intern)
 - rust-lang#138904 (Test linking and running `no_std` binaries)
 - rust-lang#139423 (Suppress missing field error when autoderef bottoms out in infer)
 - rust-lang#139449 (match ergonomics: replace `peel_off_references` with a recursive call)
 - rust-lang#139507 (compiletest: Trim whitespace from environment variable names)
 - rust-lang#139530 (Remove some dead or leftover code related to rustc-intrinsic abi removal)
 - rust-lang#139560 (fix title of offset_of_enum feature)
 - rust-lang#139563 (emit a better error message for using the macro incorrectly)
 - rust-lang#139568 (Don't use empty trait names)
 - rust-lang#139580 (Temporarily leave the review rotation)
 - rust-lang#139589 (saethlin is back from vacation)
 - rust-lang#139592 (rustdoc: Enable Markdown extensions when looking for doctests)
 - rust-lang#139599 (Tracking issue template: fine-grained information on style update status)
 - rust-lang#139600 (Update `compiler-builtins` to 0.1.153)
 - rust-lang#139606 (Update compiletest to Edition 2024)

r? `@ghost`
`@rustbot` modify labels: rollup
Zalathar added a commit to Zalathar/rust that referenced this pull request Apr 10, 2025
@Zalathar
Rollup merge of rust-lang#138605 - xizheyin:issue-138567, r=Guillaume…
a4176f5 
…Gomez

Clean up librustdoc::html::render to be better encapsulated

Closes rust-lang#138567
@Zalathar Zalathar mentioned this pull request Apr 10, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 10, 2025
@bors
Auto merge of rust-lang#139613 - Zalathar:rollup-1ap11rb, r=Zalathar
d95c3a7 
Rollup of 17 pull requests

Successful merges:

 - rust-lang#137412 (Ensure `swap_nonoverlapping` is really always untyped)
 - rust-lang#138167 (Small code improvement in rustdoc hidden stripper)
 - rust-lang#138605 (Clean up librustdoc::html::render to be better encapsulated)
 - rust-lang#138682 (Allow drivers to supply a list of extra symbols to intern)
 - rust-lang#138904 (Test linking and running `no_std` binaries)
 - rust-lang#139423 (Suppress missing field error when autoderef bottoms out in infer)
 - rust-lang#139449 (match ergonomics: replace `peel_off_references` with a recursive call)
 - rust-lang#139507 (compiletest: Trim whitespace from environment variable names)
 - rust-lang#139530 (Remove some dead or leftover code related to rustc-intrinsic abi removal)
 - rust-lang#139560 (fix title of offset_of_enum feature)
 - rust-lang#139563 (emit a better error message for using the macro incorrectly)
 - rust-lang#139568 (Don't use empty trait names)
 - rust-lang#139580 (Temporarily leave the review rotation)
 - rust-lang#139589 (saethlin is back from vacation)
 - rust-lang#139592 (rustdoc: Enable Markdown extensions when looking for doctests)
 - rust-lang#139599 (Tracking issue template: fine-grained information on style update status)
 - rust-lang#139600 (Update `compiler-builtins` to 0.1.153)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 10, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 10, 2025
@bors
Auto merge of rust-lang#139622 - matthiaskrgr:rollup-8ri1vid, r=matth…
69b3959 
…iaskrgr

Rollup of 13 pull requests

Successful merges:

 - rust-lang#138167 (Small code improvement in rustdoc hidden stripper)
 - rust-lang#138605 (Clean up librustdoc::html::render to be better encapsulated)
 - rust-lang#139423 (Suppress missing field error when autoderef bottoms out in infer)
 - rust-lang#139449 (match ergonomics: replace `peel_off_references` with a recursive call)
 - rust-lang#139507 (compiletest: Trim whitespace from environment variable names)
 - rust-lang#139530 (Remove some dead or leftover code related to rustc-intrinsic abi removal)
 - rust-lang#139560 (fix title of offset_of_enum feature)
 - rust-lang#139563 (emit a better error message for using the macro incorrectly)
 - rust-lang#139568 (Don't use empty trait names)
 - rust-lang#139580 (Temporarily leave the review rotation)
 - rust-lang#139589 (saethlin is back from vacation)
 - rust-lang#139592 (rustdoc: Enable Markdown extensions when looking for doctests)
 - rust-lang#139599 (Tracking issue template: fine-grained information on style update status)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit aecce21 into rust-lang:master Apr 10, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 10, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 10, 2025
@rust-timer
Unrolled build for rust-lang#138605
3c123a8 
Rollup merge of rust-lang#138605 - xizheyin:issue-138567, r=GuillaumeGomez

Clean up librustdoc::html::render to be better encapsulated

Closes rust-lang#138567
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

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
Milestone
1.88.0
Development

Successfully merging this pull request may close these issues.

cleanup rustdoc::html::render to be better encapsulated.
5 participants
@xizheyin @rustbot @bors @GuillaumeGomez @fmease