Rollup merge of rust-lang#43463 - nrc:catch-span, r=petrochenkov

Mark-Simulacrum · web-flow · commit f7d06b3418ec · 2017-07-26T06:15:06.000-06:00
Fix the spans of catch blocks to include the `do`
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -2243,9 +2243,9 @@ impl<'a> Parser<'a> {
                         attrs);
                 }
                 if self.is_catch_expr() {
+                    let lo = self.span;
                     assert!(self.eat_keyword(keywords::Do));
                     assert!(self.eat_keyword(keywords::Catch));
-                    let lo = self.prev_span;
                     return self.parse_catch_expr(lo, attrs);
                 }
                 if self.eat_keyword(keywords::Return) {

Original file line number	Diff line number	Diff line change
`@@ -2243,9 +2243,9 @@ impl<'a> Parser<'a> {`
`2243`	`2243`	`attrs);`
`2244`	`2244`	`}`
`2245`	`2245`	`if self.is_catch_expr() {`
	`2246`	`+ let lo = self.span;`
`2246`	`2247`	`assert!(self.eat_keyword(keywords::Do));`
`2247`	`2248`	`assert!(self.eat_keyword(keywords::Catch));`
`2248`		`- let lo = self.prev_span;`
`2249`	`2249`	`return self.parse_catch_expr(lo, attrs);`
`2250`	`2250`	`}`
`2251`	`2251`	`if self.eat_keyword(keywords::Return) {`