adapt to changes in gix-hash

Author: Byron

gix-commitgraph/src/file/verify.rs

@@ -147,7 +147,7 @@ impl File {
         let data_len_without_trailer = self.data.len() - self.hash_len;
         let mut hasher = gix_features::hash::hasher(self.object_hash());
         hasher.update(&self.data[..data_len_without_trailer]);
-        let actual = gix_hash::ObjectId::from(hasher.digest().as_ref());
+        let actual = gix_hash::ObjectId::from_bytes_or_panic(hasher.digest().as_ref());
 
         let expected = self.checksum();
         if actual == expected {

gix-index/src/decode/entries.rs

@@ -156,7 +156,7 @@ fn load_one<'a>(
                 gid,
                 size,
             },
-            id: gix_hash::ObjectId::from(hash),
+            id: gix_hash::ObjectId::from_bytes_or_panic(hash),
             flags: flags & !entry::Flags::PATH_LEN,
             // This forces us to add the bits we need before being able to use them.
             mode: entry::Mode::from_bits_truncate(mode),

gix-index/src/decode/mod.rs

@@ -213,7 +213,7 @@ impl State {
             });
         }
 
-        let checksum = gix_hash::ObjectId::from(data);
+        let checksum = gix_hash::ObjectId::from_bytes_or_panic(data);
         let checksum = (!checksum.is_null()).then_some(checksum);
         if let Some((expected_checksum, actual_checksum)) = expected_checksum.zip(checksum) {
             if actual_checksum != expected_checksum {

gix-index/src/extension/link.rs

@@ -43,7 +43,7 @@ pub(crate) fn decode(data: &[u8], object_hash: gix_hash::Kind) -> Result<Link, d
         .ok_or(decode::Error::Corrupt(
             "link extension too short to read share index checksum",
         ))
-        .map(|(id, d)| (gix_hash::ObjectId::from(id), d))?;
+        .map(|(id, d)| (gix_hash::ObjectId::from_bytes_or_panic(id), d))?;
 
     if data.is_empty() {
         return Ok(Link {

gix-index/src/extension/resolve_undo.rs

@@ -51,7 +51,7 @@ pub fn decode(mut data: &[u8], object_hash: gix_hash::Kind) -> Option<Paths> {
             data = rest;
             *stage = Some(Stage {
                 mode: *mode,
-                id: ObjectId::from(hash),
+                id: ObjectId::from_bytes_or_panic(hash),
             });
         }
 

gix-index/src/extension/tree/decode.rs

@@ -29,7 +29,7 @@ fn one_recursive(data: &[u8], hash_len: usize) -> Option<(Tree, &[u8])> {
 
     let (id, mut data) = if num_entries >= 0 {
         let (hash, data) = split_at_pos(data, hash_len)?;
-        (ObjectId::from(hash), data)
+        (ObjectId::from_bytes_or_panic(hash), data)
     } else {
         (
             ObjectId::null(gix_hash::Kind::from_hex_len(hash_len * 2).expect("valid hex_len")),

gix-index/src/extension/untracked_cache.rs

@@ -100,7 +100,7 @@ pub fn decode(data: &[u8], object_hash: gix_hash::Kind) -> Option<UntrackedCache
     hash_valid.for_each_set_bit(|index| {
         let (hash, rest) = split_at_pos(data, hash_len)?;
         data = rest;
-        directories[index].exclude_file_oid = ObjectId::from(hash).into();
+        directories[index].exclude_file_oid = ObjectId::from_bytes_or_panic(hash).into();
         Some(())
     });
 
@@ -149,7 +149,7 @@ fn decode_oid_stat(data: &[u8], hash_len: usize) -> Option<(OidStat, &[u8])> {
     Some((
         OidStat {
             stat,
-            id: ObjectId::from(hash),
+            id: ObjectId::from_bytes_or_panic(hash),
         },
         data,
     ))

gix-index/src/file/init.rs

@@ -71,7 +71,8 @@ impl File {
                 // index files, we choose more safety here just like git does and don't even try to decode the index if the hashes
                 // don't match.
                 // Thanks to `skip_hash`, we can get performance and it's under caller control, at the cost of some safety.
-                let expected = gix_hash::ObjectId::from(&data[data.len() - object_hash.len_in_bytes()..]);
+                let expected =
+                    gix_hash::ObjectId::from_bytes_or_panic(&data[data.len() - object_hash.len_in_bytes()..]);
                 if !expected.is_null() {
                     let _span = gix_features::trace::detail!("gix::open_index::hash_index", path = ?path);
                     let meta = file.metadata()?;

gix-pack/src/data/entry/decode.rs

@@ -27,7 +27,7 @@ impl data::Entry {
             }
             REF_DELTA => {
                 let delta = RefDelta {
-                    base_id: gix_hash::ObjectId::from(&d[consumed..][..hash_len]),
+                    base_id: gix_hash::ObjectId::from_bytes_or_panic(&d[consumed..][..hash_len]),
                 };
                 consumed += hash_len;
                 delta
@@ -69,7 +69,7 @@ impl data::Entry {
                 r.read_exact(hash)?;
                 #[allow(clippy::redundant_slicing)]
                 let delta = RefDelta {
-                    base_id: gix_hash::ObjectId::from(&hash[..]),
+                    base_id: gix_hash::ObjectId::from_bytes_or_panic(&hash[..]),
                 };
                 consumed += hash_len;
                 delta

gix-pack/src/data/file/verify.rs

@@ -14,7 +14,7 @@ pub mod checksum {
 impl File {
     /// The checksum in the trailer of this pack data file
     pub fn checksum(&self) -> gix_hash::ObjectId {
-        gix_hash::ObjectId::from(&self.data[self.data.len() - self.hash_len..])
+        gix_hash::ObjectId::from_bytes_or_panic(&self.data[self.data.len() - self.hash_len..])
     }
 
     /// Verifies that the checksum of the packfile over all bytes preceding it indeed matches the actual checksum,