diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-06-04 10:07:03 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-06-04 10:07:03 +0530 |
| commit | 71d33cd1150371d1136d136e5b18ea724fbd2605 (patch) | |
| tree | 894b726076a5d9e89a4f2e04625e28c39b59809b /src/libsyntax/parse | |
| parent | 8b57130e8450baed5c851686d9c8ead20223f5a4 (diff) | |
| parent | 0000d4c62a9508c30354e8064c1866312839bb7a (diff) | |
| download | rust-71d33cd1150371d1136d136e5b18ea724fbd2605.tar.gz rust-71d33cd1150371d1136d136e5b18ea724fbd2605.zip | |
Rollup merge of #25994 - marcusklaas:issue-25969, r=huonw
Issue: https://github.com/rust-lang/rust/issues/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!
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 539d594cb8b..420b27b8395 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -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) ){ |