Remove Token::LArrow

rust-lang · May 18, 2019 · b842b34 · b842b34
1 parent 650c1c3
commit b842b34
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 14 deletions.
diff --git a/src/librustc/ich/impls_syntax.rs b/src/librustc/ich/impls_syntax.rs
@@ -329,7 +329,6 @@ fn hash_token<'a, 'gcx, W: StableHasherResult>(
         token::Token::Colon |
         token::Token::ModSep |
         token::Token::RArrow |
-        token::Token::LArrow |
         token::Token::FatArrow |
         token::Token::Pound |
         token::Token::Dollar |

diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs
@@ -249,7 +249,7 @@ impl<'a> Classifier<'a> {
 
             // Miscellaneous, no highlighting.
             token::Dot | token::DotDot | token::DotDotDot | token::DotDotEq | token::Comma |
-                token::Semi | token::Colon | token::ModSep | token::LArrow | token::OpenDelim(_) |
+                token::Semi | token::Colon | token::ModSep | token::OpenDelim(_) |
                 token::CloseDelim(token::Brace) | token::CloseDelim(token::Paren) |
                 token::CloseDelim(token::NoDelim) => Class::None,
 

diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
@@ -1032,10 +1032,6 @@ impl<'a> StringReader<'a> {
                     '<' => {
                         Ok(self.binop(token::Shl))
                     }
-                    '-' => {
-                        self.bump();
-                        Ok(token::LArrow)
-                    }
                     _ => {
                         Ok(token::Lt)
                     }

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
@@ -2140,8 +2140,7 @@ impl<'a> Parser<'a> {
         let ident = self.parse_path_segment_ident()?;
 
         let is_args_start = |token: &token::Token| match *token {
-            token::Lt | token::BinOp(token::Shl) | token::OpenDelim(token::Paren)
-            | token::LArrow => true,
+            token::Lt | token::BinOp(token::Shl) | token::OpenDelim(token::Paren) => true,
             _ => false,
         };
         let check_args_start = |this: &mut Self| {

diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
@@ -180,7 +180,6 @@ pub enum Token {
     Colon,
     ModSep,
     RArrow,
-    LArrow,
     FatArrow,
     Pound,
     Dollar,
@@ -455,7 +454,6 @@ impl Token {
                 Eq => Le,
                 Lt => BinOp(Shl),
                 Le => BinOpEq(Shl),
-                BinOp(Minus) => LArrow,
                 _ => return None,
             },
             Gt => match joint {
@@ -501,7 +499,7 @@ impl Token {
             },
 
             Le | EqEq | Ne | Ge | AndAnd | OrOr | Tilde | BinOpEq(..) | At | DotDotDot |
-            DotDotEq | Comma | Semi | ModSep | RArrow | LArrow | FatArrow | Pound | Dollar |
+            DotDotEq | Comma | Semi | ModSep | RArrow | FatArrow | Pound | Dollar |
             Question | OpenDelim(..) | CloseDelim(..) |
             Literal(..) | Ident(..) | Lifetime(..) | Interpolated(..) | DocComment(..) |
             Whitespace | Comment | Shebang(..) | Eof => return None,
@@ -546,7 +544,6 @@ impl Token {
             (&Colon, &Colon) |
             (&ModSep, &ModSep) |
             (&RArrow, &RArrow) |
-            (&LArrow, &LArrow) |
             (&FatArrow, &FatArrow) |
             (&Pound, &Pound) |
             (&Dollar, &Dollar) |

diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
@@ -215,7 +215,6 @@ pub fn token_to_string(tok: &Token) -> String {
         token::Colon                => ":".to_string(),
         token::ModSep               => "::".to_string(),
         token::RArrow               => "->".to_string(),
-        token::LArrow               => "<-".to_string(),
         token::FatArrow             => "=>".to_string(),
         token::OpenDelim(token::Paren) => "(".to_string(),
         token::CloseDelim(token::Paren) => ")".to_string(),

diff --git a/src/libsyntax_ext/proc_macro_server.rs b/src/libsyntax_ext/proc_macro_server.rs
@@ -135,7 +135,6 @@ impl FromInternal<(TreeAndJoint, &'_ ParseSess, &'_ mut Vec<Self>)>
             Colon => op!(':'),
             ModSep => op!(':', ':'),
             RArrow => op!('-', '>'),
-            LArrow => op!('<', '-'),
             FatArrow => op!('=', '>'),
             Pound => op!('#'),
             Dollar => op!('$'),