diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 76e4d4083..3a586f74b 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -148,6 +148,15 @@ version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arboard" version = "3.3.2" @@ -1489,6 +1498,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.57", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1573,6 +1593,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.57", +] + [[package]] name = "dns-lookup" version = "2.0.4" @@ -8140,14 +8171,17 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.6" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "c700ea425e148de30c29c580c1f9508b93ca57ad31c9f4e96b83c194c37a7a8f" dependencies = [ - "byteorder", + "arbitrary", "crc32fast", "crossbeam-utils", + "displaydoc", "flate2", + "indexmap 2.2.6", + "thiserror", "time", ] diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml index 2c9ab0c95..59704ccbb 100644 --- a/rust/gui-client/src-tauri/Cargo.toml +++ b/rust/gui-client/src-tauri/Cargo.toml @@ -50,7 +50,7 @@ tracing-panic = "0.1.2" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } url = { version = "2.5.0", features = ["serde"] } uuid = { version = "1.7.0", features = ["v4"] } -zip = { version = "0.6.6", features = ["deflate", "time"], default-features = false } +zip = { version = "1.2.3", features = ["deflate", "time"], default-features = false } [target.'cfg(target_os = "linux")'.dependencies] dirs = "5.0.1" diff --git a/rust/gui-client/src-tauri/src/client/logging.rs b/rust/gui-client/src-tauri/src/client/logging.rs index e597e899a..79f7ff133 100644 --- a/rust/gui-client/src-tauri/src/client/logging.rs +++ b/rust/gui-client/src-tauri/src/client/logging.rs @@ -178,7 +178,7 @@ fn add_dir_to_zip( src_dir: &Path, dst_stem: &Path, ) -> Result<()> { - let options = zip::write::FileOptions::default(); + let options = zip::write::SimpleFileOptions::default(); for entry in fs::read_dir(src_dir).context("Failed to `read_dir` log dir")? { let entry = entry.context("Got bad entry from `read_dir`")?; let Some(path) = dst_stem