Skip to content

Commit

Permalink
Rollup merge of rust-lang#25994 - marcusklaas:issue-25969, r=huonw
Browse files Browse the repository at this point in the history
Issue: rust-lang#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!
  • Loading branch information
Manishearth committed Jun 4, 2015
2 parents 8b57130 + 0000d4c commit 71d33cd
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2070,10 +2070,9 @@ impl<'a> Parser<'a> {
}
_ => {
if try!(self.eat_lt()){

let (qself, path) =
try!(self.parse_qualified_path(LifetimeAndTypesWithColons));

hi = path.span.hi;
return Ok(self.mk_expr(lo, hi, ExprPath(Some(qself), path)));
}
if try!(self.eat_keyword(keywords::Move) ){
Expand Down

0 comments on commit 71d33cd

Please sign in to comment.