aboutsummaryrefslogtreecommitdiff
path: root/Cargo.lock
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2023-07-03 17:03:09 +0000
committerAlex <alex@adnab.me>2023-07-03 17:03:09 +0000
commit7605d0cb117d80e7140812e96264e86a4c987080 (patch)
tree6a07394f97f471edaa944cd29d65ff8417645c1f /Cargo.lock
parente716320b0a5d255027cbfb6e726eec18b82fb86f (diff)
parent031804171a72eb3bef8829e3f2972e5cb7738182 (diff)
downloadgarage-7605d0cb117d80e7140812e96264e86a4c987080.tar.gz
garage-7605d0cb117d80e7140812e96264e86a4c987080.zip
Merge pull request 'cargo: tokio-1.29 and async-compression-0.4' (#593) from jpds/garage:tokio-1.29 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/593
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock38
1 files changed, 10 insertions, 28 deletions
diff --git a/Cargo.lock b/Cargo.lock
index bae702f6..9515780d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -138,16 +138,16 @@ dependencies = [
[[package]]
name = "async-compression"
-version = "0.3.15"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a"
+checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11"
dependencies = [
"futures-core",
"memchr",
"pin-project-lite",
"tokio",
- "zstd 0.11.2+zstd.1.5.2",
- "zstd-safe 5.0.2+zstd.1.5.2",
+ "zstd",
+ "zstd-safe",
]
[[package]]
@@ -1308,7 +1308,7 @@ dependencies = [
"tokio",
"tokio-util 0.7.8",
"tracing",
- "zstd 0.12.3+zstd.1.5.2",
+ "zstd",
]
[[package]]
@@ -1350,7 +1350,7 @@ dependencies = [
"serde_bytes",
"tokio",
"tracing",
- "zstd 0.12.3+zstd.1.5.2",
+ "zstd",
]
[[package]]
@@ -3700,11 +3700,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.28.2"
+version = "1.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
+checksum = "374442f06ee49c3a28a8fc9f01a2596fed7559c6b99b31279c3261778e77d84f"
dependencies = [
"autocfg",
+ "backtrace",
"bytes",
"libc",
"mio",
@@ -4453,30 +4454,11 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
[[package]]
name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
-dependencies = [
- "zstd-safe 5.0.2+zstd.1.5.2",
-]
-
-[[package]]
-name = "zstd"
version = "0.12.3+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
dependencies = [
- "zstd-safe 6.0.5+zstd.1.5.4",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
+ "zstd-safe",
]
[[package]]