nom 8, which 8, pinentry 0.8

Author: str4d

Cargo.lock

@@ -45,10 +45,10 @@ bech32 = "0.9"
 
 # Parsing
 cookie-factory = "0.3.1"
-nom = { version = "7", default-features = false, features = ["alloc"] }
+nom = { version = "8", default-features = false, features = ["alloc"] }
 
 # Secret management
-pinentry = "0.6"
+pinentry = "0.8"
 secrecy = "0.10"
 subtle = "2"
 zeroize = "1"

Cargo.toml

@@ -163,7 +163,7 @@ pub mod read {
         combinator::{map, map_opt, opt, verify},
         multi::{many_till, separated_list1},
         sequence::{pair, preceded, terminated},
-        IResult,
+        IResult, Parser,
     };
 
     use super::{AgeStanza, STANZA_TAG};
@@ -211,7 +211,8 @@ pub mod read {
         map(take_while1(|c| (33..=126).contains(&c)), |bytes| {
             // Safety: ASCII bytes are valid UTF-8
             unsafe { std::str::from_utf8_unchecked(bytes) }
-        })(input)
+        })
+        .parse(input)
     }
 
     fn wrapped_encoded_data(input: &[u8]) -> IResult<&[u8], Vec<&[u8]>> {
@@ -240,7 +241,8 @@ pub mod read {
                 chunks.push(partial_chunk);
                 chunks
             },
-        )(input)
+        )
+        .parse(input)
     }
 
     fn legacy_wrapped_encoded_data(input: &[u8]) -> IResult<&[u8], Vec<&[u8]>> {
@@ -263,7 +265,8 @@ pub mod read {
                     Some(chunks)
                 }
             },
-        )(input)
+        )
+        .parse(input)
     }
 
     /// Reads an age stanza.
@@ -289,7 +292,8 @@ pub mod read {
                 let tag = args.remove(0);
                 AgeStanza { tag, args, body }
             },
-        )(input)
+        )
+        .parse(input)
     }
 
     fn legacy_age_stanza_inner(input: &[u8]) -> IResult<&[u8], AgeStanza<'_>> {
@@ -306,7 +310,8 @@ pub mod read {
                     body: body.unwrap_or_else(|| vec![&[]]),
                 }
             },
-        )(input)
+        )
+        .parse(input)
     }
 
     /// Reads a age stanza, allowing the legacy encoding of an body.
@@ -330,7 +335,7 @@ pub mod read {
     ///
     /// [`grease_the_joint`]: super::grease_the_joint
     pub fn legacy_age_stanza(input: &[u8]) -> IResult<&[u8], AgeStanza<'_>> {
-        alt((age_stanza, legacy_age_stanza_inner))(input)
+        alt((age_stanza, legacy_age_stanza_inner)).parse(input)
     }
 
     #[cfg(test)]

age-core/src/format.rs

@@ -78,7 +78,7 @@ rpassword = { version = "7", optional = true }
 
 [target.'cfg(any(unix, windows))'.dependencies]
 # Plugin management
-which = { version = "4", optional = true }
+which = { version = "8", optional = true }
 wsl = { version = "0.1", optional = true }
 
 [dev-dependencies]

age/Cargo.toml

@@ -261,7 +261,7 @@ mod read {
         combinator::{map, map_opt},
         multi::many1,
         sequence::{pair, preceded, terminated},
-        IResult,
+        IResult, Parser,
     };
 
     use super::*;
@@ -274,7 +274,7 @@ mod read {
                 pair(
                     many1(legacy_age_stanza),
                     preceded(
-                        pair(tag(MAC_TAG), tag(b" ")),
+                        pair(tag(MAC_TAG), tag(" ")),
                         terminated(
                             map_opt(take(ENCODED_MAC_LENGTH), |tag| {
                                 base64_arg::<_, 32, 33>(&tag)
@@ -289,7 +289,8 @@ mod read {
                     encoded_bytes: None,
                 },
             ),
-        )(input)
+        )
+        .parse(input)
     }
 
     /// From the age specification:
@@ -307,7 +308,8 @@ mod read {
                     Header::Unknown(s.to_string())
                 }),
             )),
-        )(input)
+        )
+        .parse(input)
     }
 }