loop match: error on `#[const_continue]` outside `#[loop_match]` by folkertdev · Pull Request #143360 · rust-lang/rust

folkertdev · 2025-07-03T10:26:11Z

tracking issue #132306
fixes #143119
fixes #143165

Fixes several ICEs because a panic was reachable.

@rustbot label +F-loop_match

rustbot · 2025-07-03T10:26:16Z

rustbot has assigned @WaffleLapkin.
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

compiler/rustc_mir_build/src/builder/scope.rs

tests/ui/loop-match/const-continue-outside-loop-match.rs

WaffleLapkin · 2025-07-04T10:45:53Z

tests/ui/loop-match/invalid.rs

+                    #[const_continue]
+                    break State::A;
+                    //~^ ERROR unlabeled `break` inside of a labeled block
+                    //~| ERROR mismatched types


Where is mismatched types coming from?..

the break is seen as a break from the loop with a value, and it's the final expression, so that value is returned, but the function's type says it'll return unit.

can you fix the error so that the only errors here are the interesting ones? (e.g. by doing _ = loop {...};) or do you think this test is better with the type error?

folkertdev

Turns out there was a better way to do this at a much earlier stage. The logic now also properly handles shadowing labels (where the outer one is part of a loop_match but the inner one is not).

@rustbot ready

folkertdev · 2025-07-22T20:10:29Z

@WaffleLapkin is anything else needed here?

WaffleLapkin

Sorry for making you wait so long, I was on vacation ^^'

This looks mostly good, just a few nitpicks.

compiler/rustc_hir_typeck/src/loops.rs

WaffleLapkin · 2025-07-25T08:23:20Z

tests/ui/loop-match/invalid.rs

+                    #[const_continue]
+                    break State::A;
+                    //~^ ERROR unlabeled `break` inside of a labeled block
+                    //~| ERROR mismatched types


can you fix the error so that the only errors here are the interesting ones? (e.g. by doing _ = loop {...};) or do you think this test is better with the type error?

folkertdev · 2025-07-25T16:13:02Z

@rustbot ready

WaffleLapkin · 2025-07-31T17:15:41Z

@bors r+ rollup

bors · 2025-07-31T17:15:44Z

📌 Commit 7a2ab95 has been approved by WaffleLapkin

It is now in the queue for this repository.

bors · 2025-07-31T20:46:49Z

☔ The latest upstream changes (presumably #144740) made this pull request unmergeable. Please resolve the merge conflicts.

WaffleLapkin

r=me with green CI

folkertdev · 2025-08-01T09:02:41Z

@bors r=WaffleLapkin

bors · 2025-08-01T09:02:43Z

📌 Commit 040f71e has been approved by WaffleLapkin

It is now in the queue for this repository.

…loop-match, r=WaffleLapkin loop match: error on `#[const_continue]` outside `#[loop_match]` tracking issue rust-lang#132306 fixes rust-lang#143119 fixes rust-lang#143165 Fixes several ICEs because a panic was reachable. `@rustbot` label +F-loop_match

Rollup of 10 pull requests Successful merges: - #132748 (get rid of some false negatives in rustdoc::broken_intra_doc_links) - #135771 ([rustdoc] Add support for associated items in "jump to def" feature) - #143360 (loop match: error on `#[const_continue]` outside `#[loop_match]`) - #143662 ([rustdoc] Display unsafe attrs with edition 2024 `unsafe()` wrappers.) - #143900 ([rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition) - #144614 (Fortify RemoveUnneededDrops test.) - #144703 ([test][AIX] ignore extern_weak linkage test) - #144738 (Remove the omit_gdb_pretty_printer_section attribute) - #144756 (detect infinite recursion with tail calls in ctfe) - #144766 (Add human readable name "Cygwin") r? `@ghost` `@rustbot` modify labels: rollup

…loop-match, r=WaffleLapkin loop match: error on `#[const_continue]` outside `#[loop_match]` tracking issue rust-lang#132306 fixes rust-lang#143119 fixes rust-lang#143165 Fixes several ICEs because a panic was reachable. ``@rustbot`` label +F-loop_match

Rollup of 11 pull requests Successful merges: - #132748 (get rid of some false negatives in rustdoc::broken_intra_doc_links) - #135771 ([rustdoc] Add support for associated items in "jump to def" feature) - #143360 (loop match: error on `#[const_continue]` outside `#[loop_match]`) - #143662 ([rustdoc] Display unsafe attrs with edition 2024 `unsafe()` wrappers.) - #143900 ([rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition) - #144478 (Improve formatting of doc code blocks) - #144703 ([test][AIX] ignore extern_weak linkage test) - #144747 (compiletest: Improve diagnostics for line annotation mismatches 2) - #144756 (detect infinite recursion with tail calls in ctfe) - #144766 (Add human readable name "Cygwin") - #144782 (Properly pass path to staged `rustc` to `compiletest` self-tests) r? `@ghost` `@rustbot` modify labels: rollup

…loop-match, r=WaffleLapkin loop match: error on `#[const_continue]` outside `#[loop_match]` tracking issue rust-lang#132306 fixes rust-lang#143119 fixes rust-lang#143165 Fixes several ICEs because a panic was reachable. ```@rustbot``` label +F-loop_match

…loop-match, r=WaffleLapkin loop match: error on `#[const_continue]` outside `#[loop_match]` tracking issue rust-lang#132306 fixes rust-lang#143119 fixes rust-lang#143165 Fixes several ICEs because a panic was reachable. ````@rustbot```` label +F-loop_match

Rollup of 12 pull requests Successful merges: - #132748 (get rid of some false negatives in rustdoc::broken_intra_doc_links) - #135771 ([rustdoc] Add support for associated items in "jump to def" feature) - #143360 (loop match: error on `#[const_continue]` outside `#[loop_match]`) - #143662 ([rustdoc] Display unsafe attrs with edition 2024 `unsafe()` wrappers.) - #144478 (Improve formatting of doc code blocks) - #144703 ([test][AIX] ignore extern_weak linkage test) - #144747 (compiletest: Improve diagnostics for line annotation mismatches 2) - #144766 (Add human readable name "Cygwin") - #144782 (Properly pass path to staged `rustc` to `compiletest` self-tests) - #144786 (Cleanup the definition of `group_type`) - #144796 (Add my previous commit name to .mailmap) - #144797 (Update safety comment for new_unchecked in niche_types) r? `@ghost` `@rustbot` modify labels: rollup

…loop-match, r=WaffleLapkin loop match: error on `#[const_continue]` outside `#[loop_match]` tracking issue rust-lang#132306 fixes rust-lang#143119 fixes rust-lang#143165 Fixes several ICEs because a panic was reachable. `````@rustbot````` label +F-loop_match

Rollup of 18 pull requests Successful merges: - #132748 (get rid of some false negatives in rustdoc::broken_intra_doc_links) - #135771 ([rustdoc] Add support for associated items in "jump to def" feature) - #143360 (loop match: error on `#[const_continue]` outside `#[loop_match]`) - #143662 ([rustdoc] Display unsafe attrs with edition 2024 `unsafe()` wrappers.) - #143771 (Constify some more `Result` functions) - #143900 ([rustdoc] Correctly handle `should_panic` doctest attribute and fix `--no-run` test flag on the 2024 edition) - #144185 (Document guarantees of poisoning) - #144395 (update fortanix tests) - #144478 (Improve formatting of doc code blocks) - #144614 (Fortify RemoveUnneededDrops test.) - #144703 ([test][AIX] ignore extern_weak linkage test) - #144747 (compiletest: Improve diagnostics for line annotation mismatches 2) - #144756 (detect infinite recursion with tail calls in ctfe) - #144766 (Add human readable name "Cygwin") - #144782 (Properly pass path to staged `rustc` to `compiletest` self-tests) - #144786 (Cleanup the definition of `group_type`) - #144796 (Add my previous commit name to .mailmap) - #144797 (Update safety comment for new_unchecked in niche_types) Failed merges: - #144805 (compiletest: Preliminary cleanup of `ProcRes` printing/unwinding) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 17 pull requests Successful merges: - #132748 (get rid of some false negatives in rustdoc::broken_intra_doc_links) - #143360 (loop match: error on `#[const_continue]` outside `#[loop_match]`) - #143662 ([rustdoc] Display unsafe attrs with edition 2024 `unsafe()` wrappers.) - #143771 (Constify some more `Result` functions) - #144185 (Document guarantees of poisoning) - #144395 (update fortanix tests) - #144478 (Improve formatting of doc code blocks) - #144614 (Fortify RemoveUnneededDrops test.) - #144703 ([test][AIX] ignore extern_weak linkage test) - #144747 (compiletest: Improve diagnostics for line annotation mismatches 2) - #144756 (detect infinite recursion with tail calls in ctfe) - #144766 (Add human readable name "Cygwin") - #144782 (Properly pass path to staged `rustc` to `compiletest` self-tests) - #144786 (Cleanup the definition of `group_type`) - #144796 (Add my previous commit name to .mailmap) - #144797 (Update safety comment for new_unchecked in niche_types) - #144803 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #143360 - folkertdev:const-continue-outside-loop-match, r=WaffleLapkin loop match: error on `#[const_continue]` outside `#[loop_match]` tracking issue #132306 fixes #143119 fixes #143165 Fixes several ICEs because a panic was reachable. ``````@rustbot`````` label +F-loop_match

Rollup of 17 pull requests Successful merges: - rust-lang/rust#132748 (get rid of some false negatives in rustdoc::broken_intra_doc_links) - rust-lang/rust#143360 (loop match: error on `#[const_continue]` outside `#[loop_match]`) - rust-lang/rust#143662 ([rustdoc] Display unsafe attrs with edition 2024 `unsafe()` wrappers.) - rust-lang/rust#143771 (Constify some more `Result` functions) - rust-lang/rust#144185 (Document guarantees of poisoning) - rust-lang/rust#144395 (update fortanix tests) - rust-lang/rust#144478 (Improve formatting of doc code blocks) - rust-lang/rust#144614 (Fortify RemoveUnneededDrops test.) - rust-lang/rust#144703 ([test][AIX] ignore extern_weak linkage test) - rust-lang/rust#144747 (compiletest: Improve diagnostics for line annotation mismatches 2) - rust-lang/rust#144756 (detect infinite recursion with tail calls in ctfe) - rust-lang/rust#144766 (Add human readable name "Cygwin") - rust-lang/rust#144782 (Properly pass path to staged `rustc` to `compiletest` self-tests) - rust-lang/rust#144786 (Cleanup the definition of `group_type`) - rust-lang/rust#144796 (Add my previous commit name to .mailmap) - rust-lang/rust#144797 (Update safety comment for new_unchecked in niche_types) - rust-lang/rust#144803 (rustc-dev-guide subtree update) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned WaffleLapkin Jul 3, 2025

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. F-loop_match when you match up with someone and they really throw you for a loop labels Jul 3, 2025

WaffleLapkin requested changes Jul 4, 2025

View reviewed changes

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 Jul 4, 2025

folkertdev force-pushed the const-continue-outside-loop-match branch 2 times, most recently from 771373e to 7d0caef Compare July 4, 2025 17:51

folkertdev commented Jul 4, 2025

View reviewed changes

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 Jul 4, 2025

WaffleLapkin reviewed Jul 25, 2025

View reviewed changes

WaffleLapkin 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 Jul 25, 2025

folkertdev force-pushed the const-continue-outside-loop-match branch from 7d0caef to 3686dcc Compare July 25, 2025 13:17

This comment was marked as outdated.

Sign in to view

folkertdev force-pushed the const-continue-outside-loop-match branch from 3686dcc to 7a2ab95 Compare July 25, 2025 13:19

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 Jul 25, 2025

WaffleLapkin approved these changes Jul 31, 2025

View reviewed changes

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 Jul 31, 2025

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 31, 2025

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 31, 2025

loop match: error on #[const_continue] outside #[loop_match]

040f71e

folkertdev force-pushed the const-continue-outside-loop-match branch from 7a2ab95 to 040f71e Compare July 31, 2025 22:29

WaffleLapkin approved these changes Jul 31, 2025

View reviewed changes

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 1, 2025

GuillaumeGomez mentioned this pull request Aug 1, 2025

Rollup of 10 pull requests #144784

Closed

GuillaumeGomez mentioned this pull request Aug 1, 2025

Rollup of 11 pull requests #144791

Closed

GuillaumeGomez mentioned this pull request Aug 1, 2025

Rollup of 12 pull requests #144799

Closed

samueltardieu mentioned this pull request Aug 2, 2025

Rollup of 18 pull requests #144810

Closed

samueltardieu mentioned this pull request Aug 2, 2025

Rollup of 17 pull requests #144814

Merged

bors merged commit 93917ea into rust-lang:master Aug 3, 2025
10 checks passed

rustbot added this to the 1.90.0 milestone Aug 3, 2025

cuviper modified the milestones: 1.90.0, 1.91.0 Oct 23, 2025

Uh oh!

Conversation

folkertdev commented Jul 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 3, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

WaffleLapkin Jul 4, 2025

Choose a reason for hiding this comment

Uh oh!

folkertdev Jul 4, 2025

Choose a reason for hiding this comment

Uh oh!

WaffleLapkin Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

folkertdev left a comment

Choose a reason for hiding this comment

Uh oh!

folkertdev commented Jul 22, 2025

Uh oh!

WaffleLapkin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

WaffleLapkin Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

This comment was marked as outdated.

folkertdev commented Jul 25, 2025

Uh oh!

WaffleLapkin commented Jul 31, 2025

Uh oh!

bors commented Jul 31, 2025

Uh oh!

bors commented Jul 31, 2025

Uh oh!

WaffleLapkin left a comment

Choose a reason for hiding this comment

Uh oh!

folkertdev commented Aug 1, 2025

Uh oh!

bors commented Aug 1, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Comments

folkertdev commented Jul 3, 2025 •

edited

Loading