Rollup of 4 pull requests #147913

matthiaskrgr · 2025-10-20T16:21:35Z

Successful merges:

Improve error message for ambiguous numeric types in closure parameters #147577 (Improve error message for ambiguous numeric types in closure parameters)
fix incorrect line number when building trimmed multi-line suggestions #147785 (fix incorrect line number when building trimmed multi-line suggestions)
btree: some cleanup with less unsafe #147814 (btree: some cleanup with less unsafe)
Change the tidy license checker #147843 (Change the tidy license checker)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

It is more permissive than Apache-2.0 which is already allowed.

…s both

With this the only remaining license exceptions are for licenses that are to copyleft to varying degrees.

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

Improve error message for ambiguous numeric types in closure parameters Closes rust-lang#147312

…chenkov fix incorrect line number when building trimmed multi-line suggestions While fixing the issue rust-lang/rust-clippy#15883 from `rust-clippy`, I tracked it down to a problem in `rustc` where line numbers were incorrect when building trimmed multi-line suggestions.

btree: some cleanup with less unsafe

Change the tidy license checker This adds a bunch of licenses to the global list of allowed licenses that are at least as permissive as some other license in the list. In addition it adds another list for licenses that are allowed to be used by tools, but not by the runtime. All permissive licenses from the exception lists are added here. This makes it clearer what actual exceptions to our permissive licensing policy are and will hopefully make it a bit easier to review future changes to the list of licenses rather than just adding whatever license is necessary to the global list of allowed licenses or to the list of exceptions.

matthiaskrgr · 2025-10-20T16:21:48Z

@bors r+ rollup=never p=5

bors · 2025-10-20T16:21:52Z

📌 Commit 2a6ac46 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-10-20T16:40:47Z

⌛ Testing commit 2a6ac46 with merge 4068baf...

bors · 2025-10-20T19:48:38Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 4068baf to master...

rust-timer · 2025-10-20T19:49:49Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#147577	Improve error message for ambiguous numeric types in closur…	`75c2f98e0dd5c8a3bb9485762dd09680b83eb3f9` (link)
#147785	fix incorrect line number when building trimmed multi-line …	`1cd402e2f0f9392267fdf6ed99b1831e4f90a7ee` (link)
#147814	btree: some cleanup with less unsafe	`485227becbf152ee23a412ecfda5358670a91cbb` (link)
#147843	Change the tidy license checker	`a0911e6586d3b23ae8ba9a3721db7093440ec75c` (link)

previous master: bd4a8004c2

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-10-20T19:51:32Z

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 bd4a800 (parent) -> 4068baf (this PR)

Test differences

Show 7 test diffs

Stage 1

[ui] tests/ui/error-emitter/trimmed_multiline_suggestion.rs: [missing] -> pass (J0)
[ui] tests/ui/inference/ambiguous-numeric-in-closure-ref.rs: [missing] -> pass (J0)

Stage 2

[ui] tests/ui/error-emitter/trimmed_multiline_suggestion.rs: [missing] -> pass (J1)
[ui] tests/ui/inference/ambiguous-numeric-in-closure-ref.rs: [missing] -> pass (J1)

Additionally, 3 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 4068bafedd8ba724e332a5221c06a6fa531a30d2 --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

aarch64-apple: 10779.3s -> 8196.4s (-24.0%)
i686-gnu-1: 7941.6s -> 9237.3s (16.3%)
x86_64-rust-for-linux: 2598.1s -> 2925.2s (12.6%)
x86_64-gnu-llvm-20-2: 5616.0s -> 6234.3s (11.0%)
x86_64-msvc-ext3: 7149.0s -> 6379.6s (-10.8%)
dist-ohos-aarch64: 4191.5s -> 4629.5s (10.5%)
dist-x86_64-apple: 7121.7s -> 6563.2s (-7.8%)
aarch64-msvc-1: 7020.2s -> 7528.1s (7.2%)
dist-apple-various: 3348.8s -> 3583.1s (7.0%)
x86_64-gnu-llvm-20-3: 6208.0s -> 6629.1s (6.8%)

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-10-20T20:59:49Z

Finished benchmarking commit (4068baf): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary -2.7%)

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)	-2.7%	[-3.7%, -2.2%]	3
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.7%	[-3.7%, -2.2%]	3

Cycles

Results (secondary 2.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)	2.0%	[2.0%, 2.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

Results (primary 0.1%, secondary 0.1%)

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

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

Bootstrap: 474.484s -> 472.36s (-0.45%)
Artifact size: 388.66 MiB -> 388.68 MiB (0.01%)

JohnTitor and others added 16 commits October 11, 2025 12:34

Improve error message for ambiguous numeric types in closure parameters

0eaa336

Fix suggestions for nested refs and muts

dbc7327

Add FIXME about FileName check's fragility

632e759

btree: some cleanup with less unsafe

7c95768

tidy: Add check that license exceptions are actually used

66c81a0

Add Apache-2.0 WITH LLVM-exception to list of allowed licenses

3621785

It is more permissive than Apache-2.0 which is already allowed.

Add a couple of licenses that are can be used as MIT, Apache-2.0 or a…

8510865

…s both

Add a separate licenses list for licenses that are fine in tools only

e7b9694

With this the only remaining license exceptions are for licenses that are to copyleft to varying degrees.

Minor change

6ab00ba

Fix typo

2ed1f47

Co-authored-by: Josh Triplett <josh@joshtriplett.org>

Deny all licenses that are not like MIT for the runtime libraries

dd70015

fix: Use untrimmed line numbers for trimmed suggestions

ad67c9d

Rollup merge of rust-lang#147577 - JohnTitor:issue-147312, r=davidtwco

5be6c6f

Improve error message for ambiguous numeric types in closure parameters Closes rust-lang#147312

Rollup merge of rust-lang#147814 - hkBst:btree-4, r=joboet

003feb4

btree: some cleanup with less unsafe

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 Oct 20, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 20, 2025

bors merged commit 4068baf into rust-lang:master Oct 20, 2025
12 checks passed

rustbot added this to the 1.92.0 milestone Oct 20, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 4 pull requests #147913

Rollup of 4 pull requests #147913

matthiaskrgr commented Oct 20, 2025 •

edited by rustbot

Loading

Uh oh!

matthiaskrgr commented Oct 20, 2025

Uh oh!

bors commented Oct 20, 2025

Uh oh!

bors commented Oct 20, 2025

Uh oh!

bors commented Oct 20, 2025

Uh oh!

Uh oh!

rust-timer commented Oct 20, 2025

Uh oh!

github-actions bot commented Oct 20, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Oct 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Rollup of 4 pull requests #147913

Rollup of 4 pull requests #147913

Conversation

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

Uh oh!

Uh oh!

matthiaskrgr commented Oct 20, 2025

Uh oh!

bors commented Oct 20, 2025

Uh oh!

bors commented Oct 20, 2025

Uh oh!

bors commented Oct 20, 2025

Uh oh!

Uh oh!

rust-timer commented Oct 20, 2025

Uh oh!

github-actions bot commented Oct 20, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Oct 20, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

matthiaskrgr commented Oct 20, 2025 •

edited by rustbot

Loading