Minor cleanup possible with 0.5

Author: epage

gix-object/src/commit/decode.rs

@@ -19,7 +19,7 @@ pub fn message<'a, E: ParserError<&'a [u8]> + AddContext<&'a [u8]>>(i: &mut &'a
         // newline + [message]
         return Err(
             winnow::error::ErrMode::from_error_kind(i, winnow::error::ErrorKind::Eof)
-                .map(|err: E| err.add_context(i, "newline + <message>")),
+                .add_context(i, "newline + <message>"),
         );
     }
     preceded(NL, rest.map(ByteSlice::as_bstr))

gix-object/src/lib.rs

@@ -280,18 +280,14 @@ pub mod decode {
 
         impl<'a> From<winnow::error::ErrMode<ParseError<'a>>> for Error {
             fn from(v: winnow::error::ErrMode<ParseError<'a>>) -> Self {
+                let err = v.into_inner().expect("we don't have streaming parsers");
                 Error {
-                    inner: match v {
-                        winnow::error::ErrMode::Backtrack(err) | winnow::error::ErrMode::Cut(err) => {
-                            winnow::error::VerboseError {
-                                errors: err
-                                    .errors
-                                    .into_iter()
-                                    .map(|(i, v)| (i.as_bstr().to_owned(), v))
-                                    .collect(),
-                            }
-                        }
-                        winnow::error::ErrMode::Incomplete(_) => unreachable!("we don't have streaming parsers"),
+                    inner: winnow::error::VerboseError {
+                        errors: err
+                            .errors
+                            .into_iter()
+                            .map(|(i, v)| (i.as_bstr().to_owned(), v))
+                            .collect(),
                     },
                 }
             }
@@ -325,12 +321,8 @@ pub mod decode {
 
         impl<'a> From<winnow::error::ErrMode<ParseError<'a>>> for Error {
             fn from(v: winnow::error::ErrMode<ParseError<'a>>) -> Self {
-                Error {
-                    inner: match v {
-                        winnow::error::ErrMode::Backtrack(err) | winnow::error::ErrMode::Cut(err) => err,
-                        winnow::error::ErrMode::Incomplete(_) => unreachable!("we don't have streaming parsers"),
-                    },
-                }
+                let err = v.into_inner().expect("we don't have streaming parsers");
+                Error { inner: err }
             }
         }
 

tests/tools/src/lib.rs

@@ -695,10 +695,7 @@ fn extract_archive(
 pub fn to_bstr_err<'i>(
     err: winnow::error::ErrMode<VerboseError<&'i [u8], &'static str>>,
 ) -> VerboseError<&'i BStr, &'static str> {
-    let err = match err {
-        winnow::error::ErrMode::Backtrack(err) | winnow::error::ErrMode::Cut(err) => err,
-        winnow::error::ErrMode::Incomplete(_) => unreachable!("not a streaming parser"),
-    };
+    let err = err.into_inner().expect("not a streaming parser");
     err.map_input(ByteSlice::as_bstr)
 }