diff options
-rw-r--r-- | Cargo.lock | 44 | ||||
-rw-r--r-- | openpgp/Cargo.toml | 4 | ||||
-rw-r--r-- | openpgp/src/message/mod.rs | 2 | ||||
-rw-r--r-- | openpgp/src/tpk/mod.rs | 16 | ||||
-rw-r--r-- | rfc2822/Cargo.toml | 4 | ||||
-rw-r--r-- | rfc2822/src/lib.rs | 14 | ||||
-rw-r--r-- | rfc2822/src/roundtrip.rs | 2 |
7 files changed, 34 insertions, 52 deletions
@@ -43,10 +43,10 @@ dependencies = [ [[package]] name = "ascii-canvas" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -471,7 +471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ena" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -750,17 +750,17 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ascii-canvas 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ascii-canvas 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)", + "lalrpop-util 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -768,13 +768,13 @@ dependencies = [ "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "lalrpop-util" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1607,8 +1607,8 @@ dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)", + "lalrpop 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lalrpop-util 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "memsec 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "nettle 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1639,8 +1639,8 @@ name = "sequoia-rfc2822" version = "0.7.0" dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)", + "lalrpop 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lalrpop-util 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "quickcheck 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1846,15 +1846,6 @@ dependencies = [ [[package]] name = "term" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "term" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -2278,7 +2269,7 @@ dependencies = [ "checksum approx 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" "checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" -"checksum ascii-canvas 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b385d69402821a1c254533a011a312531cbcc0e3e24f19bbb4747a5a2daf37e2" +"checksum ascii-canvas 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29" "checksum assert_cli 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a29ab7c0ed62970beb0534d637a8688842506d0ff9157de83286dacd065c8149" "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" @@ -2327,7 +2318,7 @@ dependencies = [ "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" "checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" "checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b" -"checksum ena 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f56c93cc076508c549d9bb747f79aa9b4eb098be7b8cad8830c3137ef52d1e00" +"checksum ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3dc01d68e08ca384955a3aeba9217102ca1aa85b6e168639bf27739f1d749d87" "checksum encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90b2c9496c001e8cb61827acdefad780795c42264c137744cae6f7d9e3450abd" "checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a" "checksum environment 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee" @@ -2360,8 +2351,8 @@ dependencies = [ "checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -"checksum lalrpop 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2e80bee40b22bca46665b4ef1f3cd88ed0fb043c971407eac17a0712c02572" -"checksum lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)" = "33b27d8490dbe1f9704b0088d61e8d46edc10d5673a8829836c6ded26a9912c7" +"checksum lalrpop 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b7f2d14eb07d819e961e5169f61d67de76a7cdbc6778b62192bcfe27c5af019" +"checksum lalrpop-util 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9768f55211206d3c17181108d8facb80bdffc1f1e674a67b1dddb2743529ca19" "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" "checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6" @@ -2467,7 +2458,6 @@ dependencies = [ "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" "checksum tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a" -"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" "checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml index e7ec9920..0489bb31 100644 --- a/openpgp/Cargo.toml +++ b/openpgp/Cargo.toml @@ -27,7 +27,7 @@ bzip2 = { version = "0.3.2", optional = true } failure = "0.1.2" flate2 = { version = "1.0.1", optional = true } idna = "0.1" -lalrpop-util = "0.16" +lalrpop-util = "0.17" lazy_static = "1.3" memsec = "0.5.4" nettle = "5.0" @@ -37,7 +37,7 @@ time = "0.1.40" sequoia-rfc2822 = { path = "../rfc2822", version = "0.7" } [build-dependencies] -lalrpop = "0.16" +lalrpop = "0.17" [dev-dependencies] rpassword = "3.0" diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs index d2b76426..c0d701b0 100644 --- a/openpgp/src/message/mod.rs +++ b/openpgp/src/message/mod.rs @@ -291,7 +291,7 @@ impl MessageValidator { } else { match r { Ok(_) => MessageValidity::MessagePrefix, - Err(ParseError::UnrecognizedToken { token: None, .. }) => + Err(ParseError::UnrecognizedEOF { .. }) => MessageValidity::MessagePrefix, Err(ref err) => MessageValidity::Error( diff --git a/openpgp/src/tpk/mod.rs b/openpgp/src/tpk/mod.rs index 011a312c..c16b7e56 100644 --- a/openpgp/src/tpk/mod.rs +++ b/openpgp/src/tpk/mod.rs @@ -64,17 +64,10 @@ fn parse_error_downcast(e: ParseError<usize, Token, Error>) { match e { ParseError::UnrecognizedToken { - token: Some((start, t, end)), - expected, - } => ParseError::UnrecognizedToken { - token: Some((start, t.into(), end)), - expected, - }, - ParseError::UnrecognizedToken { - token: None, + token: (start, t, end), expected, } => ParseError::UnrecognizedToken { - token: None, + token: (start, t.into(), end), expected, }, @@ -89,6 +82,9 @@ fn parse_error_downcast(e: ParseError<usize, Token, Error>) ParseError::User { error } => ParseError::User { error }, + + ParseError::UnrecognizedEOF { location, expected } + => ParseError::UnrecognizedEOF { location, expected }, } } @@ -306,7 +302,7 @@ impl KeyringValidator { } else { match r { Ok(_) => KeyringValidity::KeyringPrefix, - Err(ParseError::UnrecognizedToken { token: None, .. }) => + Err(ParseError::UnrecognizedEOF { .. }) => KeyringValidity::KeyringPrefix, Err(err) => KeyringValidity::Error( diff --git a/rfc2822/Cargo.toml b/rfc2822/Cargo.toml index e768842d..53a909f3 100644 --- a/rfc2822/Cargo.toml +++ b/rfc2822/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] failure = "0.1.2" -lalrpop-util = "0.16" +lalrpop-util = "0.17" [dev-dependencies] lazy_static = "1.3" @@ -29,4 +29,4 @@ quickcheck = "0.8" rand = "0.6" [build-dependencies] -lalrpop = "0.16" +lalrpop = "0.17" diff --git a/rfc2822/src/lib.rs b/rfc2822/src/lib.rs index ed30f41e..3a9381c4 100644 --- a/rfc2822/src/lib.rs +++ b/rfc2822/src/lib.rs @@ -104,17 +104,10 @@ fn parse_error_downcast<'a>(e: ParseError<usize, lexer::Token<'a>, Error>) { match e { ParseError::UnrecognizedToken { - token: Some((start, t, end)), - expected, - } => ParseError::UnrecognizedToken { - token: Some((start, t.into(), end)), - expected, - }, - ParseError::UnrecognizedToken { - token: None, + token: (start, t, end), expected, } => ParseError::UnrecognizedToken { - token: None, + token: (start, t.into(), end), expected, }, @@ -129,6 +122,9 @@ fn parse_error_downcast<'a>(e: ParseError<usize, lexer::Token<'a>, Error>) ParseError::User { error } => ParseError::User { error }, + + ParseError::UnrecognizedEOF { location, expected } + => ParseError::UnrecognizedEOF { location, expected }, } } diff --git a/rfc2822/src/roundtrip.rs b/rfc2822/src/roundtrip.rs index aadd7d9e..76555ebb 100644 --- a/rfc2822/src/roundtrip.rs +++ b/rfc2822/src/roundtrip.rs @@ -183,7 +183,7 @@ macro_rules! parser_quickcheck { Err(err) => { eprintln!("Parsing: {:?}: {:?}", t, err); if let ParseError::UnrecognizedToken { - token: Some((start, _, end)), .. + token: (start, _, end), .. } = err { eprintln!("Context:"); |