From 81bd1483a9905df4cbd67eeaa98133e3264aefe9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Nov 2022 13:22:27 +0000
Subject: [PATCH] Bump zstd from 0.11.2+zstd.1.5.2 to 0.12.0+zstd.1.5.2 (#563)

* Bump zstd from 0.11.2+zstd.1.5.2 to 0.12.0+zstd.1.5.2

Bumps [zstd](https://github.com/gyscos/zstd-rs) from 0.11.2+zstd.1.5.2 to 0.12.0+zstd.1.5.2.
- [Release notes](https://github.com/gyscos/zstd-rs/releases)
- [Commits](https://github.com/gyscos/zstd-rs/commits)

---
updated-dependencies:
- dependency-name: zstd
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update comment in `binstalk-downloader/Cargo.toml`

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jiahao XU <Jiahao_XU@outlook.com>
---
 Cargo.lock                            | 25 ++++++++++++++++++++++---
 crates/binstalk-downloader/Cargo.toml |  7 ++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2a5bab8e..d2ad3332 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -170,7 +170,7 @@ dependencies = [
  "url",
  "xz2",
  "zip",
- "zstd",
+ "zstd 0.12.0+zstd.1.5.2",
 ]
 
 [[package]]
@@ -2781,7 +2781,7 @@ dependencies = [
  "crc32fast",
  "crossbeam-utils",
  "flate2",
- "zstd",
+ "zstd 0.11.2+zstd.1.5.2",
 ]
 
 [[package]]
@@ -2790,7 +2790,16 @@ version = "0.11.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
 dependencies = [
- "zstd-safe",
+ "zstd-safe 5.0.2+zstd.1.5.2",
+]
+
+[[package]]
+name = "zstd"
+version = "0.12.0+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8148aa921e9d53217ab9322f8553bd130f7ae33489db68b381d76137d2e6374"
+dependencies = [
+ "zstd-safe 6.0.2+zstd.1.5.2",
 ]
 
 [[package]]
@@ -2803,6 +2812,16 @@ dependencies = [
  "zstd-sys",
 ]
 
+[[package]]
+name = "zstd-safe"
+version = "6.0.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cf39f730b440bab43da8fb5faf5f254574462f73f260f85f7987f32154ff17"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
 [[package]]
 name = "zstd-sys"
 version = "2.0.1+zstd.1.5.2"
diff --git a/crates/binstalk-downloader/Cargo.toml b/crates/binstalk-downloader/Cargo.toml
index a6d0f28f..36d33615 100644
--- a/crates/binstalk-downloader/Cargo.toml
+++ b/crates/binstalk-downloader/Cargo.toml
@@ -44,9 +44,10 @@ xz2 = "0.1.7"
 zip = { version = "0.6.3", default-features = false, features = ["deflate", "bzip2", "zstd"] }
 
 # zstd is also depended by zip.
-# Since zip 0.6.3 depends on zstd 0.11, we also have to use 0.11 here,
-# otherwise there will be a link conflict.
-zstd = { version = "0.11.2", default-features = false }
+# Since zip 0.6.3 depends on zstd 0.11, we can use 0.12.0 here
+# because it uses the same zstd-sys version.
+# Otherwise there will be a link conflict.
+zstd = { version = "0.12.0", default-features = false }
 
 [features]
 default = ["static", "rustls"]