Merge pull request #29 from Pr0methean/master

Replace zip with zip_next
rustwasm · Jul 1, 2024 · 559f005 · 559f005
2 parents b32d7ea + 1e7b59c
commit 559f005
Show file tree

Hide file tree

Showing 3 changed files with 102 additions and 62 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ hex = "0.4"
 is_executable = "0.1"
 siphasher = "0.3"
 tar = "0.4"
-zip = "0.6"
+zip_next = "1.0"
 
 [dev-dependencies]
 tempfile = "3.1"
diff --git a/src/lib.rs b/src/lib.rs
@@ -277,7 +277,7 @@ impl Cache {
         let mut binaries: HashSet<_> = binaries.iter().copied().collect();
 
         let data = io::Cursor::new(zip);
-        let mut zip = zip::ZipArchive::new(data)?;
+        let mut zip = zip_next::ZipArchive::new(data)?;
 
         for i in 0..zip.len() {
             let mut entry = zip.by_index(i).unwrap();
@@ -286,7 +286,7 @@ impl Cache {
                 None => continue,
             };
 
-            let dest = match self.extract_binary(entry_path, dst, &mut binaries) {
+            let dest = match self.extract_binary(&entry_path, dst, &mut binaries) {
                 Some(dest) => dest,
                 _ => continue,
             };