Rollup of 6 pull requests by matthiaskrgr · Pull Request #148178 · rust-lang/rust

matthiaskrgr · 2025-10-27T16:22:49Z

Successful merges:

Rework unsizing coercions in the new solver #147840 (Rework unsizing coercions in the new solver)
Add coverage scope for controlling paths in code coverage #148139 (Add coverage scope for controlling paths in code coverage)
Add a mailmap entry #148154 (Add a mailmap entry)
ci: loongarch64: use medium code model to avoid relocation overflows #148158 (ci: loongarch64: use medium code model to avoid relocation overflows)
rustc-dev-guide subtree update #148172 (rustc-dev-guide subtree update)
Fix typos: duplicate words in comments #148175 (Fix typos: duplicate words in comments)

r? @ghost
@rustbot modify labels: rollup

One can use unstable features on stable too, like via an env var

This updates the rust-version file to 4068baf.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 4068baf Filtered ref: da574cbe2d3bcda451b7508b65e82de837b9c92d Upstream diff: rust-lang/rust@4fa824b...4068baf This merge was created using https://github.com/rust-lang/josh-sync.

Rustc pull update

the previous command already builds using in-tree std

Add the gpu version of the kernel which was missing in the docs

I accidentally commited some things with my name/email swapped ^^'

The LoongArch C/C++ cross toolchain defaults to the `normal` code model, which can cause relocation overflows when linking LLVM after upgrading to verion 22. This change uses the `medium`code model for `loongarch64-linux-gnu` and `loongarch64-linux-musl` builds to avoid these linking errors.

This updates the rust-version file to b1b464d.

Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: b1b464d Filtered ref: f94cd4e7de0695f11c7f0bf0d33bb39ce736c581 Upstream diff: rust-lang/rust@4068baf...b1b464d This merge was created using https://github.com/rust-lang/josh-sync.

remove untrue/contentious statement

Rustc pull update

- Fix 'the the' → 'the' in rustc_const_eval - Fix 'wether' → 'whether' in compiletest - Fix 'is is' → 'is' in rustc_ast_pretty (2 instances) Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>

…=lcnr Rework unsizing coercions in the new solver Replaces rust-lang#141926, contains: - a commit adding tests that fail before this work - the two commits from the previous PR - a commit in which these tests are fixed - finally, a fixup for an in my opinion rather large regression in diagnostics. It's still not perfect, but better? I hope this is roughly what you had in mind Fixesrust-lang/trait-system-refactor-initiative#241 and rust-lang/trait-system-refactor-initiative#238, adding tests for both r? `@lcnr`

Add `coverage` scope for controlling paths in code coverage This PR adds a `coverage` scope (for `-Zremap-path-scope`) for controlling if the paths that ends up in code coverage output should be remapped or not. Currently code coverage use the `macro` scope which is not a appropriate scope for them. Found during the stabilization of `-Zremap-path-scope` rust-lang#147611 (comment) and was asked to be in a separate PR in rust-lang#147611 (comment). r? compiler

…fleLapkin Add a mailmap entry I accidentally commited some things with my name/email swapped ^^'

ci: loongarch64: use medium code model to avoid relocation overflows The LoongArch C/C++ cross toolchain defaults to the `normal` code model, which can cause relocation overflows when linking LLVM after upgrading to verion 22. This change uses the `medium`code model for `loongarch64-linux-gnu` and `loongarch64-linux-musl` builds to avoid these linking errors.

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

…ds, r=lcnr Fix typos: duplicate words in comments - Fix 'the the' → 'the' in rustc_const_eval - Fix 'wether' → 'whether' in compiletest - Fix 'is is' → 'is' in rustc_ast_pretty (2 instances)

bors · 2025-10-28T01:47:39Z

⌛ Testing commit c315850 with merge c829707...

Rollup of 6 pull requests Successful merges: - #147840 (Rework unsizing coercions in the new solver) - #148139 (Add `coverage` scope for controlling paths in code coverage) - #148154 (Add a mailmap entry) - #148158 (ci: loongarch64: use medium code model to avoid relocation overflows) - #148172 (rustc-dev-guide subtree update) - #148175 (Fix typos: duplicate words in comments) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2025-10-28T03:00:16Z

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

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

bors · 2025-10-28T03:00:51Z

💔 Test failed - checks-actions

Zalathar · 2025-10-28T03:13:36Z

The failure message doesn't say what actually went wrong (the search-result-display.goml warning isn't new), and I don't see any PR in this rollup that could plausibly cause the problem, so for now I'm going to assume this was runner flakiness. We can dig deeper if it happens again.

matthiaskrgr · 2025-10-28T03:15:38Z

@bors retry

yeh looks spurious, no rustdoc chanpes in here

Zalathar · 2025-10-28T03:20:14Z

Is there any reason to retry this rollup instead of going with #148195?

matthiaskrgr · 2025-10-28T03:26:10Z

idk why you closed this? seems fine to just retry, as usual in such cases? :)

Zalathar · 2025-10-28T03:35:54Z

Well, I don't see any particular reason to keep retrying this old/small rollup, especially since it apparently forgot to include a pre-existing rollup=iffy for no reason I can see. Better to just roll up everything.

matthiaskrgr · 2025-10-28T04:01:51Z

Huh, if it was fine to roll up wouldn't it be an always instead of an iffy?

Can you elaborate on the "better" part? If no pr can be merged until every single failure has been identified, how is that better?
Seems to me like that would just unnecessarily stall things.

Zalathar · 2025-10-28T05:25:10Z

Excluding PRs from rollup hurts overall latency by more than it helps the included PRs.

Most PRs succeed. Excluding good PRs from rollup hurts the merge latency of those PRs, for no corresponding gain.

Even if an excluded PR would fail, excluding it still hurts overall merge latency. The PR author has to wait longer before finding out what went wrong, and when that PR does eventually fail it will hurt the latency of other rolled-up PRs anyway.

Zalathar · 2025-10-28T05:26:13Z

Meanwhile, deliberately excluding rollup=iffy PRs for hours or days (not an uncommon occurrence, sadly) is deeply unfair to those PRs, and mostly just encourages reviewers to lie about rollup status.

bors · 2025-10-28T13:22:27Z

⌛ Testing commit c315850 with merge e964b00...

Rollup of 6 pull requests Successful merges: - #147840 (Rework unsizing coercions in the new solver) - #148139 (Add `coverage` scope for controlling paths in code coverage) - #148154 (Add a mailmap entry) - #148158 (ci: loongarch64: use medium code model to avoid relocation overflows) - #148172 (rustc-dev-guide subtree update) - #148175 (Fix typos: duplicate words in comments) r? `@ghost` `@rustbot` modify labels: rollup

Zalathar · 2025-10-28T13:24:33Z

Bors, these PRs have already been merged.

@bors r- retry

tshepangand others added 30 commits September 8, 2025 06:12

remove untrue/contentious statement
39628ff
One can use unstable features on stable too, like via an env var

restore helpful explanation
1eb80f1

add tests for unsizing coercions (both ICE)
491554d

Rename nit
14a2770

Rework unsizing coercions in new solver
5689477

Prepare for merging from rust-lang/rust
5765a82
This updates the rust-version file to 4068baf.

Merge pull requestrust-lang#2614from rust-lang/rustc-pull
f036a30
Rustc pull update

how-to-build-and-run.md: remove stray instructions
b0545d6
the previous command already builds using in-tree std

Add the gpu version of the kernel which was missing in the docs
8badb14

Merge pull requestrust-lang#2616from rust-lang/gpu-example-update
bfbe728
Add the gpu version of the kernel which was missing in the docs

Merge pull requestrust-lang#2615from rust-lang/tshepang-patch-2
ee978d2

add a mailmap entry
9503981
I accidentally commited some things with my name/email swapped ^^'

Prepare for merging from rust-lang/rust
b12f711
This updates the rust-version file to b1b464d.

move old solver coercion code to separate function
349dbec

prove both newly added tests are fixed by the changes
3d9cb04

find the right error source when we can't unsize
1756622

Add coverage scope for controlling paths in code coverage
94c893e

improve and strengthen wording
943074f

Merge pull requestrust-lang#2583from rust-lang/tshepang-patch-4
58d2f03
remove untrue/contentious statement

Merge pull requestrust-lang#2617from rust-lang/rustc-pull
044bc7a
Rustc pull update

Fix typos: duplicate words in comments
bf6f303
- Fix 'the the' → 'the' in rustc_const_eval - Fix 'wether' → 'whether' in compiletest - Fix 'is is' → 'is' in rustc_ast_pretty (2 instances) Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>

Rollup merge ofrust-lang#148154- WaffleLapkin:mail-and-ename, r=Waf…
7d9112c
…fleLapkin Add a mailmap entry I accidentally commited some things with my name/email swapped ^^'

Rollup merge ofrust-lang#148172- tshepang:rdg-sync, r=tshepang
5722ded
rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@b9fb8e9. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`

Rollup merge ofrust-lang#148175- osamakader:fix-typos-duplicate-wor…
c315850
…ds, r=lcnr Fix typos: duplicate words in comments - Fix 'the the' → 'the' in rustc_const_eval - Fix 'wether' → 'whether' in compiletest - Fix 'is is' → 'is' in rustc_ast_pretty (2 instances)

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

bors 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 Oct 28, 2025

Zalathar closed this Oct 28, 2025

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 28, 2025

matthiaskrgr reopened this Oct 28, 2025

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 28, 2025

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

JonathanBrouwer closed this Oct 29, 2025

Uh oh!

Uh oh!

Conversation

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

Uh oh!

Uh oh!

bors commented Oct 28, 2025

Uh oh!

rust-log-analyzer commented Oct 28, 2025

Uh oh!

bors commented Oct 28, 2025

Uh oh!

Zalathar commented Oct 28, 2025

Uh oh!

matthiaskrgr commented Oct 28, 2025

Uh oh!

Zalathar commented Oct 28, 2025

Uh oh!

matthiaskrgr commented Oct 28, 2025

Uh oh!

Zalathar commented Oct 28, 2025

Uh oh!

matthiaskrgr commented Oct 28, 2025

Uh oh!

Zalathar commented Oct 28, 2025

Uh oh!

Zalathar commented Oct 28, 2025

Uh oh!

bors commented Oct 28, 2025

Uh oh!

Zalathar commented Oct 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

matthiaskrgr commented Oct 27, 2025•
edited by rustbot
Loading