Merge pull request #1510 from sanxiyn/update-lalrpop

youknowone · web-flow · commit e2bd5415fbef · 2019-10-11T16:37:46.000+09:00
Update lalrpop to 0.17
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
@@ -9,10 +9,10 @@ license = "MIT"
 edition = "2018"
 
 [build-dependencies]
-lalrpop="0.16.3"
+lalrpop="0.17"
 
 [dependencies]
-lalrpop-util="0.16.3"
+lalrpop-util="0.17"
 log="0.4.1"
 regex = "1"
 num-bigint = "0.2"
diff --git a/parser/src/error.rs b/parser/src/error.rs
@@ -143,19 +143,14 @@ impl From<LalrpopError<Location, Tok, LexicalError>> for ParseError {
                 error: ParseErrorType::Lexical(error.error),
                 location: error.location,
             },
-            LalrpopError::UnrecognizedToken { token, expected } => {
-                match token {
-                    Some(tok) => ParseError {
-                        error: ParseErrorType::UnrecognizedToken(tok.1, expected),
-                        location: tok.0,
-                    },
-                    // EOF was observed when it was unexpected
-                    None => ParseError {
-                        error: ParseErrorType::EOF,
-                        location: Default::default(),
-                    },
-                }
-            }
+            LalrpopError::UnrecognizedToken { token, expected } => ParseError {
+                error: ParseErrorType::UnrecognizedToken(token.1, expected),
+                location: token.0,
+            },
+            LalrpopError::UnrecognizedEOF { location, .. } => ParseError {
+                error: ParseErrorType::EOF,
+                location,
+            },
         }
     }
 }
