Fix Error Messages for break Inside Coroutines
#124777
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
rustbot has assigned @compiler-errors. Use |
rustbot
added
S-waiting-on-review
compiler-errors
requested changes
May 5, 2024
rustbot
added
S-waiting-on-author
veera-sivarajan
force-pushed
the
bugfix-124495-identify-gen-block
branch
from
5f66961
to
9d2685e
Compare
|
@rustbot ready |
rustbot
added
S-waiting-on-review
compiler/rustc_passes/src/loops.rs
Outdated
| coroutine_span, | ||
| kind: hir::CoroutineDesugaring::Async, | ||
| source: hir::CoroutineSource::Block, | ||
| } => { |
There was a problem hiding this comment.
You can make this into a single match statement and do:
let source = match source {
...
};
let kind = match kind {
...
};
I also wonder if we should just get rid of the article "a"/"an" from the error message so that we don't need to put that into the fluent file... Seems kind of annoying to have to put that in there -- it's definitely not very translatable. 🤔
There was a problem hiding this comment.
Yeah, same. The of followed by the article makes it wordy.
Can I remove both of and the article to make it like cannot `break` inside `async` function in all places? It's concise and flows well.
There was a problem hiding this comment.
I guess that's fine, yes
|
@rustbot author r=me after changing the diagnostic one last time, thanks for dealing with the back-and-forth |
rustbot
added
S-waiting-on-author
Previously, `break` inside `gen` blocks and functions were incorrectly identified to be enclosed by a closure. This PR fixes it by displaying an appropriate error message for async blocks, async closures, async functions, gen blocks, gen closures, gen functions, async gen blocks, async gen closures and async gen functions. Note: gen closure and async gen closure are not supported by the compiler yet but I have added an error message here assuming that they might be implemented in the future. Also, fixes grammar in a few places by replacing `inside of a $coroutine` with `inside a $coroutine`.
veera-sivarajan
force-pushed
the
bugfix-124495-identify-gen-block
branch
from
9d2685e
to
21ccec0
Compare
|
Thanks @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 9, 2024
…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#124777 (Fix Error Messages for `break` Inside Coroutines) - rust-lang#124837 (Migrate `run-make/rustdoc-map-file` to rmake) - rust-lang#124875 (Fix more ICEs in `diagnostic::on_unimplemented`) - rust-lang#124908 (Handle field projections like slice indexing in invalid_reference_casting) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 9, 2024
Rollup merge of rust-lang#124777 - veera-sivarajan:bugfix-124495-identify-gen-block, r=compiler-errors Fix Error Messages for `break` Inside Coroutines Fixes rust-lang#124495 Previously, `break` inside `gen` blocks and functions were incorrectly identified to be enclosed by a closure. This PR fixes it by displaying an appropriate error message for async blocks, async closures, async functions, gen blocks, gen closures, gen functions, async gen blocks, async gen closures and async gen functions. Note: gen closure and async gen closure are not supported by the compiler yet but I have added an error message here assuming that they might be implemented in the future. ~~Also, fixes grammar in a few places by replacing `inside of a $coroutine` with `inside a $coroutine`.~~
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #124495
Previously,
breakinsidegenblocks and functionswere incorrectly identified to be enclosed by a closure.
This PR fixes it by displaying an appropriate error message
for async blocks, async closures, async functions, gen blocks,
gen closures, gen functions, async gen blocks, async gen closures
and async gen functions.
Note: gen closure and async gen closure are not supported by the
compiler yet but I have added an error message here assuming that
they might be implemented in the future.
Also, fixes grammar in a few places by replacing
inside of a $coroutinewithinside a $coroutine.