openpgp: Upgrade lalrpop

  - Fixes #1060.

6 files changed, 13 insertions, 47 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 2bcb0ca8..77734819 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1487,28 +1487,6 @@ dependencies = [
 
 [[package]]
 name = "lalrpop"
-version = "0.19.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b"
-dependencies = [
- "ascii-canvas",
- "bit-set",
- "diff",
- "ena",
- "is-terminal",
- "itertools",
- "lalrpop-util 0.19.12",
- "petgraph",
- "regex",
- "regex-syntax 0.6.29",
- "string_cache",
- "term",
- "tiny-keccak",
- "unicode-xid",
-]
-
-[[package]]
-name = "lalrpop"
 version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
@@ -1519,7 +1497,7 @@ dependencies = [
  "ena",
  "is-terminal",
  "itertools",
- "lalrpop-util 0.20.0",
+ "lalrpop-util",
  "petgraph",
  "regex",
  "regex-syntax 0.7.5",
@@ -1531,12 +1509,6 @@ dependencies = [
 
 [[package]]
 name = "lalrpop-util"
-version = "0.19.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed"
-
-[[package]]
-name = "lalrpop-util"
 version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
@@ -2238,12 +2210,6 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
 version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
@@ -2498,8 +2464,8 @@ dependencies = [
  "dirs",
  "fs2",
  "futures",
- "lalrpop 0.20.0",
- "lalrpop-util 0.20.0",
+ "lalrpop",
+ "lalrpop-util",
  "lazy_static",
  "libc",
  "memsec",
@@ -2570,8 +2536,8 @@ dependencies = [
  "getrandom",
  "idea",
  "idna 0.4.0",
- "lalrpop 0.19.12",
- "lalrpop-util 0.19.12",
+ "lalrpop",
+ "lalrpop-util",
  "lazy_static",
  "libc",
  "md-5",
diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml
index 459110ab..c6d9dfb8 100644
--- a/openpgp/Cargo.toml
+++ b/openpgp/Cargo.toml
@@ -34,7 +34,7 @@ bzip2 = { version = "0.4", optional = true }
 dyn-clone = "1"
 flate2 = { version = "1.0.1", optional = true }
 idna = "0.4"
-lalrpop-util = ">=0.17, <0.20"
+lalrpop-util = "0.20"
 lazy_static = "1.4.0"
 libc = "0.2.66"
 memsec = { version = ">=0.5, <0.7", default-features = false }
@@ -99,7 +99,7 @@ chrono = { version = "0.4.10", default-features = false, features = ["std", "was
 getrandom = { version = "0.2", features = ["js"] }
 
 [build-dependencies]
-lalrpop = { version = ">=0.17, <0.20", default-features = false }
+lalrpop = { version = "0.20", default-features = false }
 
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
diff --git a/openpgp/src/cert/parser/low_level/mod.rs b/openpgp/src/cert/parser/low_level/mod.rs
index 79f620d3..0547bf8c 100644
--- a/openpgp/src/cert/parser/low_level/mod.rs
+++ b/openpgp/src/cert/parser/low_level/mod.rs
@@ -60,8 +60,8 @@ pub(crate) fn parse_error_downcast(e: ParseError<usize, Token, Error>)
         ParseError::User { error }
         => ParseError::User { error },
 
-        ParseError::UnrecognizedEOF { location, expected }
-        => ParseError::UnrecognizedEOF { location, expected },
+        ParseError::UnrecognizedEof { location, expected }
+        => ParseError::UnrecognizedEof { location, expected },
     }
 }
 
diff --git a/openpgp/src/cert/parser/mod.rs b/openpgp/src/cert/parser/mod.rs
index d376c0c1..eea20d49 100644
--- a/openpgp/src/cert/parser/mod.rs
+++ b/openpgp/src/cert/parser/mod.rs
@@ -224,7 +224,7 @@ impl KeyringValidator {
         } else {
             match r {
                 Ok(_) => KeyringValidity::KeyringPrefix,
-                Err(ParseError::UnrecognizedEOF { .. }) =>
+                Err(ParseError::UnrecognizedEof { .. }) =>
                     KeyringValidity::KeyringPrefix,
                 Err(err) =>
                     KeyringValidity::Error(
diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs
index ec715380..5a9d3b1f 100644
--- a/openpgp/src/message/mod.rs
+++ b/openpgp/src/message/mod.rs
@@ -274,7 +274,7 @@ impl MessageValidator {
         } else {
             match r {
                 Ok(_) => MessageValidity::MessagePrefix,
-                Err(ParseError::UnrecognizedEOF { .. }) =>
+                Err(ParseError::UnrecognizedEof { .. }) =>
                     MessageValidity::MessagePrefix,
                 Err(ref err) =>
                     MessageValidity::Error(
diff --git a/openpgp/src/regex/mod.rs b/openpgp/src/regex/mod.rs
index c42c1727..c2a6b93f 100644
--- a/openpgp/src/regex/mod.rs
+++ b/openpgp/src/regex/mod.rs
@@ -288,8 +288,8 @@ pub(crate) fn parse_error_downcast(e: ParseError<usize, Token, LexicalError>)
         ParseError::User { error }
         => ParseError::User { error },
 
-        ParseError::UnrecognizedEOF { location, expected }
-        => ParseError::UnrecognizedEOF { location, expected },
+        ParseError::UnrecognizedEof { location, expected }
+        => ParseError::UnrecognizedEof { location, expected },
     }
 }