[ref] flexible and simple support for different hash lengths

Now we can (eventually) parse more hashes as differntiated by their length.

Sebastian Thiel committed 5 years ago

Commit 9c2edd51 parent 21f187e4 files · +34 −5Browse files

Showing the changes to git-object/src/immutable (1 of 4 files). Show all

Unified · Split

     matches!(b, b'0'..=b'9' | b'a'..=b'f')
 }
-pub(crate) fn hex_sha1<'a, E: ParseError<&'a [u8]>>(i: &'a [u8]) -> IResult<&'a [u8], &'a BStr, E> {
+pub fn hex_sha1<'a, E: ParseError<&'a [u8]>>(i: &'a [u8]) -> IResult<&'a [u8], &'a BStr, E> {
-    take_while_m_n(40usize, 40, is_hex_digit_lc)(i).map(|(i, o)| (i, o.as_bstr()))
+    take_while_m_n(
+        git_hash::Kind::shortest().len_in_hex(),
+        git_hash::Kind::longest().len_in_hex(),
+        is_hex_digit_lc,
+    )(i)
+    .map(|(i, hex)| (i, hex.as_bstr()))
 }
 pub(crate) fn signature<'a, E: ParseError<&'a [u8]> + ContextError<&'a [u8]>>(

Keyboard shortcuts