chore: Bump zip to 3.0.0

Cargo.toml

@@ -27,17 +27,17 @@ anyhow = "1.0.97"
 archspec = "0.1.3"
 assert_matches = "1.5.0"
 async-compression = { version = "0.4.19", features = [
-    "gzip",
-    "tokio",
-    "bzip2",
-    "zstd",
+  "gzip",
+  "tokio",
+  "bzip2",
+  "zstd",
 ] }
 async-fd-lock = "0.2.0"
 fs4 = "0.13.1"
 async-trait = "0.1.88"
 axum = { version = "0.8.1", default-features = false, features = [
-    "tokio",
-    "http1",
+  "tokio",
+  "http1",
 ] }
 base64 = "0.22.1"
 bindgen = "0.71.1"
@@ -47,9 +47,9 @@ bzip2 = "0.5.2"
 cache_control = "0.2.0"
 cfg-if = "1.0"
 chrono = { version = "0.4.40", default-features = false, features = [
-    "std",
-    "serde",
-    "alloc",
+  "std",
+  "serde",
+  "alloc",
 ] }
 clap = { version = "4.5.34", features = ["derive"] }
 clap-verbosity-flag = "3.0.1"
@@ -74,15 +74,15 @@ glob = "0.3.2"
 google-cloud-auth = { version = "0.17.2", default-features = false }
 google-cloud-token = "0.1.2"
 aws-config = { version = "=1.5.18", default-features = false, features = [
-    "rt-tokio",
-    "rustls",
-    "sso",
-    "credentials-process",
+  "rt-tokio",
+  "rustls",
+  "sso",
+  "credentials-process",
 ] }
 aws-sdk-s3 = { version = "1.82.0", default-features = false, features = [
-    "rt-tokio",
-    "rustls",
-    "sigv4a",
+  "rt-tokio",
+  "rustls",
+  "sigv4a",
 ] }
 hex = "0.4.3"
 hex-literal = "0.4.1"
@@ -142,10 +142,10 @@ sha2 = "0.10.8"
 shlex = "1.3.0"
 similar-asserts = "1.6.1"
 smallvec = { version = "1.15.0", features = [
-    "serde",
-    "const_new",
-    "const_generics",
-    "union",
+  "serde",
+  "const_new",
+  "const_generics",
+  "union",
 ] }
 strum = { version = "0.27.0", features = ["derive"] }
 superslice = "1.0.0"
@@ -175,7 +175,7 @@ wasmtimer = "0.4.1"
 which = "7.0.2"
 windows-sys = { version = "0.59.0", default-features = false }
 winver = { version = "1.0.0" }
-zip = { version = "2.6.1", default-features = false }
+zip = { version = "3.0.0", default-features = false }
 zstd = { version = "0.13.3", default-features = false }
 
 # These are the all the crates defined in the workspace. We pin all of them together because they are always updated in tendem.

crates/rattler_cache/src/run_exports_cache/mod.rs

@@ -416,7 +416,7 @@ mod test {
         // so we expect the cache to return None
         let package_url = Url::parse("https://conda.anaconda.org/robostack/linux-64/ros-noetic-rosbridge-suite-0.11.14-py39h6fdeb60_14.tar.bz2").unwrap();
 
-        let cache_dir = tempdir().unwrap().into_path();
+        let cache_dir = tempdir().unwrap().keep();
 
         let cache = RunExportsCache::new(&cache_dir);
 
@@ -460,7 +460,7 @@ mod test {
             Url::parse("https://repo.prefix.dev/conda-forge/linux-64/zlib-1.3.1-hb9d3cd8_2.conda")
                 .unwrap();
 
-        let cache_dir = tempdir().unwrap().into_path();
+        let cache_dir = tempdir().unwrap().keep();
 
         let cache = RunExportsCache::new(&cache_dir);
 
@@ -702,7 +702,7 @@ mod test {
         .await
         .unwrap();
 
-        let cache_dir = tempdir().unwrap().into_path();
+        let cache_dir = tempdir().unwrap().keep();
 
         let cache = RunExportsCache::new(&cache_dir);
 

crates/rattler_conda_types/src/package/about.rs

@@ -122,7 +122,7 @@ mod test {
         .unwrap();
         rattler_package_streaming::fs::extract(&package_path, package_dir.path()).unwrap();
 
-        let package_dir = package_dir.into_path();
+        let package_dir = package_dir.keep();
         println!("{}", package_dir.display());
 
         insta::assert_yaml_snapshot!(AboutJson::from_package_directory(&package_dir).unwrap());

crates/rattler_conda_types/src/package/index.rs

@@ -130,7 +130,7 @@ mod test {
         .unwrap();
         rattler_package_streaming::fs::extract(&package_path, package_dir.path()).unwrap();
 
-        let package_dir = package_dir.into_path();
+        let package_dir = package_dir.keep();
         println!("{}", package_dir.display());
 
         insta::assert_yaml_snapshot!(IndexJson::from_package_directory(&package_dir).unwrap());

crates/rattler_conda_types/src/package/paths.rs

@@ -311,7 +311,7 @@ mod test {
         .unwrap();
         rattler_package_streaming::fs::extract(&package_path, package_dir.path()).unwrap();
 
-        let package_dir = package_dir.into_path();
+        let package_dir = package_dir.keep();
         println!("{}", package_dir.display());
 
         insta::assert_yaml_snapshot!(

crates/rattler_conda_types/src/package/run_exports.rs

@@ -78,7 +78,7 @@ mod test {
         .unwrap();
         rattler_package_streaming::fs::extract(&package_path, package_dir.path()).unwrap();
 
-        let package_dir = package_dir.into_path();
+        let package_dir = package_dir.keep();
         println!("{}", package_dir.display());
 
         insta::assert_yaml_snapshot!(RunExportsJson::from_package_directory(&package_dir).unwrap());

crates/rattler_menuinst/src/linux.rs

@@ -572,7 +572,7 @@ impl LinuxMenu {
         if xdg_mime(&file_path, self.mode, XdgMimeOperation::Install).is_ok() {
             // keep temp dir in prefix around and the temp file
             // because we re-use it when unregistering the mime type.
-            let _ = temp_dir.into_path();
+            let _ = temp_dir.keep();
             tracker.registered_mime_files.push(file_path);
         } else {
             if let Some(parent) = xml_path.parent() {

crates/rattler_menuinst/src/macos.rs

@@ -851,8 +851,8 @@ mod tests {
         pub fn new_test() -> Self {
             // Create a temporary directory for testing
             Self {
-                location: tempfile::tempdir().unwrap().into_path(),
-                nested_location: tempfile::tempdir().unwrap().into_path(),
+                location: tempfile::tempdir().unwrap().keep(),
+                nested_location: tempfile::tempdir().unwrap().keep(),
             }
         }
     }

crates/rattler_repodata_gateway/src/fetch/with_cache.rs

@@ -1103,7 +1103,7 @@ mod test {
         let result = fetch_repo_data(
             server.url(),
             ClientWithMiddleware::from(Client::new()),
-            cache_dir.into_path(),
+            cache_dir.keep(),
             FetchRepoDataOptions::default(),
             None,
         )
@@ -1170,7 +1170,7 @@ mod test {
         let CachedRepoData { cache_result, .. } = fetch_repo_data(
             server.url(),
             ClientWithMiddleware::from(Client::new()),
-            cache_dir.into_path(),
+            cache_dir.keep(),
             FetchRepoDataOptions::default(),
             None,
         )
@@ -1199,7 +1199,7 @@ mod test {
         let result = fetch_repo_data(
             server.url(),
             ClientWithMiddleware::from(Client::new()),
-            cache_dir.into_path(),
+            cache_dir.keep(),
             FetchRepoDataOptions::default(),
             None,
         )
@@ -1241,7 +1241,7 @@ mod test {
         let result = fetch_repo_data(
             server.url(),
             ClientWithMiddleware::from(Client::new()),
-            cache_dir.into_path(),
+            cache_dir.keep(),
             FetchRepoDataOptions::default(),
             None,
         )
@@ -1290,7 +1290,7 @@ mod test {
         let result = fetch_repo_data(
             server.url(),
             ClientWithMiddleware::from(Client::new()),
-            cache_dir.into_path(),
+            cache_dir.keep(),
             FetchRepoDataOptions::default(),
             None,
         )
@@ -1345,7 +1345,7 @@ mod test {
         let result = fetch_repo_data(
             server.url(),
             authenticated_client,
-            cache_dir.into_path(),
+            cache_dir.keep(),
             FetchRepoDataOptions::default(),
             None,
         )
@@ -1393,7 +1393,7 @@ mod test {
         let _result = fetch_repo_data(
             server.url(),
             ClientWithMiddleware::from(Client::new()),
-            cache_dir.into_path(),
+            cache_dir.keep(),
             FetchRepoDataOptions::default(),
             Some(reporter.clone()),
         )
@@ -1416,7 +1416,7 @@ mod test {
             Url::parse(format!("file://{}", subdir_path.path().to_str().unwrap()).as_str())
                 .unwrap(),
             ClientWithMiddleware::from(Client::new()),
-            cache_dir.into_path(),
+            cache_dir.keep(),
             FetchRepoDataOptions::default(),
             None,
         )
@@ -1438,7 +1438,7 @@ mod test {
         let result = fetch_repo_data(
             server.url(),
             ClientWithMiddleware::from(Client::new()),
-            cache_dir.into_path(),
+            cache_dir.keep(),
             FetchRepoDataOptions::default(),
             None,
         )