rustdoc_json: Remove one call to std::mem::take in after_krate
#150867
+24
−24
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
This patch removes one call to `std::mem::take` to save two `memcpy`s: `JsonRenderer::index` can be quite large as noted rust-lang#142335. `self.index` can be passed directly to `types::Crate`. This removal makes `self` immutable. The private `serialize_and_write` method is moved as a function: the `self` argument is replaced by `sess: &Session`. This `&Session` was fetched earlier in `after_krate` in all cases. This change allows to call `serialize_and_write` after `output_crate` is created, without having a conflict around the move of `self`: the borrow checker is now happy.
rustbot
added
A-rustdoc-json
GuillaumeGomez
approved these changes
Jan 9, 2026
Member
|
Looks good to me, thanks! r=me once CI pass @bors delegate+ |
Contributor
|
✌️ @Hywan, you can now approve this pull request! If @GuillaumeGomez told you to " |
Contributor
Author
|
@bors r=GuillaumeGomez |
rust-bors
bot
added
S-waiting-on-bors
Contributor
Member
|
@bors rollup |
tgross35
added a commit
to tgross35/rust
that referenced
this pull request
Jan 9, 2026
…GuillaumeGomez rustdoc_json: Remove one call to `std::mem::take` in `after_krate` This patch removes one call to `std::mem::take` to save two `memcpy`s: `JsonRenderer::index` can be quite large as noted rust-lang#142335. `self.index` can be passed directly to `types::Crate`. This removal makes `self` immutable. The private `serialize_and_write` method is moved as a function: the `self` argument is replaced by `sess: &Session`. This `&Session` was fetched earlier in `after_krate` in all cases. This change allows to call `serialize_and_write` after `output_crate` is created, without having a conflict around the move of `self`: the borrow checker is now happy. I wasn't able to measure the performance impact though because I don't know how to modify `rustc-perf` as [@nnethercote did](rust-lang#142335 (comment)) (sorry). --- Follow up of rust-lang#142335. r? @nnethercote
rust-bors bot
added a commit
that referenced
this pull request
Jan 10, 2026
Rollup of 11 pull requests Successful merges: - #150269 (Remove inactive nvptx maintainer) - #150713 (mgca: Type-check fields of struct expr const args) - #150765 (rustc_parse_format: improve error for missing `:` before `?` in format args) - #150847 (Fix broken documentation links to SipHash) - #150867 (rustdoc_json: Remove one call to `std::mem::take` in `after_krate`) - #150872 (Fix some loop block coercion diagnostics) - #150874 (Ignore `rustc-src-gpl` in fast try builds) - #150875 (Refactor artifact keep mode in bootstrap) - #150876 (Mention that `rustc_codegen_gcc` is a subtree in `rustc-dev-guide`) - #150882 (Supress unused_parens lint for guard patterns) - #150884 (Update bors email in CI postprocessing step) Failed merges: - #150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple) r? @ghost
rust-bors bot
added a commit
that referenced
this pull request
Jan 10, 2026
Rollup of 11 pull requests Successful merges: - #150269 (Remove inactive nvptx maintainer) - #150713 (mgca: Type-check fields of struct expr const args) - #150765 (rustc_parse_format: improve error for missing `:` before `?` in format args) - #150847 (Fix broken documentation links to SipHash) - #150867 (rustdoc_json: Remove one call to `std::mem::take` in `after_krate`) - #150872 (Fix some loop block coercion diagnostics) - #150874 (Ignore `rustc-src-gpl` in fast try builds) - #150875 (Refactor artifact keep mode in bootstrap) - #150876 (Mention that `rustc_codegen_gcc` is a subtree in `rustc-dev-guide`) - #150882 (Supress unused_parens lint for guard patterns) - #150884 (Update bors email in CI postprocessing step) Failed merges: - #150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple) r? @ghost
rust-timer
added a commit
that referenced
this pull request
Jan 11, 2026
Rollup merge of #150867 - chore-librustdoc-json-mem-take, r=GuillaumeGomez rustdoc_json: Remove one call to `std::mem::take` in `after_krate` This patch removes one call to `std::mem::take` to save two `memcpy`s: `JsonRenderer::index` can be quite large as noted #142335. `self.index` can be passed directly to `types::Crate`. This removal makes `self` immutable. The private `serialize_and_write` method is moved as a function: the `self` argument is replaced by `sess: &Session`. This `&Session` was fetched earlier in `after_krate` in all cases. This change allows to call `serialize_and_write` after `output_crate` is created, without having a conflict around the move of `self`: the borrow checker is now happy. I wasn't able to measure the performance impact though because I don't know how to modify `rustc-perf` as [@nnethercote did](#142335 (comment)) (sorry). --- Follow up of #142335. r? @nnethercote
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This patch removes one call to
std::mem::taketo save twomemcpys:JsonRenderer::indexcan be quite large as noted #142335.self.indexcan be passed directly totypes::Crate. This removal makesselfimmutable.The private
serialize_and_writemethod is moved as a function: theselfargument is replaced bysess: &Session. This&Sessionwas fetched earlier inafter_kratein all cases. This change allows to callserialize_and_writeafteroutput_crateis created, without having a conflict around the move ofself: the borrow checker is now happy.I wasn't able to measure the performance impact though because I don't know how to modify
rustc-perfas @nnethercote did (sorry).Follow up of #142335.
r? @nnethercote