Suggest adding {} for 'label: non_block_expr
#97759
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
added
the
T-compiler
rust-highfive
added
the
S-waiting-on-review
WaffleLapkin
commented
Jun 5, 2022
Comment on lines
29
to
37
| help: consider enclosing expression in a block | ||
| | | ||
| LL ~ let _i = 'label: {match x { | ||
| LL | 0 => 42, | ||
| LL | 1 if false => break 'label 17, | ||
| LL | 1 => { | ||
| LL | if true { | ||
| LL | break 'label 13 | ||
| ... |
There was a problem hiding this comment.
Can someone explain where the second part of the suggestion (}) went?
There was a problem hiding this comment.
suggestions only render up to 5 lines i think
There was a problem hiding this comment.
I thought that it'd show multiple parts :(
There was a problem hiding this comment.
I think this is a bug in the rendering code. Your suggestion is still MachineApplicable so it will apply just fine, it's just the rendered code will be cut off.
I don't know if there's much you can do to fix it in this PR specifically, but maybe you could file a bug, or look into fixing the rendering code to omit lines in the middle?
There was a problem hiding this comment.
Sure, I'll look into it
There was a problem hiding this comment.
It's not a "bug", but rather a non-implementation of the logic for multiple "windows" into the code, like span labels have.
|
@rustbot label +A-diagnostics +A-suggestion-diagnostics |
rustbot
added
A-diagnostics
compiler-errors
approved these changes
Jun 5, 2022
| // Continue as an expression in an effort to recover on `'label: non_block_expr`. | ||
| self.parse_expr() | ||
| let expr = self.parse_expr().map(|expr| { |
There was a problem hiding this comment.
Can you actually use ? here, move the body of the closure to below, and remove the ? on line 1614?
There was a problem hiding this comment.
All other if branches also return Results, so I don't think it makes sense to do that
There was a problem hiding this comment.
Oh, oops, I thought there was only two if branches. I should've clicked the button to reveal the lines above 😓
Co-authored-by: Michael Goulet <michael@errs.io>
WaffleLapkin
force-pushed
the
recover_label_expr
branch
from
3cbe9ee to
4f85a73
Compare
|
Okay this looks good! Thanks for the contribution. @bors r+ |
|
📌 Commit 4f85a73 has been approved by |
bors
added
S-waiting-on-bors
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Jun 6, 2022
…compiler-errors
Suggest adding `{}` for `'label: non_block_expr`
Adds suggestions like this:
```text
help: consider enclosing expression in a block
|
3 | 'l {0};
| + +
```
inspired by rust-lang#48594 (comment)
r? `@compiler-errors`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 6, 2022
…askrgr Rollup of 7 pull requests Successful merges: - rust-lang#90905 (Add empty impl blocks if they have documentation) - rust-lang#97683 (Fail gracefully when encountering an HRTB in APIT. ) - rust-lang#97721 (Do `suggest_await_before_try` with infer variables in self, and clean up binders) - rust-lang#97752 (typo: `-Zcodegen-backend=llvm -Cpasses=list` should work now) - rust-lang#97759 (Suggest adding `{}` for `'label: non_block_expr`) - rust-lang#97764 (use strict provenance APIs) - rust-lang#97765 (Restore a test that was intended to test `as` cast to ptr) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Jun 15, 2022
…that_are_quite_far_away_from_each_other, r=estebank Hide irrelevant lines in suggestions to allow for suggestions that are far from each other to be shown This is an attempt to fix suggestions one part of which is 6 lines or more far from the first. I've noticed "the problem" (of not showing some parts of the suggestion) here: rust-lang#97759 (comment). I'm not sure about the implementation (this big closure is just bad and makes already complicated code even more so), but I want to at least discuss the result. Here is an example of how this changes the output: Before: ```text help: consider enclosing expression in a block | 3 ~ 'l: { match () { () => break 'l, 4 | 5 | 6 | 7 | 8 | ... ``` After: ```text help: consider enclosing expression in a block | 3 ~ 'l: { match () { () => break 'l, 4 | ... 31| 32~ } }; | ``` r? `@estebank` `@rustbot` label +A-diagnostics +A-suggestion-diagnostics
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Jun 17, 2022
…that_are_quite_far_away_from_each_other, r=estebank Hide irrelevant lines in suggestions to allow for suggestions that are far from each other to be shown This is an attempt to fix suggestions one part of which is 6 lines or more far from the first. I've noticed "the problem" (of not showing some parts of the suggestion) here: rust-lang#97759 (comment). I'm not sure about the implementation (this big closure is just bad and makes already complicated code even more so), but I want to at least discuss the result. Here is an example of how this changes the output: Before: ```text help: consider enclosing expression in a block | 3 ~ 'l: { match () { () => break 'l, 4 | 5 | 6 | 7 | 8 | ... ``` After: ```text help: consider enclosing expression in a block | 3 ~ 'l: { match () { () => break 'l, 4 | ... 31| 32~ } }; | ``` r? `@estebank` `@rustbot` label +A-diagnostics +A-suggestion-diagnostics
flip1995
pushed a commit
to flip1995/rust-clippy
that referenced
this pull request
Jun 30, 2022
…quite_far_away_from_each_other, r=estebank Hide irrelevant lines in suggestions to allow for suggestions that are far from each other to be shown This is an attempt to fix suggestions one part of which is 6 lines or more far from the first. I've noticed "the problem" (of not showing some parts of the suggestion) here: rust-lang/rust#97759 (comment). I'm not sure about the implementation (this big closure is just bad and makes already complicated code even more so), but I want to at least discuss the result. Here is an example of how this changes the output: Before: ```text help: consider enclosing expression in a block | 3 ~ 'l: { match () { () => break 'l, 4 | 5 | 6 | 7 | 8 | ... ``` After: ```text help: consider enclosing expression in a block | 3 ~ 'l: { match () { () => break 'l, 4 | ... 31| 32~ } }; | ``` r? `@estebank` `@rustbot` label +A-diagnostics +A-suggestion-diagnostics
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.
Adds suggestions like this:
inspired by #48594 (comment)
r? @compiler-errors