Skip to content

Rollup of 3 pull requests - #164125

Closed
JonathanBrouwer wants to merge 6 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sf3PFCj
Closed

JonathanBrouwer wants to merge 6 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-Sf3PFCj

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

Hamdan-Khan and others added 6 commits September 30, 2026 22:12
…match

fixed misleading suggestions of adding a return and semicolon expression to an expression already in return position by adding a return position check.

fixed duplicate emission of error 277 by de-duplicateing the suggestion `suggest_missing_break_or_return_expr`, where a failed normalization leads to E277
```
help: there is a method `bag` with a similar name, but with different arguments
  --> $DIR/suggest-methods.rs:9:5
   |
LL | trait FooT {
LL |     fn bag(&self);
   |     ^^^^^^^^^^^^^^
```
Co-authored-by: adwin <52573298+adwinwhite@users.noreply.github.com>
…ackh726

[tiny] Show trait span for associated item with similar name

```
help: there is a method `bag` with a similar name, but with different arguments
  --> $DIR/suggest-methods.rs:9:5
   |
LL | trait FooT {
LL |     fn bag(&self);
   |     ^^^^^^^^^^^^^^
```
…iagnostics, r=mejrs

fix misleading diagnostics and improve diagnostics of return type mismatch

Fix misleading diagnostics and improve diagnostics of return type mismatch

- Fixed misleading suggestions of adding a return and semicolon expression to an expression already in return position by adding a return position check.

- Fixed duplicate emission of error 277 by de-duplicateing the suggestion `suggest_missing_break_or_return_expr`, where a failed normalization leads to E277

fixes:  rust-lang#162271
…hite

set aliases in closure error bodies to rigid with next-solver

We already do this in the `DefKind::Closure` arm of `construct_fn`, and not doing so would cause us to ICE, such as in the test.

r? project-trait-system-refactor
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Oct 10, 2026
@rustbot 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Oct 10, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5 force

@rust-bors

rust-bors Bot commented Oct 10, 2026

Copy link
Copy Markdown
Contributor

📌 Commit b6a4a13 has been approved by JonathanBrouwer

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 Oct 10, 2026
rust-bors Bot pushed a commit that referenced this pull request Oct 10, 2026
…uwer

Rollup of 3 pull requests

Successful merges:

 - #163999 ([tiny] Show trait span for associated item with similar name)
 - #162926 (fix misleading diagnostics and improve diagnostics of return type mismatch)
 - #164075 (set aliases in closure error bodies to rigid with next-solver)
@rust-bors

rust-bors Bot commented Oct 10, 2026 •

Copy link
Copy Markdown
Contributor

⌛ Testing commit b6a4a13 with merge 7eea2cf...

Workflow: https://github.com/rust-lang/rust/actions/runs/38090280784

@jhpratt

jhpratt commented Oct 11, 2026

Copy link
Copy Markdown
Member

Stalled. Closing for an encompassing rollup.

@jhpratt jhpratt closed this Oct 11, 2026
@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 11, 2026
@rust-bors

rust-bors Bot commented Oct 11, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

Auto build was cancelled due to the PR being closed. Cancelled workflows:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants