Skip to content

Commit d6537d4

Browse files
committed
---
yaml --- r: 103938 b: refs/heads/try c: 5109d1a h: refs/heads/master v: v3
1 parent 5b645ab commit d6537d4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
5-
refs/heads/try: 104002be6ff9636f897434bd588da398c34dc1f0
5+
refs/heads/try: 5109d1adcefa314e75493e8271826d08e2dffa62
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/parse/parser.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1771,7 +1771,7 @@ impl Parser {
17711771
self.commit_expr_expecting(*es.last().unwrap(), token::RPAREN);
17721772

17731773
return if es.len() == 1 && !trailing_comma {
1774-
self.mk_expr(lo, self.span.hi, ExprParen(es[0]))
1774+
self.mk_expr(lo, hi, ExprParen(es[0]))
17751775
}
17761776
else {
17771777
self.mk_expr(lo, hi, ExprTup(es))
@@ -1994,7 +1994,7 @@ impl Parser {
19941994
seq_sep_trailing_disallowed(token::COMMA),
19951995
|p| p.parse_expr()
19961996
);
1997-
hi = self.span.hi;
1997+
hi = self.last_span.hi;
19981998

19991999
es.unshift(e);
20002000
let nd = self.mk_method_call(i, tys, es, NoSugar);
@@ -2510,7 +2510,7 @@ impl Parser {
25102510
parse_decl: |&mut Parser| -> P<FnDecl>,
25112511
parse_body: |&mut Parser| -> @Expr)
25122512
-> @Expr {
2513-
let lo = self.last_span.lo;
2513+
let lo = self.span.lo;
25142514
let decl = parse_decl(self);
25152515
let body = parse_body(self);
25162516
let fakeblock = P(ast::Block {

0 commit comments

Comments
 (0)