diff options
| author | bors <bors@rust-lang.org> | 2018-02-26 09:41:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-26 09:41:33 +0000 |
| commit | 4a70e272191862cdb7858a1b5b21cd811281d8db (patch) | |
| tree | 5d13f39690eaa8efbfc2cb4b88794713d954a5b1 /src/libsyntax/parse | |
| parent | 322d7f7b97f1672bade31e1c43d5753e0e45a1a8 (diff) | |
| parent | 1e037f4172d60cdd7ad734d20bd7de392c27d31e (diff) | |
| download | rust-4a70e272191862cdb7858a1b5b21cd811281d8db.tar.gz rust-4a70e272191862cdb7858a1b5b21cd811281d8db.zip | |
Auto merge of #48082 - jseyfried:improve_struct_field_hygiene, r=petrochenkov
macros: improve struct constructor field hygiene, fix span bug Fixes #47311. r? @nrc
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 4d457f4864a..09dd00fa5fa 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2125,8 +2125,8 @@ impl<'a> Parser<'a> { // Check if a colon exists one ahead. This means we're parsing a fieldname. let (fieldname, expr, is_shorthand) = if self.look_ahead(1, |t| t == &token::Colon) { let fieldname = self.parse_field_name()?; - self.bump(); hi = self.prev_span; + self.bump(); (fieldname, self.parse_expr()?, false) } else { let fieldname = self.parse_ident_common(false)?; |