diff --git a/3rd/if-watch/src/apple.rs b/3rd/if-watch/src/apple.rs index c3099a42c..36dd4b9e2 100644 --- a/3rd/if-watch/src/apple.rs +++ b/3rd/if-watch/src/apple.rs @@ -1,3 +1,5 @@ +#![allow(clippy::all)] + use crate::{IfEvent, IpNet, Ipv4Net, Ipv6Net}; use core_foundation::array::CFArray; use core_foundation::runloop::{kCFRunLoopCommonModes, CFRunLoop}; diff --git a/Cargo.lock b/Cargo.lock index 74b1a1625..a8d41eea3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -199,6 +199,15 @@ dependencies = [ "backtrace", ] +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arc-swap" version = "1.7.1" @@ -1476,6 +1485,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.77", +] + [[package]] name = "destructure_traitobject" version = "0.2.0" @@ -3651,6 +3671,12 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + [[package]] name = "log" version = "0.4.22" @@ -5313,6 +5339,12 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "skeptic" version = "0.13.7" @@ -7117,14 +7149,33 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.6" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ - "byteorder", + "arbitrary", "crc32fast", "crossbeam-utils", + "displaydoc", "flate2", + "indexmap 2.5.0", + "memchr", + "thiserror", + "zopfli", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", ] [[package]] diff --git a/exo/Cargo.toml b/exo/Cargo.toml index e853a0434..ec5562cde 100644 --- a/exo/Cargo.toml +++ b/exo/Cargo.toml @@ -36,4 +36,4 @@ tempfile = "3.12.0" thiserror = "1.0.63" tokio = { version = "1.40.0", features = ["macros"], default-features = false } url = "2.5.2" -zip = { version = "0.6.6", features = ["deflate"], default-features = false } +zip = { version = "2.2.0", features = ["deflate"], default-features = false } diff --git a/exo/src/app.rs b/exo/src/app.rs index f68015a32..5cebe895c 100644 --- a/exo/src/app.rs +++ b/exo/src/app.rs @@ -14,7 +14,7 @@ use exocore_core::{ }; use exocore_protos::{apps::Manifest, core::CellApplicationConfig}; use tempfile::{tempdir_in, TempDir}; -use zip::write::FileOptions; +use zip::write::SimpleFileOptions; use crate::{ term::{print_action, print_error, print_info, print_success, print_warning, style_value}, @@ -110,7 +110,7 @@ fn cmd_package(_ctx: &Context, _app_opts: &AppOptions, pkg_opts: &PackageOptions let mut zip_archive = zip::ZipWriter::new(zip_file_buf); zip_archive - .start_file("app.yaml", FileOptions::default()) + .start_file("app.yaml", SimpleFileOptions::default()) .expect("Couldn't start zip file"); manifest .write_yaml(&mut zip_archive) @@ -118,7 +118,7 @@ fn cmd_package(_ctx: &Context, _app_opts: &AppOptions, pkg_opts: &PackageOptions if let Some(module) = &manifest.module { zip_archive - .start_file(&module.file, FileOptions::default()) + .start_file(&module.file, SimpleFileOptions::default()) .expect("Couldn't start zip file"); let mut module_file = File::open(&module.file).expect("Couldn't open app module"); @@ -128,7 +128,7 @@ fn cmd_package(_ctx: &Context, _app_opts: &AppOptions, pkg_opts: &PackageOptions for schema in &manifest.schemas { if let Some(exocore_protos::apps::manifest_schema::Source::File(file)) = &schema.source { zip_archive - .start_file(file, FileOptions::default()) + .start_file(file, SimpleFileOptions::default()) .expect("Couldn't start zip file"); let abs_file = app_dir.join(file);