Skip to content

Rollup of 13 pull requests - #150224

Closed
JonathanBrouwer wants to merge 28 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-rt56ux6
Closed

Rollup of 13 pull requests#150224
JonathanBrouwer wants to merge 28 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-rt56ux6

Conversation

@JonathanBrouwer

@JonathanBrouwer JonathanBrouwer commented Dec 21, 2025

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fmease and others added 28 commits November 26, 2025 04:57
Signed-off-by: tison <wander4096@gmail.com>
Fixes library linking issues where libgcc_s was incorrectly being linked
instead of the appropriate LLVM runtime libraries for Hexagon targets.

* Set llvm-libunwind as default for all hexagon targets in bootstrap
* Exclude hexagon from automatic libgcc_s linking in unwind
* Enable libunwind.a copying for hexagon targets
* Remove manual library linking from hexagon target specification
If we convert the minimum length to `u64` up-front when creating
`TestableCase::Slice`, we can avoid more conversions to `u64` later.
This was accidentally added to the prelude in
3f4dc1e.
Don't strip shebang in expr-ctxt `include!(…)`

No longer strip shebang interpreter directives in files that were `include`d in expression (statement) contexts.
…=Mark-Simulacrum

Add const default for OnceCell and OnceLock

cc rust-lang#143894
…mulacrum

miri: add -Zbinary-dep-depinfo to dependency builds

Hopefully fixes rust-lang#149711

Cc ```@bjorn3```
…-Simulacrum

Enable llvm-libunwind by default for Hexagon targets

Fixes library linking issues where libgcc_s was incorrectly being linked instead of the appropriate LLVM runtime libraries for Hexagon targets.

* Set llvm-libunwind as default for all hexagon targets in bootstrap
* Exclude hexagon from automatic libgcc_s linking in unwind
* Enable libunwind.a copying for hexagon targets
* Remove manual library linking from hexagon target specification
fix docustring on fetch_or

The documentation had the same example twice in a row, but I think this was the intended second example.
tests/ui/traits/fmt-pointer-trait.rs: Add HRTB fn pointer case

Closes rust-lang#50280 which just **E-needs-test**.  See rust-lang#50280 (comment) for a bisect of the fix.

The issue description is quite vague, so in the test I am linking directly to the most descriptive comment rust-lang#50280 (comment).
mir_build: Use the same length type for `TestableCase::Slice` and `TestKind::Len`

If we convert the minimum length to `u64` up-front when creating `TestableCase::Slice`, we can avoid more conversions to `u64` later.

There should be no change to compiler behaviour.
…reexport, r=GuillaumeGomez

[rustdoc] Add missing close tags in extern crate reexports

Fixes rust-lang#150176
change non-canonical clone impl to {*self}, fix some doc comments
…om-prelude, r=jdonszelmann

Drop the From derive macro from the v1 prelude

This was accidentally added to the prelude in 3f4dc1e.

Fixes: rust-lang#150165

r? ````@jdonszelmann````
Update books

## rust-lang/reference

15 commits in ec78de0ffe2f8344bd0e222b17ac7a7d32dc7a26..11f84ce150bed12af4331d2110c75590c7b46261
2025-12-19 04:11:52 UTC to 2025-12-16 18:21:13 UTC

- Document how closure capturing interacts with discriminant reads (rust-lang/reference#1837)
- operator-expr: remove stray word in footnote (rust-lang/reference#2118)
- await-expr: add a missing space (rust-lang/reference#2120)
- attributes: add missing punctuation to instruction_set (rust-lang/reference#2117)
- associated-items: add missing periods (rust-lang/reference#2116)
- Move tools into a consolidated cargo workspace (rust-lang/reference#2115)
- Unwrap all of the lexical chapters (rust-lang/reference#2113)
- Unwrap const_eval.md (rust-lang/reference#2112)
- Add section on expansion-time (early) name resolution (rust-lang/reference#2055)
- const_eval.md: add missing word (rust-lang/reference#2068)
- path-expr.md: use a more suitable punctuation (rust-lang/reference#2082)
- items: clarify label for type-aliases documentation (rust-lang/reference#2110)
- do not mix singular and plural (rust-lang/reference#2101)
- external-blocks: add missing "and" in list (rust-lang/reference#2111)
- conditional-compilation: add a space in `cfg.cfg_attr.attribute-list` (rust-lang/reference#2109)
tests/debuginfo/function-arg-initialization.rs: Stop disabling SingleUseConsts MIR pass

This test passes locally for me. Let's see if it passes CI too.

Discovered while I worked on rust-lang#150201.

CC rust-lang#128945
@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) labels Dec 21, 2025
@rustbot rustbot added T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. 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 Dec 21, 2025
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=5

@rustbot rustbot added the rollup A PR which is a rollup label Dec 21, 2025
@bors

bors commented Dec 21, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit e1d29c3 has been approved by JonathanBrouwer

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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 21, 2025
@bors

bors commented Dec 21, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e1d29c3 with merge 800bb47...

bors added a commit that referenced this pull request Dec 21, 2025
…uwer

Rollup of 13 pull requests

Successful merges:

 - #146377 (Don't strip shebang in expr-ctxt `include!(…)`)
 - #149812 (Add const default for OnceCell and OnceLock)
 - #149882 (miri: add -Zbinary-dep-depinfo to dependency builds)
 - #150009 (Enable llvm-libunwind by default for Hexagon targets)
 - #150035 (fix docustring on fetch_or)
 - #150082 (tests/ui/traits/fmt-pointer-trait.rs: Add HRTB fn pointer case)
 - #150160 (Fix ICE (#149980) for invalid EII in statement position)
 - #150184 (mir_build: Use the same length type for `TestableCase::Slice` and `TestKind::Len`)
 - #150185 ([rustdoc] Add missing close tags in extern crate reexports)
 - #150191 (change non-canonical clone impl to {*self}, fix some doc comments)
 - #150203 (Drop the From derive macro from the v1 prelude)
 - #150208 (Update books)
 - #150210 (tests/debuginfo/function-arg-initialization.rs: Stop disabling SingleUseConsts MIR pass)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors

bors commented Dec 21, 2025

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@bors bors 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 Dec 21, 2025
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job x86_64-gnu-distcheck failed! Check out the build log: (web) (plain enhanced) (plain)

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

Caused by:
  `workspace.package.edition` was not defined
Bootstrap failed while executing `test distcheck`
Command `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo vendor --versioned-dirs --sync /checkout/src/tools/cargo/Cargo.toml --sync /checkout/src/tools/clippy/clippy_test_deps/Cargo.toml --sync /checkout/src/tools/rust-analyzer/Cargo.toml --sync /checkout/compiler/rustc_codegen_cranelift/Cargo.toml --sync /checkout/compiler/rustc_codegen_gcc/Cargo.toml --sync /checkout/library/Cargo.toml --sync /checkout/src/bootstrap/Cargo.toml --sync /checkout/src/tools/rustbook/Cargo.toml --sync /checkout/src/tools/rustc-perf/Cargo.toml --sync /checkout/src/tools/opt-dist/Cargo.toml --sync /checkout/src/doc/book/packages/trpl/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/syn-2.0.101/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/cargo-0.87.1/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/serde-1.0.219/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/ripgrep-14.1.1/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/regex-automata-0.4.8/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/clap_derive-4.5.32/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/hyper-1.6.0/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/externs/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/ctfe-stress-5/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/cargo-0.87.1/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/token-stream-stress/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/match-stress/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/tuple-stress/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/diesel-2.2.10/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/bitmaps-3.2.1/Cargo.toml --sync /checkout/./src/tools/rustc-perf/collector/compile-benchmarks/serde-1.0.219-new-solver/Cargo.toml vendor [workdir=/checkout/obj/build/tmp/tarball/rustc/src/image]` failed with exit code 101
Created at: src/bootstrap/src/core/build_steps/vendor.rs:82:23
Executed at: src/bootstrap/src/core/build_steps/vendor.rs:114:26

--- STDOUT vvv


Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:00:28
  local time: Sun Dec 21 17:41:26 UTC 2025
  network time: Sun, 21 Dec 2025 17:41:26 GMT
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"

@JonathanBrouwer

Copy link
Copy Markdown
Member Author

Probably #150208? Lemme try

@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 21, 2025
@JonathanBrouwer
JonathanBrouwer deleted the rollup-rt56ux6 branch August 21, 2026 08:29
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 T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. 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.