Merge pull request #149 from kpcyrd/xz

Refactor xz/lzma decompression code
kpcyrd · Nov 11, 2024 · c4863fc · c4863fc
2 parents e024e74 + d5c5b71
commit c4863fc
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 106 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
@@ -25,7 +25,7 @@ diesel = { version = "1.4.8", features = ["sqlite", "r2d2", "chrono"] }
 diesel_migrations = { version = "1.4.0", features = ["sqlite"] }
 dirs-next = "2.0.0"
 dotenv = "0.15.0"
-env_logger = "0.10"
+env_logger = "0.11"
 log = "0.4.17"
 rand = "0.8.5"
 rebuilderd-common = { version= "=0.20.0", path="../common" }

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 [dependencies]
 actix-web = "4.1.0"
 colored = "2.0.0"
-env_logger = "0.9.0"
+env_logger = "0.11"
 futures = "0.3.21"
 rebuilderd = { version= "=0.20.0", path="../daemon" }
 rebuilderd-common = { version= "=0.20.0", path="../common" }

diff --git a/tools/Cargo.toml b/tools/Cargo.toml
@@ -18,25 +18,24 @@ assets = [
 [dependencies]
 rebuilderd-common = { version= "=0.20.0", path="../common" }
 structopt = "0.3.26"
-env_logger = "0.9.0"
+env_logger = "0.11"
 reqwest = { version="0.11.11", features=["json"] }
 chrono = { version = "0.4.19", features=["serde"] }
-rust-lzma = "0.5.1"
 tar = "0.4.38"
 flate2 = "1.0.24"
 serde = { version="1.0.137", features=["derive"] }
 serde_json = "1.0.81"
 colored = "2.0.0"
-toml = "0.5.9"
+toml = "0.8"
 dirs-next = "2.0.0"
 glob = "0.3.0"
 nom = "7.1.1"
 tokio = { version="1.19.2", features=["macros", "rt-multi-thread", "io-std", "io-util"] }
 atty = "0.2.14"
 tree_magic_mini = "3.0.3"
 bzip2 = "0.4.3"
-xz = "0.1.0"
-zstd = { version = "0.11.2", features = ["pkg-config"] }
+xz2 = "0.1"
+zstd = { version = "0.13", features = ["pkg-config"] }
 regex = "1.5.6"
 url = "2.2.2"