fix rebase

Author: estebank

src/test/ui/if-without-block.stderr

@@ -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

src/test/ui/suggestions/missing-comma-in-match.stderr

@@ -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