diff options
| author | bors <bors@rust-lang.org> | 2018-02-24 07:55:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-24 07:55:34 +0000 |
| commit | 6070d3e47e5e9f15575a3bd33583358b52bc6eda (patch) | |
| tree | 1277310a9582461e3b0dbe8db1ceb6f5f173f3c9 /src/libsyntax/parse/parser.rs | |
| parent | b0a8620ed639d5085d7e1cca3626681a6e4e328e (diff) | |
| parent | b26442a3cb12e988f70d9805b8bbfae52fd20d7d (diff) | |
| download | rust-6070d3e47e5e9f15575a3bd33583358b52bc6eda.tar.gz rust-6070d3e47e5e9f15575a3bd33583358b52bc6eda.zip | |
Auto merge of #48476 - Manishearth:rollup, r=Manishearth
Rollup of 12 pull requests - Successful merges: #47933, #48072, #48083, #48123, #48157, #48219, #48221, #48245, #48429, #48436, #48438, #48472 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 74daa5179d3..1a33de84429 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2630,8 +2630,7 @@ impl<'a> Parser<'a> { // A tuple index may not have a suffix self.expect_no_suffix(sp, "tuple index", suf); - let dot_span = self.prev_span; - hi = self.span; + let idx_span = self.span; self.bump(); let invalid_msg = "invalid tuple or struct index"; @@ -2646,9 +2645,8 @@ impl<'a> Parser<'a> { n.to_string()); err.emit(); } - let id = respan(dot_span.to(hi), n); - let field = self.mk_tup_field(e, id); - e = self.mk_expr(lo.to(hi), field, ThinVec::new()); + let field = self.mk_tup_field(e, respan(idx_span, n)); + e = self.mk_expr(lo.to(idx_span), field, ThinVec::new()); } None => { let prev_span = self.prev_span; |
