From: yui-knk Date: Sun, 2 Dec 2018 13:15:50 +0000 (+0900) Subject: Remove not used `DotEq` token X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=96bf06baf308e5cd2ad43962895f626724395e7d;p=rust.git Remove not used `DotEq` token Currently libproc_macro does not use `DotEq` token. https://github.com/rust-lang/rust/pull/49545 changed libproc_macro to not generate `DotEq` token. --- diff --git a/src/librustc/ich/impls_syntax.rs b/src/librustc/ich/impls_syntax.rs index 4be467c01aa..b629fb820b3 100644 --- a/src/librustc/ich/impls_syntax.rs +++ b/src/librustc/ich/impls_syntax.rs @@ -314,7 +314,6 @@ fn hash_token<'a, 'gcx, W: StableHasherResult>( token::Token::DotDot | token::Token::DotDotDot | token::Token::DotDotEq | - token::Token::DotEq | token::Token::Comma | token::Token::Semi | token::Token::Colon | diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs index 6522261fe1e..8fb91cc23f7 100644 --- a/src/librustdoc/html/highlight.rs +++ b/src/librustdoc/html/highlight.rs @@ -346,7 +346,7 @@ fn write_token(&mut self, token::Lifetime(..) => Class::Lifetime, token::Eof | token::Interpolated(..) | - token::Tilde | token::At | token::DotEq | token::SingleQuote => Class::None, + token::Tilde | token::At| token::SingleQuote => Class::None, }; // Anything that didn't return above is the simple case where we the diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index c6e0adbb5a4..69ed318b049 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -703,7 +703,6 @@ macro_rules! mk_lit { token::At => "At", token::Dot => "Dot", token::DotDot => "DotDot", - token::DotEq => "DotEq", token::DotDotDot => "DotDotDot", token::DotDotEq => "DotDotEq", token::Comma => "Comma", diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 46fc6454d1c..4a5f3e240da 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -163,7 +163,6 @@ pub enum Token { DotDot, DotDotDot, DotDotEq, - DotEq, // HACK(durka42) never produced by the parser, only used for libproc_macro Comma, Semi, Colon, @@ -454,7 +453,6 @@ pub fn is_reserved_ident(&self) -> bool { Dot => match joint { Dot => DotDot, DotDot => DotDotDot, - DotEq => DotDotEq, _ => return None, }, DotDot => match joint { @@ -477,7 +475,7 @@ pub fn is_reserved_ident(&self) -> bool { _ => return None, }, - Le | EqEq | Ne | Ge | AndAnd | OrOr | Tilde | BinOpEq(..) | At | DotDotDot | DotEq | + Le | EqEq | Ne | Ge | AndAnd | OrOr | Tilde | BinOpEq(..) | At | DotDotDot | DotDotEq | Comma | Semi | ModSep | RArrow | LArrow | FatArrow | Pound | Dollar | Question | OpenDelim(..) | CloseDelim(..) => return None, @@ -606,7 +604,6 @@ pub fn interpolated_to_tokenstream(&self, sess: &ParseSess, span: Span) (&DotDot, &DotDot) | (&DotDotDot, &DotDotDot) | (&DotDotEq, &DotDotEq) | - (&DotEq, &DotEq) | (&Comma, &Comma) | (&Semi, &Semi) | (&Colon, &Colon) | diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 14ad4b5c6f8..4fa1d0fac35 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -210,7 +210,6 @@ pub fn token_to_string(tok: &Token) -> String { token::DotDot => "..".to_string(), token::DotDotDot => "...".to_string(), token::DotDotEq => "..=".to_string(), - token::DotEq => ".=".to_string(), token::Comma => ",".to_string(), token::Semi => ";".to_string(), token::Colon => ":".to_string(), diff --git a/src/libsyntax_ext/proc_macro_server.rs b/src/libsyntax_ext/proc_macro_server.rs index 56bd58b28a6..4babc2e612f 100644 --- a/src/libsyntax_ext/proc_macro_server.rs +++ b/src/libsyntax_ext/proc_macro_server.rs @@ -213,7 +213,6 @@ macro_rules! op { }) } - DotEq => op!('.', '='), OpenDelim(..) | CloseDelim(..) => unreachable!(), Whitespace | Comment | Shebang(..) | Eof => unreachable!(), }