Merge branch 'async-work'

gyscos · Apr 25, 2017 · 25a2260 · 25a2260
2 parents 423d7d4 + 5515759
commit 25a2260
Show file tree

Hide file tree

Showing 4 changed files with 436 additions and 45 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,8 @@ travis-ci = { repository = "gyscos/zstd-rs" }
 [dependencies]
 libc = "0.2"
 zstd-sys = { path="zstd-sys", version = "1.1.5-a", default-features = false }
+tokio-io = { version = "0.1", optional = true }
+futures = { version = "0.1", optional = true }
 
 [dev-dependencies]
 clap = "2.6.0"
@@ -24,3 +26,4 @@ clap = "2.6.0"
 default = ["legacy"]
 legacy = ["zstd-sys/legacy"]
 bindgen = ["zstd-sys/bindgen"]
+tokio = ["tokio-io", "futures"]
diff --git a/src/lib.rs b/src/lib.rs
@@ -31,6 +31,13 @@ pub mod stream;
 pub mod block;
 pub mod dict;
 
+#[cfg(feature = "tokio")]
+#[macro_use]
+extern crate tokio_io;
+#[cfg(feature = "tokio")]
+extern crate futures;
+
+
 use std::ffi::CStr;
 
 use std::io;