diff options
| author | Maybe Waffle <waffle.lapkin@gmail.com> | 2022-06-05 23:12:51 +0400 |
|---|---|---|
| committer | Maybe Waffle <waffle.lapkin@gmail.com> | 2022-06-05 23:12:51 +0400 |
| commit | c6e5bb32fbb3d0a85189e56086726c183f68ad0c (patch) | |
| tree | ea543b569b0b10c7348d15fe3a53696b65ef7ff3 /src | |
| parent | f21c0a274ebfb35612359e32bee965afb09640d6 (diff) | |
| download | rust-c6e5bb32fbb3d0a85189e56086726c183f68ad0c.tar.gz rust-c6e5bb32fbb3d0a85189e56086726c183f68ad0c.zip | |
Do not suggest adding labeled block if there are no labeled breaks
Diffstat (limited to 'src')
4 files changed, 10 insertions, 24 deletions
diff --git a/src/test/ui/parser/labeled-no-colon-expr.stderr b/src/test/ui/parser/labeled-no-colon-expr.stderr index 4d0d9c4a00b..26884dc5d74 100644 --- a/src/test/ui/parser/labeled-no-colon-expr.stderr +++ b/src/test/ui/parser/labeled-no-colon-expr.stderr @@ -47,11 +47,6 @@ error: expected `while`, `for`, `loop` or `{` after a label | LL | 'l4 0; | ^ expected `while`, `for`, `loop` or `{` after a label - | -help: consider enclosing expression in a block - | -LL | 'l4 {0}; - | + + error: labeled expression must be followed by `:` --> $DIR/labeled-no-colon-expr.rs:8:9 diff --git a/src/test/ui/parser/recover-labeled-non-block-expr.fixed b/src/test/ui/parser/recover-labeled-non-block-expr.fixed index dbe2f2e0bdd..aabda4a67a1 100644 --- a/src/test/ui/parser/recover-labeled-non-block-expr.fixed +++ b/src/test/ui/parser/recover-labeled-non-block-expr.fixed @@ -1,8 +1,9 @@ // run-rustfix #![feature(label_break_value)] fn main() { - #[allow(unused_labels)] - 'label: {1 + 1}; //~ ERROR expected `while`, `for`, `loop` or `{` after a label + // FIXME(waffle): add this back + // #[allow(unused_labels)] + // 'label: 1 + 1; // ERROR expected `while`, `for`, `loop` or `{` after a label 'label: {match () { () => break 'label, }}; //~ ERROR expected `while`, `for`, `loop` or `{` after a label diff --git a/src/test/ui/parser/recover-labeled-non-block-expr.rs b/src/test/ui/parser/recover-labeled-non-block-expr.rs index 9c22c073712..9244acabc26 100644 --- a/src/test/ui/parser/recover-labeled-non-block-expr.rs +++ b/src/test/ui/parser/recover-labeled-non-block-expr.rs @@ -1,8 +1,9 @@ // run-rustfix #![feature(label_break_value)] fn main() { - #[allow(unused_labels)] - 'label: 1 + 1; //~ ERROR expected `while`, `for`, `loop` or `{` after a label + // FIXME(waffle): add this back + // #[allow(unused_labels)] + // 'label: 1 + 1; // ERROR expected `while`, `for`, `loop` or `{` after a label 'label: match () { () => break 'label, }; //~ ERROR expected `while`, `for`, `loop` or `{` after a label diff --git a/src/test/ui/parser/recover-labeled-non-block-expr.stderr b/src/test/ui/parser/recover-labeled-non-block-expr.stderr index 2e4e45d6171..37843141ef3 100644 --- a/src/test/ui/parser/recover-labeled-non-block-expr.stderr +++ b/src/test/ui/parser/recover-labeled-non-block-expr.stderr @@ -1,16 +1,5 @@ error: expected `while`, `for`, `loop` or `{` after a label - --> $DIR/recover-labeled-non-block-expr.rs:5:13 - | -LL | 'label: 1 + 1; - | ^ expected `while`, `for`, `loop` or `{` after a label - | -help: consider enclosing expression in a block - | -LL | 'label: {1 + 1}; - | + + - -error: expected `while`, `for`, `loop` or `{` after a label - --> $DIR/recover-labeled-non-block-expr.rs:7:13 + --> $DIR/recover-labeled-non-block-expr.rs:8:13 | LL | 'label: match () { () => break 'label, }; | ^^^^^ expected `while`, `for`, `loop` or `{` after a label @@ -21,7 +10,7 @@ LL | 'label: {match () { () => break 'label, }}; | + + error: expected `while`, `for`, `loop` or `{` after a label - --> $DIR/recover-labeled-non-block-expr.rs:10:22 + --> $DIR/recover-labeled-non-block-expr.rs:11:22 | LL | let _i = 'label: match x { | ^^^^^ expected `while`, `for`, `loop` or `{` after a label @@ -37,7 +26,7 @@ LL | break 'label 13 ... error: expected `while`, `for`, `loop` or `{` after a label - --> $DIR/recover-labeled-non-block-expr.rs:24:24 + --> $DIR/recover-labeled-non-block-expr.rs:25:24 | LL | let _val = 'label: (1, if other == 3 { break 'label (2, 3) } else { other }); | ^ expected `while`, `for`, `loop` or `{` after a label @@ -47,5 +36,5 @@ help: consider enclosing expression in a block LL | let _val = 'label: {(1, if other == 3 { break 'label (2, 3) } else { other })}; | + + -error: aborting due to 4 previous errors +error: aborting due to 3 previous errors |