Refactor gix-object parsers to look more winnow-ish

Author: epage

gix-object/src/commit/mod.rs

@@ -1,6 +1,7 @@
 use std::ops::Range;
 
 use bstr::{BStr, BString, ByteSlice};
+use winnow::prelude::*;
 
 use crate::{Commit, CommitRef, TagRef};
 
@@ -60,7 +61,9 @@ mod write;
 impl<'a> CommitRef<'a> {
     /// Deserialize a commit from the given `data` bytes while avoiding most allocations.
     pub fn from_bytes(mut data: &'a [u8]) -> Result<CommitRef<'a>, crate::decode::Error> {
-        decode::commit(&mut data).map_err(crate::decode::Error::with_err)
+        decode::commit
+            .parse_next(&mut data)
+            .map_err(crate::decode::Error::with_err)
     }
 }
 

gix-object/src/tag/mod.rs

@@ -1,3 +1,5 @@
+use winnow::prelude::*;
+
 use crate::TagRef;
 
 mod decode;
@@ -11,7 +13,9 @@ pub mod ref_iter;
 impl<'a> TagRef<'a> {
     /// Deserialize a tag from `data`.
     pub fn from_bytes(mut data: &'a [u8]) -> Result<TagRef<'a>, crate::decode::Error> {
-        decode::git_tag(&mut data).map_err(crate::decode::Error::with_err)
+        decode::git_tag
+            .parse_next(&mut data)
+            .map_err(crate::decode::Error::with_err)
     }
     /// The object this tag points to as `Id`.
     pub fn target(&self) -> gix_hash::ObjectId {

gix-object/src/tree/ref_iter.rs

@@ -2,6 +2,7 @@ use std::convert::TryFrom;
 
 use bstr::BStr;
 use winnow::error::ParserError;
+use winnow::prelude::*;
 
 use crate::{tree, tree::EntryRef, TreeRef, TreeRefIter};
 
@@ -15,7 +16,9 @@ impl<'a> TreeRefIter<'a> {
 impl<'a> TreeRef<'a> {
     /// Deserialize a Tree from `data`.
     pub fn from_bytes(mut data: &'a [u8]) -> Result<TreeRef<'a>, crate::decode::Error> {
-        decode::tree(&mut data).map_err(crate::decode::Error::with_err)
+        decode::tree
+            .parse_next(&mut data)
+            .map_err(crate::decode::Error::with_err)
     }
 
     /// Find an entry named `name` knowing if the entry is a directory or not, using a binary search.