Skip to content

Rollup of 3 pull requests#159546

Closed
jhpratt wants to merge 8 commits into
rust-lang:mainfrom
jhpratt:rollup-ZK8L5cn
Closed

Rollup of 3 pull requests#159546
jhpratt wants to merge 8 commits into
rust-lang:mainfrom
jhpratt:rollup-ZK8L5cn

Conversation

@jhpratt

@jhpratt jhpratt commented Jul 19, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

Kobzol and others added 8 commits July 12, 2026 21:01
More consistent with the default functions for `Read`

Co-Authored-By: Clar Fon <15850505+clarfonthey@users.noreply.github.com>
…k-Simulacrum

Always generate private and hidden items in JSON docs of the stdlib

This data is needed for downstream tools, e.g. cargo-semver-checks, to analyse the whole stdlib.

For the HTML output it is configurable using `build.library-docs-private-items`, but to avoid adding a separate config for just the JSON format, I think that we can just enable it unconditionally.

An alternative would be to change the flag from a bool to something like
```rust
enum StdDocsPrivateItems {
    No,
    Yes,
    Html,
    Json
}
```
…clarfonthey

Move `std::io::BufRead` to `alloc::io`

ACP: rust-lang/libs-team#755
Tracking issue: rust-lang#154046
Split From: rust-lang#156527
~~Blocked On: rust-lang#158545

## Description

Moves `std::io::BufRead` to `alloc::io`. This is effectively a direct cut and paste, but with a large diff due to how many implementations need to be moved into `alloc`. Blocked on rust-lang#158545.

---

## Notes

* No AI tooling of any kind was used during the creation of this PR.
* Please see rust-lang#154046 (comment) for a review order and broader context for this PR.
…=jhpratt

Remove SIZE generic param from DisplayBuffer in core::net

These symbols were observed on the surface of `core.o`:
```
<core::net::display_buffer::DisplayBuffer<15> as core::fmt::Write>::write_char
<core::net::display_buffer::DisplayBuffer<15> as core::fmt::Write>::write_fmt
<core::net::display_buffer::DisplayBuffer<15> as core::fmt::Write>::write_str
<core::net::display_buffer::DisplayBuffer<21> as core::fmt::Write>::write_char
<core::net::display_buffer::DisplayBuffer<21> as core::fmt::Write>::write_fmt
<core::net::display_buffer::DisplayBuffer<21> as core::fmt::Write>::write_str
<core::net::display_buffer::DisplayBuffer<39> as core::fmt::Write>::write_char
<core::net::display_buffer::DisplayBuffer<39> as core::fmt::Write>::write_fmt
<core::net::display_buffer::DisplayBuffer<39> as core::fmt::Write>::write_str
<core::net::display_buffer::DisplayBuffer<58> as core::fmt::Write>::write_char
<core::net::display_buffer::DisplayBuffer<58> as core::fmt::Write>::write_fmt
<core::net::display_buffer::DisplayBuffer<58> as core::fmt::Write>::write_str
```
There's no reason to instantiate four different copies of this super simple logic, so remove the size parameter allowing each case to call into the same shared machine code.

It's not possible to inline these symbols into the `{SocketAddrV*,Ipv*Addr}::fmt` methods because `core::fmt::write` constructs a `&mut dyn fmt::Write` to the `DisplayBuffer`.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jul 19, 2026
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-libs Relevant to the library team, which will review and decide on the PR/issue. 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 Jul 19, 2026
@jhpratt

jhpratt commented Jul 19, 2026

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=5

@rust-bors

rust-bors Bot commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 11b010f has been approved by jhpratt

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 Jul 19, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Jul 19, 2026
Rollup of 3 pull requests

Successful merges:

 - #159188 (Always generate private and hidden items in JSON docs of the stdlib)
 - #158546 (Move `std::io::BufRead` to `alloc::io`)
 - #159372 (Remove SIZE generic param from DisplayBuffer in core::net)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job dist-aarch64-linux failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

error: `std_detect` (lib doc) generated 1 warning (run `cargo fix --lib -p std_detect` to apply 1 suggestion)
error: warnings are denied by `build.warnings` configuration
warning: build failed, waiting for other jobs to finish...
Command `/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/bin/cargo doc --target aarch64-unknown-linux-gnu -Zbinary-dep-depinfo -j 8 -Zroot-dir=/checkout -Zno-embed-metadata --locked --color=always --profile=dist -p alloc -p compiler_builtins -p core -p panic_abort -p panic_unwind -p proc_macro -p profiler_builtins -p rustc-std-workspace-core -p std -p std_detect -p sysroot -p test -p unwind --features 'backtrace panic-unwind profiler compiler-builtins-c' --manifest-path /checkout/library/sysroot/Cargo.toml --no-deps --target-dir /checkout/obj/build/aarch64-unknown-linux-gnu/stage1-std/aarch64-unknown-linux-gnu/json-doc -Zskip-rustdoc-fingerprint -Zrustdoc-map [workdir=/checkout]` failed with exit code 101
Created at: src/bootstrap/src/core/build_steps/doc.rs:809:21
Executed at: src/bootstrap/src/core/build_steps/doc.rs:844:22

--- BACKTRACE vvv
   0: <bootstrap::utils::exec::DeferredCommand>::finish_process
             at /checkout/src/bootstrap/src/utils/exec.rs:938:17
   1: <bootstrap::utils::exec::DeferredCommand>::wait_for_output::<&bootstrap::utils::exec::ExecutionContext>
             at /checkout/src/bootstrap/src/utils/exec.rs:830:21
   2: <bootstrap::utils::exec::ExecutionContext>::run
             at /checkout/src/bootstrap/src/utils/exec.rs:740:45
   3: <bootstrap::utils::exec::BootstrapCommand>::run::<&bootstrap::core::builder::Builder>
             at /checkout/src/bootstrap/src/utils/exec.rs:338:27
   4: bootstrap::core::build_steps::doc::doc_std
             at /checkout/src/bootstrap/src/core/build_steps/doc.rs:844:22
   5: <bootstrap::core::build_steps::doc::Std as bootstrap::core::builder::Step>::run
             at /checkout/src/bootstrap/src/core/build_steps/doc.rs:733:9
---
   8: <bootstrap::core::builder::Builder>::ensure::<bootstrap::core::build_steps::dist::JsonDocs>
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1650:36
   9: <bootstrap::core::build_steps::dist::JsonDocs as bootstrap::core::builder::Step>::make_run
             at /checkout/src/bootstrap/src/core/build_steps/dist.rs:131:21
  10: <bootstrap::core::builder::StepDescription>::maybe_run
             at /checkout/src/bootstrap/src/core/builder/mod.rs:480:13
  11: bootstrap::core::builder::cli_paths::match_paths_to_steps_and_run
             at /checkout/src/bootstrap/src/core/builder/cli_paths.rs:142:22
  12: <bootstrap::core::builder::Builder>::run_step_descriptions
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1177:9
  13: <bootstrap::core::builder::Builder>::execute_cli
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1156:14
  14: <bootstrap::Build>::build
             at /checkout/src/bootstrap/src/lib.rs:802:25
  15: bootstrap::main
             at /checkout/src/bootstrap/src/bin/main.rs:157:11
  16: <fn() as core::ops::function::FnOnce<()>>::call_once
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/core/src/ops/function.rs:250:5
  17: std::sys::backtrace::__rust_begin_short_backtrace::<fn(), ()>
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/sys/backtrace.rs:166:18
  18: std::rt::lang_start::<()>::{closure#0}
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/rt.rs:206:18
  19: <&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe as core::ops::function::FnOnce<()>>::call_once
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/core/src/ops/function.rs:287:21
  20: std::panicking::catch_unwind::do_call::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/panicking.rs:576:43
  21: std::panicking::catch_unwind::<i32, &dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe>
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/panicking.rs:544:19
  22: std::panic::catch_unwind::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/panic.rs:359:14
  23: std::rt::lang_start_internal::{closure#0}
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/rt.rs:175:24
  24: std::panicking::catch_unwind::do_call::<std::rt::lang_start_internal::{closure#0}, isize>
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/panicking.rs:576:43
---
  30: __libc_start_main
  31: <unknown>


Command has failed. Rerun with -v to see more details.
Bootstrap failed while executing `dist --host aarch64-unknown-linux-gnu --target aarch64-unknown-linux-gnu --include-default-paths build-manifest bootstrap enzyme --set pgo.llvm.use="/tmp/tmp-multistage/opt-artifacts/llvm-pgo.profdata" --set pgo.rustc.use="/tmp/tmp-multistage/opt-artifacts/rustc-pgo.profdata" --set pgo.rustdoc.use="/tmp/tmp-multistage/opt-artifacts/rustdoc-pgo.profdata" --keep-stage 0 --keep-stage 1`
Currently active steps:
dist::JsonDocs { build_compiler: Compiler { stage: 1, host: aarch64-unknown-linux-gnu, forced_compiler: false }, target: aarch64-unknown-linux-gnu } at src/bootstrap/src/core/build_steps/dist.rs:131
doc::Std { build_compiler: Compiler { stage: 1, host: aarch64-unknown-linux-gnu, forced_compiler: false }, target: aarch64-unknown-linux-gnu, format: Json, crates: [] } at src/bootstrap/src/core/build_steps/dist.rs:139
Build completed unsuccessfully in 0:42:00
[2026-07-19T07:29:19.595Z INFO  opt_dist::timer] Section `Stage 5 (final build)` ended: FAIL (2520.80s)`
---

Stack backtrace:
   0: <anyhow::Error>::msg::<alloc::string::String>
             at /rust/deps/anyhow-1.0.102/src/backtrace.rs:10:14
   1: <opt_dist::exec::CmdBuilder>::run
             at /rustc/2871dd0aa0a60b371d3cb84c3ce94fe9099be61f/src/tools/opt-dist/src/exec.rs:81:17
   2: <opt_dist::exec::Bootstrap>::run
             at /rustc/2871dd0aa0a60b371d3cb84c3ce94fe9099be61f/src/tools/opt-dist/src/exec.rs:230:18
   3: opt_dist::execute_pipeline::{closure#4}
             at /rustc/2871dd0aa0a60b371d3cb84c3ce94fe9099be61f/src/tools/opt-dist/src/main.rs:419:57
   4: <opt_dist::timer::TimerSection>::section::<opt_dist::execute_pipeline::{closure#4}, ()>
             at /rustc/2871dd0aa0a60b371d3cb84c3ce94fe9099be61f/src/tools/opt-dist/src/timer.rs:111:22
   5: opt_dist::execute_pipeline
             at /rustc/2871dd0aa0a60b371d3cb84c3ce94fe9099be61f/src/tools/opt-dist/src/main.rs:419:11
   6: opt_dist::main
             at /rustc/2871dd0aa0a60b371d3cb84c3ce94fe9099be61f/src/tools/opt-dist/src/main.rs:495:18
   7: <fn() -> core::result::Result<(), anyhow::Error> as core::ops::function::FnOnce<()>>::call_once
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/core/src/ops/function.rs:250:5
   8: std::sys::backtrace::__rust_begin_short_backtrace::<fn() -> core::result::Result<(), anyhow::Error>, core::result::Result<(), anyhow::Error>>
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/sys/backtrace.rs:166:18
   9: std::rt::lang_start::<core::result::Result<(), anyhow::Error>>::{closure#0}
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/rt.rs:206:18
  10: <&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe as core::ops::function::FnOnce<()>>::call_once
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/core/src/ops/function.rs:287:21
  11: std::panicking::catch_unwind::do_call::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/panicking.rs:576:43
  12: std::panicking::catch_unwind::<i32, &dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe>
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/panicking.rs:544:19
  13: std::panic::catch_unwind::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/panic.rs:359:14
  14: std::rt::lang_start_internal::{closure#0}
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/rt.rs:175:24
  15: std::panicking::catch_unwind::do_call::<std::rt::lang_start_internal::{closure#0}, isize>
             at /rustc/08d5b675a9b2abdca5e2fe4eabe0e07bbda15d49/library/std/src/panicking.rs:576:43

@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 19, 2026
@rust-bors

rust-bors Bot commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 2871dd0 failed: CI. Failed job:

@jhpratt jhpratt closed this Jul 19, 2026
@rust-bors rust-bors Bot 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 Jul 19, 2026
@rust-bors

rust-bors Bot commented Jul 19, 2026

Copy link
Copy Markdown
Contributor

PR #159188, which is a member of this rollup, was unapproved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-libs Relevant to the library team, which will review and decide on the PR/issue. 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.

6 participants