refactor and fixes

Author: Byron

gix-object/src/tree/ref_iter.rs

@@ -144,7 +144,7 @@ mod decode {
         let mode = tree::EntryMode::try_from(mode).ok()?;
         let (filename, i) = i.split_at(i.find_byte(0)?);
         let i = &i[1..];
-        const HASH_LEN_FIXME: usize = 20; // TODO: know actual /desired length or we may overshoot
+        const HASH_LEN_FIXME: usize = 20; // TODO(SHA256): know actual/desired length or we may overshoot
         let (oid, i) = match i.len() {
             len if len < HASH_LEN_FIXME => return None,
             _ => i.split_at(20),
@@ -164,7 +164,7 @@ mod decode {
             terminated(take_while(5..=6, AsChar::is_dec_digit), SPACE)
                 .verify_map(|mode| tree::EntryMode::try_from(mode).ok()),
             terminated(take_while(1.., |b| b != NULL[0]), NULL),
-            take(20u8),
+            take(20u8), // TODO(SHA256): make this compatible with other hash lengths
         )
             .map(|(mode, filename, oid): (_, &[u8], _)| EntryRef {
                 mode,

tests/tools/src/lib.rs

@@ -19,7 +19,6 @@ pub use once_cell;
 use once_cell::sync::Lazy;
 use parking_lot::Mutex;
 pub use tempfile;
-use winnow::error::TreeError;
 
 /// A result type to allow using the try operator `?` in unit tests.
 ///
@@ -691,10 +690,10 @@ fn extract_archive(
     Ok((archive_identity, platform))
 }
 
-/// Transform a verbose bom errors from raw bytes into a `BStr` to make printing/debugging human-readable.
+/// Transform a verbose parser errors from raw bytes into a `BStr` to make printing/debugging human-readable.
 pub fn to_bstr_err(
-    err: winnow::error::ErrMode<TreeError<&[u8], winnow::error::StrContext>>,
-) -> TreeError<&BStr, winnow::error::StrContext> {
+    err: winnow::error::ErrMode<winnow::error::TreeError<&[u8], winnow::error::StrContext>>,
+) -> winnow::error::TreeError<&BStr, winnow::error::StrContext> {
     let err = err.into_inner().expect("not a streaming parser");
     err.map_input(ByteSlice::as_bstr)
 }