From 4c5d773b4d529c6263f682513ea34ce644a8179b Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Wed, 5 Jun 2019 11:00:22 +0300 Subject: syntax: Remove duplicate span from `token::Lifetime` --- src/libsyntax/parse/parser.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libsyntax/parse/parser.rs') 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); } -- cgit 1.4.1-3-g733a5