diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-06-05 11:00:22 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-06-06 14:04:02 +0300 |
| commit | 4c5d773b4d529c6263f682513ea34ce644a8179b (patch) | |
| tree | 2d207a75d803063e4ee7a87ca55fb68af3bfe088 /src/libsyntax/parse/parser.rs | |
| parent | 5e693531ffa55cfb0cececdf5d7203a6d400e828 (diff) | |
| download | rust-4c5d773b4d529c6263f682513ea34ce644a8179b.tar.gz rust-4c5d773b4d529c6263f682513ea34ce644a8179b.zip | |
syntax: Remove duplicate span from `token::Lifetime`
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 7dd92f022e1..362f81d02a0 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2652,7 +2652,7 @@ impl<'a> Parser<'a> { // and lifetime tokens, so the former are never encountered during normal parsing. match **nt { token::NtIdent(ident, is_raw) => Token::new(token::Ident(ident, is_raw), ident.span), - token::NtLifetime(ident) => Token::new(token::Lifetime(ident), ident.span), + token::NtLifetime(ident) => Token::new(token::Lifetime(ident.name), ident.span), _ => return, } } @@ -3922,9 +3922,8 @@ impl<'a> Parser<'a> { // Parse &pat / &mut pat self.expect_and()?; let mutbl = self.parse_mutability(); - if let token::Lifetime(ident) = self.token.kind { - let mut err = self.fatal(&format!("unexpected lifetime `{}` in pattern", - ident)); + if let token::Lifetime(name) = self.token.kind { + let mut err = self.fatal(&format!("unexpected lifetime `{}` in pattern", name)); err.span_label(self.span, "unexpected lifetime"); return Err(err); } |
