diff options
| author | bors <bors@rust-lang.org> | 2015-04-15 23:09:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-15 23:09:02 +0000 |
| commit | abf0548b5caaa389a5b29813132d2cf4c8b0f1ed (patch) | |
| tree | cd34c53e5dcbf9329333642a91d41b5cfda07e26 /src/libsyntax/parse | |
| parent | 07f807d01f191ced1d7f4857c73fc57fbe31f421 (diff) | |
| parent | 7644ef8c2b165eb7ca247a212ad988401881a734 (diff) | |
| download | rust-abf0548b5caaa389a5b29813132d2cf4c8b0f1ed.tar.gz rust-abf0548b5caaa389a5b29813132d2cf4c8b0f1ed.zip | |
Auto merge of #24481 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #24425, #24435, #24438, #24440, #24449, #24457, #24460, #24465, #24467, #24468, #24471, #24476, #24480 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index e45b7c1df91..bef2068f0dd 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1972,7 +1972,7 @@ impl<'a> Parser<'a> { } try!(self.bump()); - hi = self.span.hi; + hi = self.last_span.hi; return if es.len() == 1 && !trailing_comma { Ok(self.mk_expr(lo, hi, ExprParen(es.into_iter().nth(0).unwrap()))) } else { |