Skip to content

Commit 71d33cd

Browse files
committed
Rollup merge of #25994 - marcusklaas:issue-25969, r=huonw
Issue: #25969 Compare the span on the stable branch (correct) with the span on the nightly branch (incorrect) for the following example: http://is.gd/lTAo9c. This pull request fixes the regression. @Manishearth has been kind enough to pitch some ideas for a regression test, mainly revolving around testing the span in compile-fail test, but this has proven unsuccessful. Other suggestions/ ideas would be much appreciated!
2 parents 8b57130 + 0000d4c commit 71d33cd

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2070,10 +2070,9 @@ impl<'a> Parser<'a> {
20702070
}
20712071
_ => {
20722072
if try!(self.eat_lt()){
2073-
20742073
let (qself, path) =
20752074
try!(self.parse_qualified_path(LifetimeAndTypesWithColons));
2076-
2075+
hi = path.span.hi;
20772076
return Ok(self.mk_expr(lo, hi, ExprPath(Some(qself), path)));
20782077
}
20792078
if try!(self.eat_keyword(keywords::Move) ){

0 commit comments

Comments
 (0)