From 1259cc52c69050b79c1ff37645744ef1f83f2324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Sun, 23 Mar 2025 13:44:52 +0200 Subject: [PATCH] Use zip/deflate-flate2 to avoid BSL-1.0 dep --- Cargo.lock | 33 --------------------------------- xtask/Cargo.toml | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4a01a65857..5fb6cff0e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,12 +129,6 @@ dependencies = [ "loom", ] -[[package]] -name = "bumpalo" -version = "3.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" - [[package]] name = "camino" version = "1.1.9" @@ -1219,12 +1213,6 @@ 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.26" @@ -2196,12 +2184,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - [[package]] name = "smallvec" version = "1.14.0" @@ -3252,19 +3234,4 @@ dependencies = [ "memchr", "thiserror 2.0.12", "time", - "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", ] diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 41c38edc06..6195de5d20 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -14,7 +14,7 @@ write-json = "0.1.4" xshell.workspace = true xflags = "0.3.2" time = { version = "0.3", default-features = false } -zip = { version = "2.4", default-features = false, features = ["deflate", "time"] } +zip = { version = "2.4", default-features = false, features = ["deflate-flate2", "flate2", "time"] } stdx.workspace = true proc-macro2 = "1.0.94" quote = "1.0.40"