From ecf3838224ee9d800d103406dc3136d6eba50f91 Mon Sep 17 00:00:00 2001 From: Eduardo Trujillo <ed@chromabits.com> Date: Sat, 25 May 2024 23:28:20 +0000 Subject: [PATCH] refactor: Switch to tokio-tar from crates.io --- Cargo.lock | 21 ++++++++++++--------- Cargo.toml | 9 ++------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4a76f70..da46bd6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -386,9 +386,9 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" dependencies = [ "flate2", "futures-core", @@ -2114,9 +2114,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] @@ -2722,13 +2722,14 @@ dependencies = [ [[package]] name = "tokio-tar" -version = "0.3.0" -source = "git+https://github.com/vorot93/tokio-tar.git?rev=1bd30fbd1a219e8982571da48eb68f34317d1e15#1bd30fbd1a219e8982571da48eb68f34317d1e15" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" dependencies = [ "filetime", "futures-core", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "tokio", "tokio-stream", "xattr", @@ -3254,11 +3255,13 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 111461f..efcb8f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,8 +4,6 @@ version = "2.0.0" authors = ["Eduardo Trujillo <ed@chromabits.com>"] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] actix = "0.13" actix-files = "0.6" @@ -41,6 +39,7 @@ thiserror = "1.0" tokio-stream = "0.1" toml = "0.5" url = "2.5" +tokio-tar = "0.3.1" [dependencies.collective] git = "https://gitlab.chromabits.com/etcinit/collective.git" @@ -54,12 +53,8 @@ features = ["signal", "macros", "fs", "sync"] version = "0.7" features = ["codec"] -[dependencies.tokio-tar] -git = "https://github.com/vorot93/tokio-tar.git" -rev = "1bd30fbd1a219e8982571da48eb68f34317d1e15" - [dependencies.async-compression] -version = "0.3" +version = "0.4" features = ["gzip", "tokio"] [dev-dependencies] -- GitLab