Bump zip from 0.6.6 to 2.1.3

mozilla · Jul 17, 2024 · e544cad · e544cad
1 parent 901923b
commit e544cad
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -102,7 +102,7 @@ uuid = { version = "1.9", features = ["v4"] }
 walkdir = "2"
 # by default which pulls in an outdated failure version
 which = { version = "6", default-features = false }
-zip = { version = "0.6", default-features = false }
+zip = { version = "2", default-features = false }
 zstd = "0.13"
 
 # dist-server only

diff --git a/src/cache/cache.rs b/src/cache/cache.rs
@@ -281,7 +281,7 @@ impl CacheWrite {
     {
         // We're going to declare the compression method as "stored",
         // but we're actually going to store zstd-compressed blobs.
-        let opts = FileOptions::default().compression_method(CompressionMethod::Stored);
+        let opts = FileOptions::<()>::default().compression_method(CompressionMethod::Stored);
         let opts = if let Some(mode) = mode {
             opts.unix_permissions(mode)
         } else {
@@ -312,7 +312,7 @@ impl CacheWrite {
 
     /// Finish writing data to the cache entry writer, and return the data.
     pub fn finish(self) -> Result<Vec<u8>> {
-        let CacheWrite { mut zip } = self;
+        let CacheWrite { zip } = self;
         let cur = zip.finish().context("Failed to finish cache entry zip")?;
         Ok(cur.into_inner())
     }