Rollup of 6 pull requests #150324

matthiaskrgr · 2025-12-23T23:54:38Z

Successful merges:

Fix ICE in normalization during closure capture analysis (#149746) #149800 (Fix ICE in normalization during closure capture analysis (ICE when lint rust_2021_incompatible_closure_captures encounters type that can't be normalized #149746))
Don't export upstream monomorphizations from compiler-builtins #150182 (Don't export upstream monomorphizations from compiler-builtins)
Tidying up tests/ui/issues 15 tests [6/N] #150216 (Tidying up tests/ui/issues 15 tests [6/N])
Update bors configuration #150308 (Update bors configuration)
rustc-dev-guide subtree update #150314 (rustc-dev-guide subtree update)
use new term in description of --target #150319 (use new term in description of --target)

r? @ghost
@rustbot modify labels: rollup

improve cg_gcc.md a little

This updates the rust-version file to 2dc3024.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 2dc3024 Filtered ref: 08ec2a0faafad679655e4349f1484bb25ed1fdbf Upstream diff: rust-lang/rust@cec7008...2dc3024 This merge was created using https://github.com/rust-lang/josh-sync.

Rustc pull update

Please enter the commit message for your changes. Lines starting

sembr a few files

remove `MetadataDecodable` and add `BlobDecodable` and `LazyDecodable`.

stabilization_guide: add missing `)` in prose

Co-authored-by: Tshepang Mbambo <hopsi@tuta.io>

Clarify serialization macros documentation

Add Rustc Explore video link

add comment to closure-move-use-after-move-diagnostic.rs add comment to missing-operator-after-float.rs add comment to closure-array-break-length.rs add comment to box-lifetime-argument-not-allowed.rs add comment to const-return-outside-fn.rs add comment to drop-conflicting-impls.rs add comment to unbalanced-doublequote-2.rs add comment to borrow-immutable-deref-box.rs add comment to for-in-const-eval.rs add comment to borrowck-annotated-static-lifetime.rs cleaned up cast-rfc0401.rs add comment to nll-anon-to-static.rs add comment to cast-to-dyn-any.rs add comment to missing-associated-items.rs add comment to enum-discriminant-missing-variant.rs

Fix ICE in normalization during closure capture analysis (rust-lang#149746) This fixes an internal compiler error that occurred when normalizing associated types during closure capture analysis. The Fix: Modified rustc_middle/src/ty/normalize_erasing_regions.rs to gracefully handle projection normalization failures instead of panicking when analyzing closure captures. Regression Test: Added tests/ui/associated-types/normalization-ice-issue-149746.rs, a reproduction case involving complex associated type projections (<() as Owner>::Ty<T>) that previously crashed the compiler. Verified it now emits a standard type error (E0277). Fixes rust-lang#149746

…=bjorn3 Don't export upstream monomorphizations from compiler-builtins

Tidying up tests/ui/issues 15 tests [6/N] > [!NOTE] > Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge. part of rust-lang#133895 r? Kivooeo

Update bors configuration Updates the configuration of bors to bring it up to speed with homu, in preparation for rust-lang/infra-team#168. Mirrors configuration from homu's [configuration file](https://github.com/rust-lang/homu/blob/master/cfg.production.toml#L46). This PR also enables reporting of merge conflicts, so that we can test this part of bors on `rust-lang/rust`. The merge conflict reports will be duplicated (until/unless we disable it in homu), but that hopefully shouldn't be such a big deal. r? ``@marcoieni``

rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@1127d2a. Created using https://github.com/rust-lang/josh-sync. r? ``@ghost``

use new term in description of --target this changes _triple_ to _tuple_ in `--target` description

matthiaskrgr · 2025-12-23T23:55:23Z

@bors r+ rollup=never p=5

bors · 2025-12-23T23:55:26Z

📌 Commit 2237db5 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-12-24T03:02:48Z

⌛ Testing commit 2237db5 with merge 5a7ad8e...

bors · 2025-12-24T06:21:52Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 5a7ad8e to main...

rust-timer · 2025-12-24T06:23:38Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#149800	Fix ICE in normalization during closure capture analysis (#…	`49fc1ddd139b6859e69b4287b26f2b2c35ab8f78` (link)
#150182	Don't export upstream monomorphizations from compiler-built…	`88eb0c20ce379eff56a5b8adfd5af9ea1de575ed` (link)
#150216	Tidying up tests/ui/issues 15 tests [6/N]	`9b83fa515bdcd9f61d8301ec6c26718b415cc926` (link)
#150308	Update bors configuration	`ce0d3384476a8cf73cd9e34c479f17ffd5e90f13` (link)
#150314	rustc-dev-guide subtree update	`3ed903505255d694636336781ef92bfa838c9e07` (link)
#150319	use new term in description of --target	`a9398e837f4bad92c2b116a06a8aca4baf03495d` (link)

previous master: 8796b3b8b4

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 · 2025-12-24T06:25:19Z

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 8796b3b (parent) -> 5a7ad8e (this PR)

Test differences

Show 74 test diffs

Stage 1

[ui] tests/ui/array-slice-vec/array-break-length.rs: pass -> [missing] (J0)
[ui] tests/ui/associated-types/normalization-ice-issue-149746.rs: [missing] -> pass (J0)
[ui] tests/ui/borrowck/borrow-immutable-deref-box.rs: [missing] -> pass (J0)
[ui] tests/ui/box/box-lifetime-argument-not-allowed.rs: [missing] -> pass (J0)
[ui] tests/ui/cast/cast-rfc0401-2.rs: pass -> [missing] (J0)
[ui] tests/ui/cast/cast-rfc0401-fail.rs: [missing] -> pass (J0)
[ui] tests/ui/cast/cast-to-dyn-any.rs: [missing] -> pass (J0)
[ui] tests/ui/closures/closure-move-use-after-move-diagnostic.rs: [missing] -> pass (J0)
[ui] tests/ui/consts/const-return-outside-fn.rs: [missing] -> pass (J0)
[ui] tests/ui/drop/drop-conflicting-impls.rs: [missing] -> pass (J0)
[ui] tests/ui/enum/enum-discriminant-missing-variant.rs: [missing] -> pass (J0)
[ui] tests/ui/issues/issue-18423.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-21554.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-22289.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-23173.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-23217.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-24357.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-28568.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-36400.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-38458.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-44078.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-45965.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-46983.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-47184.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-50581.rs: pass -> [missing] (J0)
[ui] tests/ui/issues/issue-50582.rs: pass -> [missing] (J0)
[ui] tests/ui/mismatched_types/cast-rfc0401.rs: pass -> [missing] (J0)
[ui] tests/ui/nll/borrowck-annotate-static-lifetime.rs: [missing] -> pass (J0)
[ui] tests/ui/nll/nll-anon-to-static.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/missing-operator-after-float.rs: [missing] -> pass (J0)
[ui] tests/ui/parser/unbalanced-doublequote-2.rs: [missing] -> pass (J0)
[ui] tests/ui/resolve/missing-associated-items.rs: [missing] -> pass (J0)
[ui] tests/ui/typeck/for-in-const-eval.rs: [missing] -> pass (J0)

Stage 2

[ui] tests/ui/array-slice-vec/array-break-length.rs: pass -> [missing] (J1)
[ui] tests/ui/associated-types/normalization-ice-issue-149746.rs: [missing] -> pass (J1)
[ui] tests/ui/borrowck/borrow-immutable-deref-box.rs: [missing] -> pass (J1)
[ui] tests/ui/box/box-lifetime-argument-not-allowed.rs: [missing] -> pass (J1)
[ui] tests/ui/cast/cast-rfc0401-2.rs: pass -> [missing] (J1)
[ui] tests/ui/cast/cast-rfc0401-fail.rs: [missing] -> pass (J1)
[ui] tests/ui/cast/cast-to-dyn-any.rs: [missing] -> pass (J1)
[ui] tests/ui/closures/closure-move-use-after-move-diagnostic.rs: [missing] -> pass (J1)
[ui] tests/ui/consts/const-return-outside-fn.rs: [missing] -> pass (J1)
[ui] tests/ui/drop/drop-conflicting-impls.rs: [missing] -> pass (J1)
[ui] tests/ui/enum/enum-discriminant-missing-variant.rs: [missing] -> pass (J1)
[ui] tests/ui/issues/issue-18423.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-21554.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-22289.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-23173.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-23217.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-24357.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-28568.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-36400.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-38458.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-44078.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-45965.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-46983.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-47184.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-50581.rs: pass -> [missing] (J1)
[ui] tests/ui/issues/issue-50582.rs: pass -> [missing] (J1)
[ui] tests/ui/mismatched_types/cast-rfc0401.rs: pass -> [missing] (J1)
[ui] tests/ui/nll/borrowck-annotate-static-lifetime.rs: [missing] -> pass (J1)
[ui] tests/ui/nll/nll-anon-to-static.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/missing-operator-after-float.rs: [missing] -> pass (J1)
[ui] tests/ui/parser/unbalanced-doublequote-2.rs: [missing] -> pass (J1)
[ui] tests/ui/resolve/missing-associated-items.rs: [missing] -> pass (J1)
[ui] tests/ui/typeck/for-in-const-eval.rs: [missing] -> pass (J1)

Additionally, 8 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 5a7ad8ee060eb429a28d844080cfe6938d550b19 --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-debug: 7300.0s -> 10284.3s (+40.9%)
x86_64-msvc-2: 9445.4s -> 8191.0s (-13.3%)
dist-aarch64-apple: 7063.3s -> 7837.0s (+11.0%)
dist-ohos-x86_64: 4766.3s -> 4265.8s (-10.5%)
dist-armv7-linux: 5584.0s -> 5038.1s (-9.8%)
dist-x86_64-mingw: 9602.0s -> 8792.8s (-8.4%)
dist-x86_64-llvm-mingw: 6538.8s -> 7033.1s (+7.6%)
dist-i586-gnu-i586-i686-musl: 5391.0s -> 4989.6s (-7.4%)
dist-riscv64-linux: 5430.0s -> 5038.7s (-7.2%)
x86_64-gnu-tools: 3446.2s -> 3688.9s (+7.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 · 2025-12-24T07:03:31Z

Finished benchmarking commit (5a7ad8e): 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.0%	[0.0%, 0.1%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 0.8%, secondary 1.6%)

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

	mean	range	count
Regressions ❌ (primary)	2.4%	[2.4%, 2.4%]	1
Regressions ❌ (secondary)	4.0%	[0.7%, 5.4%]	7
Improvements ✅ (primary)	-0.8%	[-0.8%, -0.8%]	1
Improvements ✅ (secondary)	-1.8%	[-2.3%, -1.5%]	5
All ❌✅ (primary)	0.8%	[-0.8%, 2.4%]	2

Cycles

Results (secondary -1.2%)

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)	2.5%	[2.0%, 3.2%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.0%	[-6.3%, -2.0%]	4
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 484.054s -> 482.036s (-0.42%)
Artifact size: 390.47 MiB -> 392.48 MiB (0.52%)

tshepang and others added 30 commits December 16, 2025 06:04

improve cg_gcc.md a little

38ef5c1

Merge pull request rust-lang#2700 from rust-lang/tshepang-patch-4

160e5d8

improve cg_gcc.md a little

Prepare for merging from rust-lang/rust

a412446

This updates the rust-version file to 2dc3024.

Merge pull request rust-lang#2701 from rust-lang/rustc-pull

7f16a1f

Rustc pull update

output of "git diff" is better, and is what I use mostly

fd51310

place it all in just 2 unit tests

64c1e97

match fn name

e254e7e

sembr src/about-this-guide.md

8b2c9d8

sembr src/appendix/bibliography.md

6a91174

fix corner case

f685b24

sembr src/appendix/bibliography.md (after fix from parent commit)

e1fe9c6

Please enter the commit message for your changes. Lines starting

sembr src/diagnostics/error-codes.md

2dac444

sembr src/query.md

5e1352b

corner case

40d05f8

manual sembr

2fe2052

sembr src/conventions.md

4673d56

that basically repeats the title

3aa4a79

Merge pull request rust-lang#2703 from rust-lang/tshepang/sembr

4b83a5b

sembr a few files

Clarify serialization macros documentation

186fc3c

remove `MetadataDecodable` and add `BlobDecodable` and `LazyDecodable`.

stabilization_guide: add missing ) in prose

1dff3e7

Merge pull request rust-lang#2705 from DanielEScherzer/patch-1

728c376

stabilization_guide: add missing `)` in prose

fix typo

e1e8e06

Co-authored-by: Tshepang Mbambo <hopsi@tuta.io>

Clarify descriptions for BlobDecodable and LazyDecodable

54a25b1

Merge pull request rust-lang#2704 from reddevilmidzy/macro

7076d69

Clarify serialization macros documentation

Add Rustc Explore video link

c3bd76b

Merge pull request rust-lang#2706 from reddevilmidzy/lecture

f34a4ee

Add Rustc Explore video link

Don't export upstream monomorphizations from compiler-builtins

44a9d84

moved test

7ca2eb9

Kobzol and others added 9 commits December 23, 2025 14:16

Update bors configuration

75f53dd

Add support for automation/bors/auto merge branch

bbf4ec3

use new term in description of --target

e796582

Rollup merge of rust-lang#150182 - saethlin:dont-prefer-c-builtins, r…

6212979

…=bjorn3 Don't export upstream monomorphizations from compiler-builtins

Rollup merge of rust-lang#150216 - reddevilmidzy:t13, r=Kivooeo

b6c2dab

Tidying up tests/ui/issues 15 tests [6/N] > [!NOTE] > Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge. part of rust-lang#133895 r? Kivooeo

Rollup merge of rust-lang#150314 - tshepang:rdg-sync, r=tshepang

6348e94

rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@1127d2a. Created using https://github.com/rust-lang/josh-sync. r? ``@ghost``

Rollup merge of rust-lang#150319 - tshepang:triple-is-tuple, r=Kivooeo

2237db5

use new term in description of --target this changes _triple_ to _tuple_ in `--target` description

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 23, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 24, 2025

bors merged commit 5a7ad8e into rust-lang:main Dec 24, 2025
12 checks passed

rustbot added this to the 1.94.0 milestone Dec 24, 2025

bors mentioned this pull request Dec 24, 2025

Automate rustc(1) man page generation using help2man script #150066

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Rollup of 6 pull requests #150324

Rollup of 6 pull requests #150324

Uh oh!

matthiaskrgr commented Dec 23, 2025 •

edited by rustbot

Loading

Uh oh!

matthiaskrgr commented Dec 23, 2025

Uh oh!

bors commented Dec 23, 2025

Uh oh!

bors commented Dec 24, 2025

Uh oh!

bors commented Dec 24, 2025

Uh oh!

Uh oh!

rust-timer commented Dec 24, 2025

Uh oh!

github-actions bot commented Dec 24, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Dec 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Rollup of 6 pull requests #150324

Rollup of 6 pull requests #150324

Uh oh!

Conversation

matthiaskrgr commented Dec 23, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

matthiaskrgr commented Dec 23, 2025

Uh oh!

bors commented Dec 23, 2025

Uh oh!

bors commented Dec 24, 2025

Uh oh!

bors commented Dec 24, 2025

Uh oh!

Uh oh!

rust-timer commented Dec 24, 2025

Uh oh!

github-actions bot commented Dec 24, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Dec 24, 2025

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

matthiaskrgr commented Dec 23, 2025 •

edited by rustbot

Loading