Rollup of 13 pull requests #145373

Zalathar · 2025-08-14T00:04:26Z

Successful merges:

Change the desugaring of assert! for better error output #122661 (Change the desugaring of assert! for better error output)
Improve --remap-path-prefix documentation #142372 (Improve --remap-path-prefix documentation)
compiler: Allow extern "interrupt" fn() -> ! #143075 (compiler: Allow extern "interrupt" fn() -> !)
strip prefix of temporary file names when it exceeds filesystem name length limit #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit)
resolve: Introduce RibKind::Block #145065 (resolve: Introduce RibKind::Block)
llvm: Accept new LLVM lifetime format #145120 (llvm: Accept new LLVM lifetime format)
Weekly cargo update #145189 (Weekly cargo update)
Improve tracing in bootstrap #145261 (Improve tracing in bootstrap)
Reduce some queries around associated items #145266 (Reduce some queries around associated items)
doc test: fix mpsc.rs try_send doc test #145299 (doc test: fix mpsc.rs try_send doc test)
Make std use the edition 2024 prelude #145331 (Make std use the edition 2024 prelude)
bootstrap: Fix jemalloc 64K page support for aarch64 tools #145353 (bootstrap: Fix jemalloc 64K page support for aarch64 tools)
Suppress wrapper suggestion when expected and actual ty are the same adt and the variant is unresolved #145361 (Suppress wrapper suggestion when expected and actual ty are the same adt and the variant is unresolved)

Failed merges:

Rename and document ONLY_HOSTS in bootstrap #145324 (Rename and document ONLY_HOSTS in bootstrap)
resolve: Miscellaneous cleanups #145372 (resolve: Miscellaneous cleanups)

r? @ghost
@rustbot modify labels: rollup

compiler & tools dependencies: Locking 18 packages to latest compatible versions Updating anstream v0.6.19 -> v0.6.20 Updating anstyle-query v1.1.3 -> v1.1.4 Updating anstyle-svg v0.1.9 -> v0.1.10 Updating anstyle-wincon v3.0.9 -> v3.0.10 Updating camino v1.1.10 -> v1.1.11 Updating clap v4.5.42 -> v4.5.43 Updating clap_builder v4.5.42 -> v4.5.43 Updating cxx v1.0.161 -> v1.0.166 Updating cxx-build v1.0.161 -> v1.0.166 Updating cxxbridge-cmd v1.0.161 -> v1.0.166 Updating cxxbridge-flags v1.0.161 -> v1.0.166 Updating cxxbridge-macro v1.0.161 -> v1.0.166 Updating derive-where v1.5.0 -> v1.6.0 Updating hashbrown v0.15.4 -> v0.15.5 Updating indenter v0.3.3 -> v0.3.4 Updating rustversion v1.0.21 -> v1.0.22 Updating scratch v1.0.8 -> v1.0.9 Updating zerovec v0.11.2 -> v0.11.4 note: pass `--verbose` to see 36 unchanged dependencies behind latest library dependencies: Locking 1 package to latest compatible version Updating hashbrown v0.15.4 -> v0.15.5 note: pass `--verbose` to see 2 unchanged dependencies behind latest rustbook dependencies: Locking 10 packages to latest compatible versions Updating anstream v0.6.19 -> v0.6.20 Updating anstyle-query v1.1.3 -> v1.1.4 Updating anstyle-wincon v3.0.9 -> v3.0.10 Updating cc v1.2.31 -> v1.2.32 Updating clap v4.5.42 -> v4.5.43 Updating clap_builder v4.5.42 -> v4.5.43 Updating clap_complete v4.5.55 -> v4.5.56 Updating hashbrown v0.15.4 -> v0.15.5 Updating rustversion v1.0.21 -> v1.0.22 Updating zerovec v0.11.2 -> v0.11.4

…length limit When doing lto, rustc generates filenames that are concatenating many information. In the case of this testcase, it is concatenating crate name and rust file name, plus some hash, and the extension. In some other cases it will concatenate even more information reducing the maximum effective crate name to about 110 chars on linux filesystems where filename max length is 255 This commit is ensuring that the temporary file names are limited in size, while still reasonabily ensuring the unicity (with hashing of the stripped part)

to avoid confusing module items, blocks with items, and blocks without items.

…ent scope" help

So that it is easier to see which was the last started step when a failure happens on CI.

When verbose mode is enabled, it is very hard to see the actually executed steps.

They could easily get out of sync and miss some fields. Now all steps are instrumented automatically.

…nabled

LLVM removed the size parameter from the lifetime format. Tolerate not having that size parameter.

In the desugaring of `assert!`, we now expand to a `match` expression instead of `if !cond {..}`. The span of incorrect conditions will point only at the expression, and not the whole `assert!` invocation. ``` error[E0308]: mismatched types --> $DIR/issue-14091.rs:2:13 | LL | assert!(1,1); | ^ expected `bool`, found integer ``` We no longer mention the expression needing to implement the `Not` trait. ``` error[E0308]: mismatched types --> $DIR/issue-14091-2.rs:15:13 | LL | assert!(x, x); | ^ expected `bool`, found `BytePos` ``` `assert!(val)` now desugars to: ```rust match val { true => {}, _ => $crate::panic::panic_2021!(), } ``` Fix rust-lang#122159. We make some minor changes to some diagnostics to avoid span overlap on type mismatch or inverted "expected"/"found" on type errors. We remove some unnecessary parens from core, alloc and miri. address review comments

Zalathar · 2025-08-14T00:04:55Z

@bors r+ rollup=never p=5

bors · 2025-08-14T00:04:57Z

📌 Commit ff62657 has been approved by Zalathar

It is now in the queue for this repository.

Zalathar · 2025-08-14T00:08:12Z

@bors try jobs=test-various,dist-ohos-x86_64,aarch64-apple

Rollup of 13 pull requests try-job: test-various try-job: dist-ohos-x86_64 try-job: aarch64-apple

rust-bors · 2025-08-14T01:52:24Z

☀️ Try build successful (CI)
Build commit: f94b416 (f94b4161a9e29668825002b2dcf5c95c990648c8, parent: 3672a55b7cfd0a12e7097197b6242872473ffaa7)

bors · 2025-08-14T04:08:56Z

⌛ Testing commit ff62657 with merge 3478ce9...

Rollup of 13 pull requests Successful merges: - #122661 (Change the desugaring of `assert!` for better error output) - #142372 (Improve `--remap-path-prefix` documentation) - #143075 (compiler: Allow `extern "interrupt" fn() -> !`) - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - #145065 (resolve: Introduce `RibKind::Block`) - #145120 (llvm: Accept new LLVM lifetime format) - #145189 (Weekly `cargo update`) - #145261 (Improve tracing in bootstrap) - #145266 (Reduce some queries around associated items) - #145299 (doc test: fix mpsc.rs try_send doc test) - #145331 (Make std use the edition 2024 prelude) - #145353 (bootstrap: Fix jemalloc 64K page support for aarch64 tools) - #145361 (Suppress wrapper suggestion when expected and actual ty are the same adt and the variant is unresolved) Failed merges: - #145324 (Rename and document `ONLY_HOSTS` in bootstrap) - #145372 (resolve: Miscellaneous cleanups) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2025-08-14T04:22:00Z

💔 Test failed - checks-actions

Zalathar · 2025-08-14T05:32:58Z

@bors retry (flaky)

bors · 2025-08-14T07:34:21Z

⌛ Testing commit ff62657 with merge f87377a...

Rollup of 13 pull requests Successful merges: - #122661 (Change the desugaring of `assert!` for better error output) - #142372 (Improve `--remap-path-prefix` documentation) - #143075 (compiler: Allow `extern "interrupt" fn() -> !`) - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit) - #145065 (resolve: Introduce `RibKind::Block`) - #145120 (llvm: Accept new LLVM lifetime format) - #145189 (Weekly `cargo update`) - #145261 (Improve tracing in bootstrap) - #145266 (Reduce some queries around associated items) - #145299 (doc test: fix mpsc.rs try_send doc test) - #145331 (Make std use the edition 2024 prelude) - #145353 (bootstrap: Fix jemalloc 64K page support for aarch64 tools) - #145361 (Suppress wrapper suggestion when expected and actual ty are the same adt and the variant is unresolved) Failed merges: - #145324 (Rename and document `ONLY_HOSTS` in bootstrap) - #145372 (resolve: Miscellaneous cleanups) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2025-08-14T09:10:11Z

The job i686-gnu-nopt-1 failed! Check out the build log: (web) (plain enhanced) (plain)

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

failures:

---- [ui] tests/ui/mir/alignment/packed.rs stdout ----

error: test did not exit with success! code=Some(101) so test would pass with `run-fail`
status: exit status: 101
command: cd "/checkout/obj/build/i686-unknown-linux-gnu/test/ui/mir/alignment/packed" && RUSTC="/checkout/obj/build/i686-unknown-linux-gnu/stage2/bin/rustc" RUST_TEST_THREADS="4" "/checkout/obj/build/i686-unknown-linux-gnu/test/ui/mir/alignment/packed/a"
stdout: none
--- stderr -------------------------------

thread 'main' (147219) panicked at /checkout/tests/ui/mir/alignment/packed.rs:17:5:
assertion failed: !ptr0.is_aligned() || !ptr1.is_aligned()
stack backtrace:
   0: __rustc::rust_begin_unwind
   1: core::panicking::panic_fmt
   2: core::panicking::panic
   3: packed::main

bors · 2025-08-14T09:10:43Z

💔 Test failed - checks-actions

workingjubilee and others added 30 commits June 27, 2025 11:04

tests: add test for invalid interrupt signatures

1045b70

compiler: fixup error message for x86-interrupt invalid returns

db33e98

compiler: allow interrupts to return () or !

d6b3314

remember how to write never returns

b5ab966

resolve: Introduce RibKind::Block

d6c7cf7

to avoid confusing module items, blocks with items, and blocks without items.

resolve: Inline with_mod_rib

7af4ee8

resolve: Restructure resolve_ident_in_lexical_scope for better clarity

4c4c3d5

resolve: Add one more test case for "binding is available in a differ…

7418fa9

…ent scope" help

Store bootstrap tracing outputs to a unified directory

e6dddcb

Store latest symlink to the latest tracing output directory

c97b606

Store Chrome step trace into the tracing directory

f819729

Use shorter command span label

aad5795

Print step timings also when the stap starts to execute

3a115ba

So that it is easier to see which was the last started step when a failure happens on CI.

Replace tracing_forest with custom span formatting

c846f7c

Create a span for each executed step

1e14229

Remove ad-hoc print of executed/cached steps in verbose mode

690c781

When verbose mode is enabled, it is very hard to see the actually executed steps.

Remove manual #[instrument] annotations on steps

d403934

They could easily get out of sync and miss some fields. Now all steps are instrumented automatically.

Move tracing setup to the tracing module

604c180

Correctly show executed command name in Chrome trace

c3682b2

Always profile commands and generate Chrome profile when tracing is e…

b4a357f

…nabled

Do not create a span for cached commands

f9a4588

Create tracing directory symlink even during dry run

12828f7

Use pretty_step_name in step_graph

3e77562

Update debugging/profiling bootstrap page

a0306bf

Print created location of executed commands

6f584bc

llvm: Accept new LLVM lifetime format

258915a

LLVM removed the size parameter from the lifetime format. Tolerate not having that size parameter.

Remove one dependency from tracing bootstrap build

0b8c6ad

rustbot added 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. rollup A PR which is a rollup labels Aug 14, 2025

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 Aug 14, 2025

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Aug 14, 2025

Auto merge of #145373 - Zalathar:rollup-079tzmp, r=<try>

f94b416

Rollup of 13 pull requests try-job: test-various try-job: dist-ohos-x86_64 try-job: aarch64-apple

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 Aug 14, 2025

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 Aug 14, 2025

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 Aug 14, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 13 pull requests #145373

Rollup of 13 pull requests #145373

Zalathar commented Aug 14, 2025 •

edited by rustbot

Loading

Uh oh!

Zalathar commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

Zalathar commented Aug 14, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

Zalathar commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

rust-log-analyzer commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

Uh oh!

Rollup of 13 pull requests #145373

Are you sure you want to change the base?

Rollup of 13 pull requests #145373

Conversation

Zalathar commented Aug 14, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Zalathar commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

Zalathar commented Aug 14, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

Zalathar commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

rust-log-analyzer commented Aug 14, 2025

Uh oh!

bors commented Aug 14, 2025

Uh oh!

Uh oh!

Zalathar commented Aug 14, 2025 •

edited by rustbot

Loading