chore(deps): bump tokio to 1.0

rami3l · Dec 23, 2020 · b0ebf05 · b0ebf05
1 parent 3ee4509
commit b0ebf05
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ regex = "1.4.2"
 [dependencies]
 anyhow = "1.0.36"
 async-trait = "0.1.42"
-bytes = "0.6.0"
+bytes = "1.0.0"
 clap = "3.0.0-beta.2"
 colored = "2.0.0"
 confy = "0.4.0"
@@ -28,8 +28,9 @@ is-root = "0.1.2"
 lazy_static = "1.4.0"
 regex = { version = "1.4.2", default-features = false, features = ["std", "perf"] }
 serde = { version = "1.0.118", features = ["derive"] }
-tokio = { version = "0.3.6", features = ["io-std", "io-util", "macros", "process", "rt-multi-thread", "sync"] }
-tokio-util = { version = "0.5.1", features = ["codec"] }
+tokio = { version = "1.0.0", features = ["io-std", "io-util", "macros", "process", "rt-multi-thread", "sync"] }
+tokio-stream = "0.1.0"
+tokio-util = { version = "0.6.0", features = ["codec"] }
 which = "4.0.2"
 
 [profile.release]

diff --git a/src/exec.rs b/src/exec.rs
@@ -190,7 +190,7 @@ impl<S: AsRef<OsStr> + AsRef<str>> Cmd<S> {
             .take()
             .map(into_bytes)
             .ok_or_else(|| anyhow!("Child process did not have a handle to stderr"))?;
-        let mut merged_reader = tokio::stream::StreamExt::merge(stdout_reader, stderr_reader);
+        let mut merged_reader = tokio_stream::StreamExt::merge(stdout_reader, stderr_reader);
 
         let code: JoinHandle<Result<Option<i32>>> = tokio::spawn(async move {
             let status = child