adapt to changes in gix-actor

Author: Byron

gitoxide-core/src/hours/mod.rs

@@ -71,10 +71,10 @@ impl ParsedIdentity<'_> {
 
 fn parse_trailer_identity(trailer: gix::objs::commit::message::body::TrailerRef<'_>) -> Option<ParsedIdentity<'_>> {
     match trailer.value {
-        std::borrow::Cow::Borrowed(value) => IdentityRef::from_bytes::<gix::objs::decode::ParseError>(value.as_ref())
+        std::borrow::Cow::Borrowed(value) => IdentityRef::from_bytes(value.as_ref())
             .ok()
             .map(|identity| ParsedIdentity::Borrowed(identity.trim())),
-        std::borrow::Cow::Owned(value) => IdentityRef::from_bytes::<gix::objs::decode::ParseError>(value.as_ref())
+        std::borrow::Cow::Owned(value) => IdentityRef::from_bytes(value.as_ref())
             .ok()
             .map(|identity| ParsedIdentity::Owned(identity.trim().to_owned())),
     }

gitoxide-core/src/repository/mailmap.rs

@@ -71,7 +71,7 @@ pub fn check(
 
     let mut buf = Vec::new();
     for contact in contacts {
-        let actor = match gix::actor::IdentityRef::from_bytes::<()>(&contact) {
+        let actor = match gix::actor::IdentityRef::from_bytes(&contact) {
             Ok(a) => a,
             Err(_) => {
                 let Some(email) = contact

gix-mailmap/fuzz/fuzz_targets/mailmap.rs

@@ -27,7 +27,7 @@ fn resolve(snapshot: &Snapshot, input: &[u8]) {
         b"Jane <jane@desktop.(none)> 1 +0000".as_slice(),
         b"Unknown <[email protected]> 1 +0000".as_slice(),
     ] {
-        let Ok(signature) = SignatureRef::from_bytes::<()>(candidate) else {
+        let Ok(signature) = SignatureRef::from_bytes(candidate) else {
             continue;
         };
         _ = black_box(snapshot.try_resolve_ref(signature));

gix-mailmap/src/lib.rs

@@ -18,7 +18,7 @@
 //!
 //! let snapshot = gix_mailmap::Snapshot::new(parsed);
 //! let resolved = snapshot.resolve(
-//!     SignatureRef::from_bytes::<()>(b"Jane <[email protected]> 1711398853 +0800").unwrap(),
+//!     SignatureRef::from_bytes(b"Jane <[email protected]> 1711398853 +0800").unwrap(),
 //! );
 //!
 //! assert_eq!(resolved.name, "Jane Doe");

gix-object/src/parse.rs

@@ -1,8 +1,9 @@
 use bstr::{BStr, BString, ByteVec};
 use winnow::{
     combinator::{preceded, repeat, terminated},
-    error::{AddContext, ParserError, StrContext},
+    error::{AddContext, ErrMode, ParserError, StrContext},
     prelude::*,
+    stream::Stream,
     token::{take_till, take_until, take_while},
 };
 
@@ -70,20 +71,30 @@ pub fn hex_hash<'a, E: ParserError<&'a [u8]>>(i: &mut &'a [u8]) -> ModalResult<&
 pub(crate) fn signature<'a, E: ParserError<&'a [u8]> + AddContext<&'a [u8], StrContext>>(
     i: &mut &'a [u8],
 ) -> ModalResult<gix_actor::SignatureRef<'a>, E> {
+    let start = i.checkpoint();
     gix_actor::signature::decode(i)
+        .map_err(|err| ErrMode::Cut(E::from_input(i).add_context(i, &start, StrContext::Label(actor_error_label(err)))))
 }
 
 pub(crate) fn signature_and_consumed<'a, E: ParserError<&'a [u8]> + AddContext<&'a [u8], StrContext>>(
     i: &mut &'a [u8],
 ) -> ModalResult<(gix_actor::SignatureRef<'a>, &'a BStr), E> {
     let original = *i;
-    gix_actor::signature::decode(i).map(|signature| {
-        let consumed = original.len() - i.len();
-        (signature, original[..consumed].as_bstr())
-    })
+    let signature = signature(i)?;
+    let consumed = original.len() - i.len();
+    Ok((signature, original[..consumed].as_bstr()))
 }
 
 pub(crate) fn parse_signature(raw: &BStr) -> Result<gix_actor::SignatureRef<'_>, crate::decode::Error> {
-    gix_actor::SignatureRef::from_bytes::<crate::decode::ParseError>(raw.as_ref())
-        .map_err(|err| crate::decode::Error::with_err(err, raw.as_ref()))
+    let input = raw.as_ref();
+    let mut raw = input;
+    signature::<crate::decode::ParseError>(&mut raw).map_err(|err| crate::decode::Error::with_err(err, input))
+}
+
+fn actor_error_label(err: gix_actor::decode::Error) -> &'static str {
+    match err {
+        gix_actor::decode::Error::MissingClosingBracket => "Closing '>' not found",
+        gix_actor::decode::Error::MissingOpeningBracket => "Opening '<' not found",
+        gix_actor::decode::Error::DelimiterOverlap => "Skipped parts run into each other",
+    }
 }

gix-ref/src/store/file/log/line.rs

@@ -76,8 +76,9 @@ pub mod decode {
     use gix_object::bstr::{BStr, ByteSlice};
     use winnow::{
         combinator::{alt, eof, fail, opt, preceded, terminated},
-        error::{AddContext, ParserError, StrContext},
+        error::{AddContext, ErrMode, ParserError, StrContext},
         prelude::*,
+        stream::Stream,
         token::{rest, take_while},
     };
 
@@ -140,7 +141,7 @@ pub mod decode {
             let (old, new, signature) = (
                 terminated(hex_hash, b" ").context(StrContext::Expected("<old-hexsha>".into())),
                 terminated(hex_hash, b" ").context(StrContext::Expected("<new-hexsha>".into())),
-                gix_actor::signature::decode.context(StrContext::Expected("<name> <<email>> <timestamp>".into())),
+                signature.context(StrContext::Expected("<name> <<email>> <timestamp>".into())),
             )
                 .context(StrContext::Expected(
                     r"<old-hexsha> <new-hexsha> <name> <<email>> <timestamp> <tz>\t<message>".into(),
@@ -161,7 +162,7 @@ pub mod decode {
                 (
                     terminated(hex_hash, b" ").context(StrContext::Expected("<old-hexsha>".into())),
                     terminated(hex_hash, b" ").context(StrContext::Expected("<new-hexsha>".into())),
-                    gix_actor::signature::decode.context(StrContext::Expected("<name> <<email>> <timestamp>".into())),
+                    signature.context(StrContext::Expected("<name> <<email>> <timestamp>".into())),
                 )
                     .context(StrContext::Expected(
                         r"<old-hexsha> <new-hexsha> <name> <<email>> <timestamp> <tz>\t<message>".into(),
@@ -188,6 +189,23 @@ pub mod decode {
         }
     }
 
+    fn signature<'a, E: ParserError<&'a [u8]> + AddContext<&'a [u8], StrContext>>(
+        i: &mut &'a [u8],
+    ) -> ModalResult<gix_actor::SignatureRef<'a>, E> {
+        let start = i.checkpoint();
+        gix_actor::signature::decode(i).map_err(|err| {
+            ErrMode::Cut(E::from_input(i).add_context(i, &start, StrContext::Label(actor_error_label(err))))
+        })
+    }
+
+    fn actor_error_label(err: gix_actor::decode::Error) -> &'static str {
+        match err {
+            gix_actor::decode::Error::MissingClosingBracket => "Closing '>' not found",
+            gix_actor::decode::Error::MissingOpeningBracket => "Opening '<' not found",
+            gix_actor::decode::Error::DelimiterOverlap => "Skipped parts run into each other",
+        }
+    }
+
     #[cfg(test)]
     mod test {
         use super::*;