feat(utils): Add support for object >= 0.33

Author: cryptomilk

Cargo.lock

@@ -63,7 +63,7 @@ memchr = "2"
 memmap2 = "0.9.4"
 mime = "0.3"
 number_prefix = "0.4"
-object = "0.32"
+object = "0.36"
 once_cell = "1.19"
 opendal = { version = "0.52.0", optional = true, default-features = false }
 openssl = { version = "0.10.72", optional = true }

Cargo.toml

@@ -17,7 +17,8 @@ use blake3::Hasher as blake3_Hasher;
 use byteorder::{BigEndian, ByteOrder};
 use fs::File;
 use fs_err as fs;
-use object::{macho, read::archive::ArchiveFile, read::macho::FatArch};
+use object::read::archive::ArchiveFile;
+use object::read::macho::{FatArch, MachOFatFile32, MachOFatFile64};
 use serde::{Deserialize, Serialize};
 use std::cell::Cell;
 use std::ffi::{OsStr, OsString};
@@ -356,20 +357,19 @@ pub async fn hash_all_archives(
             let archive_mmap =
                 unsafe { memmap2::MmapOptions::new().map_copy_read_only(&archive_file)? };
 
-            match macho::FatHeader::parse(&*archive_mmap) {
-                Ok(h) if h.magic.get(object::endian::BigEndian) == macho::FAT_MAGIC => {
-                    for arch in macho::FatHeader::parse_arch32(&*archive_mmap)? {
-                        hash_regular_archive(&mut m, arch.data(&*archive_mmap)?)?;
-                    }
+            if let Ok(fat) = MachOFatFile32::parse(&*archive_mmap) {
+                for arch in fat.arches() {
+                    hash_regular_archive(&mut m, arch.data(&*archive_mmap)?)?;
                 }
-                Ok(h) if h.magic.get(object::endian::BigEndian) == macho::FAT_MAGIC_64 => {
-                    for arch in macho::FatHeader::parse_arch64(&*archive_mmap)? {
-                        hash_regular_archive(&mut m, arch.data(&*archive_mmap)?)?;
-                    }
+            } else if let Ok(fat) = MachOFatFile64::parse(&*archive_mmap) {
+                for arch in fat.arches() {
+                    hash_regular_archive(&mut m, arch.data(&*archive_mmap)?)?;
                 }
+            } else {
                 // Not a FatHeader at all, regular archive.
-                _ => hash_regular_archive(&mut m, &archive_mmap)?,
+                hash_regular_archive(&mut m, &archive_mmap)?;
             }
+
             Ok(m.finish())
         })
     });