Rollup of 3 pull requests by JonathanBrouwer · Pull Request #159170 · rust-lang/rust

JonathanBrouwer · 2026-07-12T07:22:15Z

Successful merges:

Fix offset used to read the second part of scalar pairs from a const #159148 (Fix offset used to read the second part of scalar pairs from a const)
c-variadic: Update cfg for 128-bit integers to fix build error on AArch64 ILP32 #159167 (c-variadic: Update cfg for 128-bit integers to fix build error on AArch64 ILP32)
Rename errors.rs file to diagnostics.rs (12/N) #159153 (Rename errors.rs file to diagnostics.rs (12/N))

… from const

…agnostics.rs`

AArch64 ILP32

Otherwise 32-bit has a different ABI and the `CHECK` fails. And the noopt job fails without forcing MIR optimization here.

@workingjubilee

Fix offset used to read the second part of scalar pairs from a `const` Fixes rust-lang#159116 r? @workingjubilee

@folkertdev

…r=workingjubilee c-variadic: Update cfg for 128-bit integers to fix build error on AArch64 ILP32 This fixes build error on AArch64 ILP32 targets (aarch64-unknown-linux-gnu_ilp32, aarch64_be-unknown-linux-gnu_ilp32, arm64_32-apple-watchos) introduced in rust-lang#155429. See rust-lang#155429 (comment) for details. The approach used in this PR (use exact cfgs instead of using a rough cfgs with checking unexpected case by `compile_error!`) is also based on what was proposed in that comment. The set of allowed cases should not be changed in this PR. cc @folkertdev @rustbot label +O-aarch64 +F-c_variadic

@JonathanBrouwer

… r=JonathanBrouwer Rename `errors.rs` file to `diagnostics.rs` (12/N) Follow-up of rust-lang#157485. r? @JonathanBrouwer

JonathanBrouwer · 2026-07-12T07:22:37Z

@bors r+ rollup=never p=5

rust-bors · 2026-07-12T07:22:40Z

📌 Commit b5718d0 has been approved by JonathanBrouwer

It is now in the queue for this repository.

…uwer Rollup of 3 pull requests Successful merges: - #159148 (Fix offset used to read the second part of scalar pairs from a `const`) - #159167 (c-variadic: Update cfg for 128-bit integers to fix build error on AArch64 ILP32) - #159153 (Rename `errors.rs` file to `diagnostics.rs` (12/N))

rust-log-analyzer · 2026-07-12T09:24:36Z

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

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

test [debuginfo-gdb] tests/debuginfo/zst-interferes-with-prologue.rs ... ok

failures:

---- [debuginfo-gdb] tests/debuginfo/function-call.rs stdout ----
NOTE: compiletest thinks it is using GDB version 12001000
------gdb stdout------------------------------
GNU gdb (Ubuntu 12.1-0ubuntu1~22.04.2) 12.1
Copyright (C) 2022 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Type "show copying" and "show warranty" for details.
This GDB was configured as "x86_64-linux-gnu".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
<https://www.gnu.org/software/gdb/bugs/>.
Find the GDB manual and other documentation resources online at:
    <http://www.gnu.org/software/gdb/documentation/>.

For help, type "help".
Type "apropos word" to search for commands related to "word".
Breakpoint 1 at 0x1b42: file /checkout/tests/debuginfo/function-call.rs, line 36.
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".

Breakpoint 1, function_call::main () at /checkout/tests/debuginfo/function-call.rs:36
36     zzz(); // #break

------gdb stderr------------------------------
/checkout/obj/build/x86_64-unknown-linux-gnu/test/debuginfo/function-call.gdb/function-call.debugger.script:11: Error in sourced command file:
Couldn't write extended state status: Bad address.

------------------------------------------

error: gdb failed to execute
status: exit status: 1
command: PYTHONPATH="/checkout/src/etc" "/usr/bin/gdb" "-quiet" "-batch" "-nx" "-command=/checkout/obj/build/x86_64-unknown-linux-gnu/test/debuginfo/function-call.gdb/function-call.debugger.script"
--- stdout -------------------------------
GNU gdb (Ubuntu 12.1-0ubuntu1~22.04.2) 12.1
Copyright (C) 2022 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Type "show copying" and "show warranty" for details.
This GDB was configured as "x86_64-linux-gnu".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
<https://www.gnu.org/software/gdb/bugs/>.
Find the GDB manual and other documentation resources online at:
    <http://www.gnu.org/software/gdb/documentation/>.

For help, type "help".
Type "apropos word" to search for commands related to "word".
Breakpoint 1 at 0x1b42: file /checkout/tests/debuginfo/function-call.rs, line 36.
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".

Breakpoint 1, function_call::main () at /checkout/tests/debuginfo/function-call.rs:36
36     zzz(); // #break
------------------------------------------
--- stderr -------------------------------
/checkout/obj/build/x86_64-unknown-linux-gnu/test/debuginfo/function-call.gdb/function-call.debugger.script:11: Error in sourced command file:
Couldn't write extended state status: Bad address.
------------------------------------------

rust-bors · 2026-07-12T09:24:56Z

💔 Test for 170e61f failed: CI. Failed job:

auto - x86_64-gnu-nopt (web logs, enhanced plaintext logs)

JonathanBrouwer · 2026-07-12T09:48:53Z

@bors retry

rust-bors · 2026-07-12T13:00:59Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 11m 16s
Pushing babf6ea to main...

rust-timer · 2026-07-12T13:01:54Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#159148	Fix offset used to read the second part of scalar pairs fro…	`a242f50a629c9090a169541badc2138ccb57079e` (link)
#159167	c-variadic: Update cfg for 128-bit integers to fix build er…	`f94f126028d7322f4c28daf8fddfefa81fde720e` (link)
#159153	Rename `errors.rs` file to `diagnostics.rs` (12/N)	`804cd8f915cfec787581da43d7259f43a3026926` (link)

previous master: b69e089eb3

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

github-actions · 2026-07-12T13:03:37Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing b69e089 (parent) -> babf6ea (this PR)

Test differences

Show 32 test diffs

Stage 1

[codegen] tests/codegen-llvm/const-array-of-pairs.rs: [missing] -> pass (J1)

Stage 2

[codegen] tests/codegen-llvm/const-array-of-pairs.rs: [missing] -> pass (J0)

Additionally, 30 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard babf6ea4aab9ed78ea9400b25b0e7e79a6870f29 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

x86_64-gnu-gcc-core-tests: 14m 45s -> 8m 3s (-45.4%)
x86_64-rust-for-linux: 54m 43s -> 35m 34s (-35.0%)
i686-gnu-2: 1h 42m -> 1h 7m (-34.1%)
x86_64-gnu-miri: 1h 39m -> 1h 6m (-32.8%)
x86_64-gnu-aux: 2h 56m -> 2h 1m (-31.0%)
test-various: 2h 16m -> 1h 34m (-30.9%)
pr-check-1: 33m 38s -> 23m 37s (-29.7%)
x86_64-msvc-2: 2h 29m -> 1h 45m (-29.6%)
dist-x86_64-solaris: 1h 18m -> 1h 39m (+28.0%)
x86_64-gnu-debug: 2h 8m -> 1h 32m (-27.9%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2026-07-12T19:04:02Z

Finished benchmarking commit (babf6ea): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.1%	[-0.2%, -0.0%]	11
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

This perf run didn't have relevant results for this metric.

Cycles

This perf run didn't have relevant results for this metric.

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 489.358s -> 490.525s (0.24%)
Artifact size: 389.32 MiB -> 389.30 MiB (-0.01%)

scottmcm and others added 9 commits July 11, 2026 12:03

Add regression test for 159116

73e0280

Include the subobject offset, not just the field offset, when reading…

9fddc69

… from const

Rename rustc_const_eval/src/errors.rs into `rustc_const_eval/src/di…

e04e3b3

…agnostics.rs`

Rename rustc_parse/src/errors.rs into rustc_parse/src/diagnostics.rs

cba2097

c-variadic: Update cfg for 128-bit integers to fix build error on

045175d

AArch64 ILP32

Use smaller scalars in the test and force optimizations on

d693dfe

Otherwise 32-bit has a different ABI and the `CHECK` fails. And the noopt job fails without forcing MIR optimization here.

Rollup merge of rust-lang#159148 - scottmcm:fix-159116, r=workingjubilee

3ab3767

Fix offset used to read the second part of scalar pairs from a `const` Fixes rust-lang#159116 r? @workingjubilee

Rollup merge of rust-lang#159153 - GuillaumeGomez:rename-err-to-diag,…

b5718d0

… r=JonathanBrouwer Rename `errors.rs` file to `diagnostics.rs` (12/N) Follow-up of rust-lang#157485. r? @JonathanBrouwer

rust-bors Bot added the rollup A PR which is a rollup label Jul 12, 2026

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. labels Jul 12, 2026

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 12, 2026

This comment has been minimized.

Sign in to view

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 12, 2026

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 12, 2026

rust-bors Bot mentioned this pull request Jul 12, 2026

Fix offset used to read the second part of scalar pairs from a const #159148

Merged

This comment has been minimized.

Sign in to view

rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 12, 2026

rust-bors Bot merged commit babf6ea into rust-lang:main Jul 12, 2026
14 checks passed

rustbot added this to the 1.99.0 milestone Jul 12, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Rollup of 3 pull requests#159170

Rollup of 3 pull requests#159170
rust-bors[bot] merged 9 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-UxyQ0Ig

JonathanBrouwer commented Jul 12, 2026

Uh oh!

JonathanBrouwer commented Jul 12, 2026

Uh oh!

rust-bors Bot commented Jul 12, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Jul 12, 2026

Uh oh!

rust-bors Bot commented Jul 12, 2026

Uh oh!

JonathanBrouwer commented Jul 12, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jul 12, 2026

Uh oh!

Uh oh!

rust-timer commented Jul 12, 2026

Uh oh!

github-actions Bot commented Jul 12, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented Jul 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Uh oh!

Conversation

JonathanBrouwer commented Jul 12, 2026

Uh oh!

JonathanBrouwer commented Jul 12, 2026

Uh oh!

rust-bors Bot commented Jul 12, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Jul 12, 2026

Uh oh!

rust-bors Bot commented Jul 12, 2026

Uh oh!

JonathanBrouwer commented Jul 12, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jul 12, 2026

Uh oh!

Uh oh!

rust-timer commented Jul 12, 2026

Uh oh!

github-actions Bot commented Jul 12, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Jul 12, 2026

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants