fix rebase

This commit is contained in:
Esteban Küber 2018-02-28 10:56:07 -08:00
parent d63d363ef9
commit 24be75d420
2 changed files with 4 additions and 4 deletions

View file

@ -1,10 +1,10 @@
error: expected `{`, found `}`
--> $DIR/if-without-block.rs:17:1
|
13 | if 5 == {
LL | if 5 == {
| -- this `if` statement has a condition, but no block
...
17 | }
LL | }
| ^
error: aborting due to previous error

View file

@ -1,9 +1,9 @@
error: expected one of `,`, `.`, `?`, `}`, or an operator, found `=>`
--> $DIR/missing-comma-in-match.rs:14:18
|
13 | &None => 1
LL | &None => 1
| - help: missing a comma here to end this `match` arm
14 | &Some(2) => { 3 }
LL | &Some(2) => { 3 }
| ^^ expected one of `,`, `.`, `?`, `}`, or an operator here
error: aborting due to previous error