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

JonathanBrouwer · 2026-09-26T15:17:32Z

Successful merges:

dont lint unused parens on a pattern that came from a macro argument #161728 (dont lint unused parens on a pattern that came from a macro argument)
Make dropping an empty BTreeMap free #161791 (Make dropping an empty BTreeMap free)
Update expect messages in rust_const_eval #163283 (Update expect messages in rust_const_eval)

and that function only match drop_btree exactly. As the previous dealloc also passed on old code so didn't catch the regression

* Update expect messages In rustc_const_eval/src/interpret/eval_context.rs * Simplify exception messages

parentheses around a pattern passed to a `macro_rules!` metavariable can be required by the matcher even though they are redundant once expanded, so suggesting their removal breaks the macro call. a `$p:pat_param` fragment never accepts a top-level `|` and neither does `$p:pat` before edition 2021. a metavariable keeps the call site syntax context while the code around it keeps the macro definition context, so compare the two and reuse the existing `avoid_or` flag when they differ. parens written inside a macro body share one context and keep linting as before.

@folkertdev

…t, r=nnethercote dont lint unused parens on a pattern that came from a macro argument fixes rust-lang#86959 r? @folkertdev

…n_empty_BTreeMap_is_not_free_161375, r=clarfonthey Make dropping an empty BTreeMap free rust-lang#161375 ([code example](https://godbolt.org/z/v594PEsr7)) shows that drop of an empty BTree map walks the dying_next path and so is not free. I tracked this down to rust-lang@7b28036 in 1.56.0 using godbolt’s version comparison. When the Btree map has no root we use the ManuallyDrop to safely drop the allocator early resulting in a free drop and a `ret` instead of the `dying_next` path. Includes codegen test which correctly catches the prior dying_next case, which I based on `uninit-aggregate-field.rs`. Fixes rust-lang#161375

…ctx_exception, r=RalfJung Update expect messages in rust_const_eval In the file `compiler/rustc_const_eval/src/interpret/eval_context.rs` to follow expect guidelines in `std::error` according to rust-lang#159751. Note: It's my first time contributing

JonathanBrouwer · 2026-09-26T15:17:44Z

@bors r+ p=5 force

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,test-x86_64-gnu-aux,test-x86_64-gnu-llvm-21-3,test-x86_64-msvc-1,test-aarch64-apple-1,test-aarch64-apple-2,test-x86_64-mingw-1,test-i686-msvc,test-armhf-gnu

rust-bors · 2026-09-26T15:17:48Z

📌 Commit b73bcdb has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 3 pull requests try-job: dist-various-1 try-job: test-various try-job: test-x86_64-gnu-aux try-job: test-x86_64-gnu-llvm-21-3 try-job: test-x86_64-msvc-1 try-job: test-aarch64-apple-1 try-job: test-aarch64-apple-2 try-job: test-x86_64-mingw-1 try-job: test-i686-msvc try-job: test-armhf-gnu

rust-bors · 2026-09-26T18:18:45Z

☀️ Try build successful (CI)
Build commit: 7e18f28 (7e18f2838aaae8b93fc97af5f7a724234dbaa87a)
Base parent: a22b02e (a22b02eaecd6ac937d752139c79d0159c725932d)

rust-bors · 2026-09-26T19:14:34Z

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 2h 46m 50s
Pushing 0b80633 to main...

github-actions · 2026-09-26T19:17:57Z

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 a22b02e (parent) -> 0b80633 (this PR)

Test differences

Show 220 test diffs

Stage 1

[ui] tests/ui/lint/unused-parens-macro-pat-issue-86959.rs#e2018: [missing] -> pass (J0)
[ui] tests/ui/lint/unused-parens-macro-pat-issue-86959.rs#e2021: [missing] -> pass (J0)
[ui (polonius)] tests/ui/lint/unused-parens-macro-pat-issue-86959.rs#e2018: [missing] -> pass (J2)
[ui (polonius)] tests/ui/lint/unused-parens-macro-pat-issue-86959.rs#e2021: [missing] -> pass (J2)
[codegen] tests/codegen-llvm/btree-empty-drop.rs: [missing] -> pass (J4)

Stage 2

[codegen] tests/codegen-llvm/btree-empty-drop.rs: [missing] -> pass (J1)
[ui] tests/ui/lint/unused-parens-macro-pat-issue-86959.rs#e2018: [missing] -> pass (J3)
[ui] tests/ui/lint/unused-parens-macro-pat-issue-86959.rs#e2021: [missing] -> pass (J3)
[run-make] tests/run-make/compressed-debuginfo-zstd: ignore (ignored if LLVM wasn't build with zstd for ELF section compression or LLVM is not the default codegen backend) -> pass (J5)

Additionally, 211 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 0b80633005f513aea0217473be9376bd1a499d49 --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

test-x86_64-gnu-gcc-core-tests: 30m 6s -> 13m 32s (-55.0%)
test-x86_64-gnu-stdlib-semver-check: 24m 39s -> 12m 55s (-47.6%)
test-x86_64-gnu-gcc: 1h 40m -> 53m 31s (-46.7%)
test-x86_64-gnu-parallel-frontend: 2h 20m -> 1h 21m (-41.7%)
test-x86_64-gnu-nopt: 2h 54m -> 1h 45m (-39.4%)
dist-various-2: 36m 22s -> 48m 43s (+34.0%)
test-i686-gnu-nopt-1: 2h 27m -> 1h 38m (-33.6%)
test-x86_64-gnu-llvm-21-2: 1h 46m -> 1h 11m (-32.7%)
test-pr-check-1: 52m 57s -> 36m 12s (-31.6%)
dist-powerpc64-linux-musl: 1h 16m -> 1h 40m (+31.0%)

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-09-26T20:00:15Z

Finished benchmarking commit (0b80633): comparison URL.

Overall result: ❌ regressions - 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.1%	[0.1%, 0.1%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -0.5%, secondary 3.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	2.2%	[2.2%, 2.2%]	1
Regressions ❌ (secondary)	3.7%	[3.5%, 3.9%]	2
Improvements ✅ (primary)	-3.2%	[-3.2%, -3.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.5%	[-3.2%, 2.2%]	2

Cycles

Results (primary -2.4%, secondary -3.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	4.1%	[0.9%, 6.2%]	4
Improvements ✅ (primary)	-2.4%	[-2.7%, -2.1%]	2
Improvements ✅ (secondary)	-8.4%	[-9.9%, -6.6%]	6
All ❌✅ (primary)	-2.4%	[-2.7%, -2.1%]	2

Binary size

Results (primary -0.5%, secondary -0.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-0.0%	[-0.0%, -0.0%]	1
All ❌✅ (primary)	-0.5%	[-0.5%, -0.5%]	1

Bootstrap: 489.175s -> 491.179s (0.41%)
Artifact size: 407.02 MiB -> 406.25 MiB (-0.19%)

rust-bors · 2026-09-26T20:21:20Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#161728	dont lint unused parens on a pattern that came from a macro…	`37f69689a4dc08cabd1f31438a9d67d5ec93a7f1` (link)
#161791	Make dropping an empty BTreeMap free	`a6bef54e8fb238fa617052be72906384bd9b1cd4` (link)
#163283	Update expect messages in rust_const_eval	`88adaab07719da68052e771a66f823950a82a041` (link)

parent commit: a22b02eaec

In the case of a perf regression, run the following command with the SHAs of each PR you suspect might be the cause: @rust-timer triage $SHA $SHA $SHA..., or run @rust-timer triage all to benchmark all rollup members.

jakedrew and others added 13 commits September 23, 2026 01:14

BTree: make dropping an empty BTreeMap free

0109ed2

Adding codegen for the empty BTree drop

756abe8

BTree: documenting the unsafe in the empty map drop

15831b0

Check for dealloc instead of dying_next

70ff620

Checking that an empty BTreeMap drop compiles down to only a ret void,

4cf035f

and that function only match drop_btree exactly. As the previous dealloc also passed on old code so didn't catch the regression

Adding safety comment on the unsafe in BTreeMap drop

9c77e1e

Comment that dying_next is too costly to inline

d432494

Update expect messages in rust_const_eval

8d86741

* Update expect messages In rustc_const_eval/src/interpret/eval_context.rs * Simplify exception messages

add tests that the lint still fires outside the macro argument case

ff63416

Rollup merge of rust-lang#161728 - Albab-Hasan:unused-parens-macro-pa…

f55900d

…t, r=nnethercote dont lint unused parens on a pattern that came from a macro argument fixes rust-lang#86959 r? @folkertdev

rust-bors Bot added the rollup A PR which is a rollup label Sep 26, 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 Sep 26, 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 Sep 26, 2026

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 Sep 26, 2026

rust-bors Bot merged commit 0b80633 into rust-lang:main Sep 26, 2026
15 checks passed

rustbot added this to the 1.101.0 milestone Sep 26, 2026

rust-bors Bot mentioned this pull request Sep 26, 2026

directly deallocates the nodes instead of traversing every element when BTreemap dropping #162931

Open

Navigation Menu

Uh oh!

Rollup of 3 pull requests - #163379

Rollup of 3 pull requests#163379
rust-bors[bot] merged 13 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-TObNVuH

JonathanBrouwer commented Sep 26, 2026

Uh oh!

JonathanBrouwer commented Sep 26, 2026

Uh oh!

rust-bors Bot commented Sep 26, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented Sep 26, 2026

Uh oh!

rust-bors Bot commented Sep 26, 2026

Uh oh!

Uh oh!

github-actions Bot commented Sep 26, 2026

Stage 1

Stage 2

Uh oh!

rust-timer commented Sep 26, 2026

Uh oh!

rust-bors Bot commented Sep 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

JonathanBrouwer commented Sep 26, 2026

Uh oh!

JonathanBrouwer commented Sep 26, 2026

Uh oh!

rust-bors Bot commented Sep 26, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors Bot commented Sep 26, 2026

Uh oh!

rust-bors Bot commented Sep 26, 2026

Uh oh!

Uh oh!

github-actions Bot commented Sep 26, 2026

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Sep 26, 2026

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

rust-bors Bot commented Sep 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants