Skip to content

Rollup of 2 pull requests#151193

Merged
rust-bors[bot] merged 4 commits intorust-lang:mainfrom
matthiaskrgr:rollup-17r4zye
Jan 16, 2026
Merged

Rollup of 2 pull requests#151193
rust-bors[bot] merged 4 commits intorust-lang:mainfrom
matthiaskrgr:rollup-17r4zye

Conversation

@matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jan 16, 2026

Successful merges:

r? @ghost

Create a similar rollup

ShoyuVanilla and others added 4 commits January 16, 2026 00:35
@ShoyuVanilla
fix: Do not delay E0107 when there exists an assoc ty with the same name
08362d3
@jieyouxu
Disable dump-ice-to-disk on i686-pc-windows-msvc
8dfb888 
Sometimes the middle frames of the ICE backtrace becomes `<unknown>` on
`i686-pc-windows-msvc` which then makes this test flaky.
@matthiaskrgr
Rollup merge of rust-lang#151166 - issue-148121, r=tiif
0cfe78f 
fix: Do not delay E0107 when there exists an assoc ty with the same name

Fixes rust-lang#148121

When we have the following code:

```rust
trait Foo<T> {}

impl Foo<T: Default> for String {}
```

we delay `E0107: wrong number of generic args` to suggest moving `T: Default` bound to the impl block's param declaration.

The delay is determined by whether all the missing generic parameters are mentioned by those *wrong* assoc item constraints.

But this delay is wrong when there exist any *correct* assoc item constraints, i.e. when we have an assoc type whose identifier is same with a missing generic parameter like in the following code:

```rust
pub trait Super<X> {
    type X;
}
pub trait A {}
impl A for dyn Super<X = ()> {}
```
@matthiaskrgr
Rollup merge of rust-lang#151185 - disable-dump-ice-i686, r=dianqk
6e49b64 
Disable `dump-ice-to-disk` on `i686-pc-windows-msvc`

Sometimes the middle frames of the ICE backtrace becomes `<unknown>` on `i686-pc-windows-msvc` which then makes this test flaky. Noticed in rust-lang#150925 (comment).

Originally expanded in rust-lang#142563 to see if it's still flaky for other `*-windows-*` targets, unfortunately the answer is yes for `i686-pc-windows-msvc` as well.

r? @dianqk (or compiler or anyone really)
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Jan 16, 2026
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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. labels Jan 16, 2026
@matthiaskrgr
Copy link
Member Author

matthiaskrgr commented Jan 16, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 16, 2026

📌 Commit 6e49b64 has been approved by matthiaskrgr

It is now in the queue for this repository.

@rust-bors 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 Jan 16, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors 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 Jan 16, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 16, 2026

☀️ Test successful - CI
Approved by: matthiaskrgr
Pushing c40c51f to main...

@rust-bors rust-bors bot merged commit c40c51f into rust-lang:main Jan 16, 2026
12 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Jan 16, 2026
@rust-timer
Copy link
Collaborator

rust-timer commented Jan 16, 2026

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#151166 fix: Do not delay E0107 when there exists an assoc ty with … c59eed00e84111ab4adf7641c122a98a8e008a06 (link)
#151185 Disable dump-ice-to-disk on i686-pc-windows-msvc 04e4332a5b645791b68a9753aa44a7d1defc4562 (link)

previous master: d2015e2359

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
Copy link
Contributor

github-actions bot commented Jan 16, 2026

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 d2015e2 (parent) -> c40c51f (this PR)

Test differences

Show 6 test diffs

Stage 1

  • [ui] tests/ui/traits/associated_type_bound/assoc-type-bounds-with-the-same-name-with-lacking-generic-arg-148121.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/traits/associated_type_bound/assoc-type-bounds-with-the-same-name-with-lacking-generic-arg-148121.rs: [missing] -> pass (J1)
  • [run-make] tests/run-make/dump-ice-to-disk: pass -> ignore (ignored when the target is i686-pc-windows-msvc ((sometimes partial backtrace becomes <unknown>))) (J2)

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 c40c51f9fdfa90b9c91c1601ec1442225c6b5c36 --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

  1. aarch64-apple: 11105.6s -> 7730.0s (-30.4%)
  2. dist-aarch64-apple: 8776.2s -> 7295.1s (-16.9%)
  3. i686-gnu-nopt-2: 7183.3s -> 8166.6s (+13.7%)
  4. test-various: 6950.9s -> 7827.3s (+12.6%)
  5. dist-ohos-x86_64: 4729.0s -> 4175.8s (-11.7%)
  6. dist-apple-various: 4264.0s -> 3779.7s (-11.4%)
  7. armhf-gnu: 4694.5s -> 5217.8s (+11.1%)
  8. x86_64-gnu-llvm-20-1: 3780.8s -> 4201.3s (+11.1%)
  9. dist-riscv64-linux: 5422.0s -> 4865.4s (-10.3%)
  10. dist-arm-linux-gnueabi: 5428.6s -> 4875.8s (-10.2%)
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
Copy link
Collaborator

rust-timer commented Jan 16, 2026

Finished benchmarking commit (c40c51f): 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 -3.5%)

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

Cycles

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

Binary size

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

Bootstrap: 471.749s -> 474.646s (0.61%)
Artifact size: 383.62 MiB -> 383.59 MiB (-0.01%)

@github-actions github-actions bot mentioned this pull request Jan 28, 2026
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-run-make Area: port run-make Makefiles to rmake.rs merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.94.0

Development

Successfully merging this pull request may close these issues.

5 participants

@matthiaskrgr @rust-timer @rustbot @ShoyuVanilla @jieyouxu