Merge #111

111: Update zstd dependencies r=Nemo157 a=paolobarbolini Co-authored-by: Paolo Barbolini <paolo@paolo565.org>
Nullus157 · Dec 24, 2020 · 7b4d3a5 · 7b4d3a5
2 parents e026326 + ce82e68
commit 7b4d3a5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,8 +46,8 @@ flate2 = { version = "1.0.11", optional = true }
 futures-core = { version = "0.3.0", default-features = false }
 futures-io = { version = "0.3.0", default-features = false, features = ["std"], optional = true }
 pin-project-lite = "0.2.0"
-libzstd = { package = "zstd", version = "0.5.0", optional = true, default-features = false }
-zstd-safe = { version = "2.0.0", optional = true, default-features = false }
+libzstd = { package = "zstd", version = "0.6.0", optional = true, default-features = false }
+zstd-safe = { version = "3.0.0", optional = true, default-features = false }
 memchr = "2.2.1"
 tokio-02 = { package = "tokio", version = "0.2.21", optional = true, default-features = false }
 tokio-03 = { package = "tokio", version = "0.3.0", optional = true, default-features = false }

diff --git a/src/codec/zstd/decoder.rs b/src/codec/zstd/decoder.rs
@@ -5,7 +5,7 @@ use libzstd::stream::raw::{Decoder, Operation};
 
 #[derive(Debug)]
 pub struct ZstdDecoder {
-    decoder: Unshared<Decoder>,
+    decoder: Unshared<Decoder<'static>>,
 }
 
 impl ZstdDecoder {

diff --git a/src/codec/zstd/encoder.rs b/src/codec/zstd/encoder.rs
@@ -4,7 +4,7 @@ use std::io::Result;
 
 #[derive(Debug)]
 pub struct ZstdEncoder {
-    encoder: Unshared<Encoder>,
+    encoder: Unshared<Encoder<'static>>,
 }
 
 impl ZstdEncoder {