diff options
| author | bors <bors@rust-lang.org> | 2022-04-21 18:05:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-21 18:05:14 +0000 |
| commit | cf68cadc4556c5139e12c082e2c05fa716553e2b (patch) | |
| tree | a239de81851cb6e38fa9c13646c16770d94148c6 /tests | |
| parent | a9d31e71beacf97ce44d3cf677e5616c720051dd (diff) | |
| parent | 14667d147417546cee9f4c8ae8aa78f71e371e6c (diff) | |
| download | rust-cf68cadc4556c5139e12c082e2c05fa716553e2b.tar.gz rust-cf68cadc4556c5139e12c082e2c05fa716553e2b.zip | |
Auto merge of #8729 - Serial-ATA:issue-7318, r=Manishearth
Fix missing whitespace in `collapsible_else_if` suggestion changelog: Fix missing whitespace in [`collapsible_else_if`] suggestion closes #7318
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ui/collapsible_else_if.fixed | 7 | ||||
| -rw-r--r-- | tests/ui/collapsible_else_if.rs | 9 | ||||
| -rw-r--r-- | tests/ui/collapsible_else_if.stderr | 11 |
3 files changed, 26 insertions, 1 deletions
diff --git a/tests/ui/collapsible_else_if.fixed b/tests/ui/collapsible_else_if.fixed index bb6c4c0703d..d6a5a785067 100644 --- a/tests/ui/collapsible_else_if.fixed +++ b/tests/ui/collapsible_else_if.fixed @@ -75,3 +75,10 @@ fn main() { } } } + +#[rustfmt::skip] +#[allow(dead_code)] +fn issue_7318() { + if true { println!("I've been resolved!") + }else if false {} +} diff --git a/tests/ui/collapsible_else_if.rs b/tests/ui/collapsible_else_if.rs index 6d4f688db8c..4399fc8b2bd 100644 --- a/tests/ui/collapsible_else_if.rs +++ b/tests/ui/collapsible_else_if.rs @@ -89,3 +89,12 @@ fn main() { } } } + +#[rustfmt::skip] +#[allow(dead_code)] +fn issue_7318() { + if true { println!("I've been resolved!") + }else{ + if false {} + } +} diff --git a/tests/ui/collapsible_else_if.stderr b/tests/ui/collapsible_else_if.stderr index 6970f660979..45b2094c994 100644 --- a/tests/ui/collapsible_else_if.stderr +++ b/tests/ui/collapsible_else_if.stderr @@ -150,5 +150,14 @@ LL + println!("!") LL + } | -error: aborting due to 7 previous errors +error: this `else { if .. }` block can be collapsed + --> $DIR/collapsible_else_if.rs:97:10 + | +LL | }else{ + | __________^ +LL | | if false {} +LL | | } + | |_____^ help: collapse nested if block: `if false {}` + +error: aborting due to 8 previous errors |