Skip to content

Fix some loop block coercion diagnostics #150872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
rust-bors merged 2 commits into from
Jan 11, 2026
Merged

Fix some loop block coercion diagnostics #150872

rust-bors merged 2 commits into from
Jan 11, 2026

Conversation

@eggyal
Copy link
Contributor

@eggyal eggyal commented Jan 9, 2026 •
edited by rustbot
Loading

Fixes #150850

@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. labels Jan 9, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 9, 2026

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

dianne
dianne reviewed Jan 10, 2026
View reviewed changes
@dianne
Copy link
Contributor

dianne commented Jan 10, 2026

r? dianne
@rustbot author

@rustbot rustbot assigned dianne and unassigned jieyouxu Jan 10, 2026
@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 10, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 10, 2026

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@eggyal
Copy link
Contributor Author

eggyal commented Jan 10, 2026

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 10, 2026
dianne
dianne approved these changes Jan 10, 2026
View reviewed changes
Copy link
Contributor

@dianne dianne left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've left a reply clarifying what I meant about the incomplete comment. Apart from that and a small style thing, this looks good to me. @rustbot author

View changes since this review

@rustbot rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 10, 2026
eggyal added 2 commits January 10, 2026 03:55
@eggyal
Don't special-case while block type mismatch
7c7cf45 
67ea84d erroneously added this special-case when introducing `DesugaringKind::WhileLoop`.
It had the unintended effect of emitting erroneous diagnostics in certain `while` blocks.
@eggyal
Don't suggest breaking with value from for or while loops
5674be2
@eggyal
Copy link
Contributor Author

eggyal commented Jan 10, 2026

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 10, 2026
@dianne
Copy link
Contributor

dianne commented Jan 10, 2026

@bors r+ rollup

@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 10, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 10, 2026

📌 Commit 5674be2 has been approved by dianne

It is now in the queue for this repository.

@matthiaskrgr matthiaskrgr mentioned this pull request Jan 10, 2026
Merged
rust-bors bot added a commit that referenced this pull request Jan 10, 2026
@rust-bors
Auto merge of #150912 - matthiaskrgr:rollup-SHXgjYS, r=matthiaskrgr
3e7bfbe 
Rollup of 11 pull requests

Successful merges:

 - #150269 (Remove inactive nvptx maintainer)
 - #150713 (mgca: Type-check fields of struct expr const args)
 - #150765 (rustc_parse_format: improve error for missing `:` before `?` in format args)
 - #150847 (Fix broken documentation links to SipHash)
 - #150867 (rustdoc_json: Remove one call to `std::mem::take` in `after_krate`)
 - #150872 (Fix some loop block coercion diagnostics)
 - #150874 (Ignore `rustc-src-gpl` in fast try builds)
 - #150875 (Refactor artifact keep mode in bootstrap)
 - #150876 (Mention that `rustc_codegen_gcc` is a subtree in `rustc-dev-guide`)
 - #150882 (Supress unused_parens lint for guard patterns)
 - #150884 (Update bors email in CI postprocessing step)

Failed merges:

 - #150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple)

r? @ghost
rust-bors bot added a commit that referenced this pull request Jan 10, 2026
@rust-bors
Auto merge of #150912 - matthiaskrgr:rollup-SHXgjYS, r=matthiaskrgr
ad04f76 
Rollup of 11 pull requests

Successful merges:

 - #150269 (Remove inactive nvptx maintainer)
 - #150713 (mgca: Type-check fields of struct expr const args)
 - #150765 (rustc_parse_format: improve error for missing `:` before `?` in format args)
 - #150847 (Fix broken documentation links to SipHash)
 - #150867 (rustdoc_json: Remove one call to `std::mem::take` in `after_krate`)
 - #150872 (Fix some loop block coercion diagnostics)
 - #150874 (Ignore `rustc-src-gpl` in fast try builds)
 - #150875 (Refactor artifact keep mode in bootstrap)
 - #150876 (Mention that `rustc_codegen_gcc` is a subtree in `rustc-dev-guide`)
 - #150882 (Supress unused_parens lint for guard patterns)
 - #150884 (Update bors email in CI postprocessing step)

Failed merges:

 - #150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple)

r? @ghost
@rust-bors rust-bors bot merged commit 86806ab into rust-lang:main Jan 11, 2026
11 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Jan 11, 2026
rust-timer added a commit that referenced this pull request Jan 11, 2026
@rust-timer
Unrolled build for #150872
915b4eb 
Rollup merge of #150872 - issue-150850, r=dianne

Fix some loop block coercion diagnostics

Fixes #150850
@eggyal eggyal deleted the issue-150850 branch January 11, 2026 03:10
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jan 12, 2026
@rust-bors
Auto merge of #150912 - matthiaskrgr:rollup-SHXgjYS, r=matthiaskrgr
ae5bfc7 
Rollup of 11 pull requests

Successful merges:

 - rust-lang/rust#150269 (Remove inactive nvptx maintainer)
 - rust-lang/rust#150713 (mgca: Type-check fields of struct expr const args)
 - rust-lang/rust#150765 (rustc_parse_format: improve error for missing `:` before `?` in format args)
 - rust-lang/rust#150847 (Fix broken documentation links to SipHash)
 - rust-lang/rust#150867 (rustdoc_json: Remove one call to `std::mem::take` in `after_krate`)
 - rust-lang/rust#150872 (Fix some loop block coercion diagnostics)
 - rust-lang/rust#150874 (Ignore `rustc-src-gpl` in fast try builds)
 - rust-lang/rust#150875 (Refactor artifact keep mode in bootstrap)
 - rust-lang/rust#150876 (Mention that `rustc_codegen_gcc` is a subtree in `rustc-dev-guide`)
 - rust-lang/rust#150882 (Supress unused_parens lint for guard patterns)
 - rust-lang/rust#150884 (Update bors email in CI postprocessing step)

Failed merges:

 - rust-lang/rust#150869 (Emit error instead of delayed bug when meeting mismatch type for const tuple)

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

Reviewers

@dianne dianne dianne approved these changes

Assignees

@dianne dianne

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

Rustc suggest break with value inside while

4 participants

@eggyal @rustbot @dianne @jieyouxu