diff --git a/Cargo.lock b/Cargo.lock index f7d2cf2..4fecb2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,22 +94,23 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.1" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" dependencies = [ "futures-core", "futures-io", "memchr", "pin-project-lite", - "zstd 0.12.4", - "zstd-safe 6.0.6", + "zstd 0.11.2+zstd.1.5.2", + "zstd-safe 5.0.2+zstd.1.5.2", ] [[package]] name = "async-compression" version = "0.4.1" -source = "git+https://github.com/Nullus157/async-compression?rev=4fd4c42#4fd4c428ded304c019c0ebcf40149af87b038ab8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" dependencies = [ "futures-core", "memchr", @@ -155,11 +156,13 @@ dependencies = [ [[package]] name = "async_zip" version = "0.0.15" -source = "git+https://github.com/Majored/rs-async-zip?rev=ff0d985#ff0d985ef54cf00d73c497dbca0beea7541e37dc" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "795310de3218cde15219fc98c1cf7d8fe9db4865aab27fcf1d535d6cb61c6b54" dependencies = [ - "async-compression 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "async-compression 0.3.15", "crc32fast", "futures-util", + "log", "pin-project", "thiserror", "tokio", @@ -340,9 +343,9 @@ dependencies = [ [[package]] name = "chgk_ledb_lib" -version = "1.1.0" +version = "1.2.0" dependencies = [ - "async-compression 0.4.1 (git+https://github.com/Nullus157/async-compression?rev=4fd4c42)", + "async-compression 0.4.1", "async-stream", "async_zip", "bincode", diff --git a/app_async/Cargo.toml b/app_async/Cargo.toml index 9efcccb..22e0fbe 100644 --- a/app_async/Cargo.toml +++ b/app_async/Cargo.toml @@ -12,7 +12,7 @@ description = "Утилита загружающая базу данных ЧГ [dependencies] chgk_ledb_lib = {path = "../lib", features = ["async", "convert_async"]} serde_json="1.0" -async_zip = { git = "https://github.com/Majored/rs-async-zip", rev = "ff0d985", features = [ +async_zip = { version = "0.0.15", features = [ "zstd", "tokio", "tokio-fs"] } diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 0fc98bd..a409f7c 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -47,7 +47,7 @@ serde_derive = "1.0" serde_json = "1.0" bincode = "^2.0.0-rc.2" zip = { version = "0.6", optional = true } -async_zip = { git = "https://github.com/Majored/rs-async-zip", rev = "ff0d985", features = [ +async_zip = { version = "0.0.15" , features = [ "zstd", "tokio", "tokio-fs", @@ -62,7 +62,7 @@ tokio = { version = "1", features = [ futures-core = { version = "0.3", optional = true } futures = { version = "0.3", optional = true } futures-util = { version = "0.3", optional = true } -async-compression = { git = "https://github.com/Nullus157/async-compression", rev = "4fd4c42", default-features = false, features = [ +async-compression = { version = "0.4.1", default-features = false, features = [ "zstd", "tokio", ], optional = true }