diff options
| author | Peter Michael Green <plugwash@debian.org> | 2023-10-26 14:14:38 +0200 |
|---|---|---|
| committer | Neal H. Walfield <neal@pep.foundation> | 2023-10-26 14:14:38 +0200 |
| commit | 7a8e12e89bccc5c40037969231a97d3d53983fcc (patch) | |
| tree | 70ce351fe9f506e915e0d1cfeeaa98f614026e4f /openpgp | |
| parent | 082c48e65f2b56a4a03f87e68d7601f073feec43 (diff) | |
openpgp: Upgrade lalrpop
- Fixes #1060.
Diffstat (limited to 'openpgp')
| -rw-r--r-- | openpgp/Cargo.toml | 4 | ||||
| -rw-r--r-- | openpgp/src/cert/parser/low_level/mod.rs | 4 | ||||
| -rw-r--r-- | openpgp/src/cert/parser/mod.rs | 2 | ||||
| -rw-r--r-- | openpgp/src/message/mod.rs | 2 | ||||
| -rw-r--r-- | openpgp/src/regex/mod.rs | 4 |
5 files changed, 8 insertions, 8 deletions
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 }, } } |