Update dependencies

crates/disk/Cargo.toml

@@ -13,25 +13,24 @@ serde_json = "1.0"
 serde_cbor = "0.11.1"
 http = "0.2"
 chrono = { version = "0.4.19", features = ["serde"] }
-tokio = { version = "1.21.2", features = ["rt-multi-thread", "io-util", "net", "time", "sync", "fs"] }
 tokio-stream = {version = "0.1.5", features = ["fs"]}
 hyper = { version = "0.14", features = ["http1", "http2", "client", "server", "tcp", "stream"] }
-async-channel = "1.8.0"
+async-channel = "1.9.0"
 crossbeam = "0.8"
-bytes = "1.0.1"
+bytes = "1.4.0"
 crc32fast = "1.3.2"
 arrayref = "0.3.6"
 byteorder = "1.4.3"
 futures-util = "0.3.14"
 async-stream = "0.3.0"
 tracing = "0.1.25"
-tracing-futures = { version = "0.2.5", features = ["futures-01", "futures-03", "std-future"] }
+tracing-futures = { version = "0.2.5", features = ["futures-03", "std-future"] }
 fs2 = "0.4.3"
 libc = "0.2.93"
 hex = "0.4.3"
 num-traits = "0.2.14"
-num-derive = "0.3"
-url = "2.2.2"
+num-derive = "0.4.0"
+url = "2.4.0"
 tiny-keccak = { version = "2.0", features = ["sha3"] }
 err = { path = "../err" }
 taskrun = { path = "../taskrun" }

crates/disk/src/cache.rs

@@ -14,6 +14,7 @@ use std::io;
 use std::path::PathBuf;
 use std::time::Duration;
 use std::time::Instant;
+use taskrun::tokio;
 use tiny_keccak::Hasher;
 
 // For file-based caching, this determined the node where the cache file is located.

crates/disk/src/dataopen.rs

@@ -12,6 +12,7 @@ use netpod::TsNano;
 use std::fmt;
 use std::path::PathBuf;
 use std::time::Instant;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::fs::OpenOptions;
 use tokio::io::AsyncReadExt;

crates/disk/src/disk.rs

@@ -54,6 +54,7 @@ use streams::dtflags::BIG_ENDIAN;
 use streams::dtflags::COMPRESSION;
 use streams::dtflags::SHAPE;
 use streams::filechunkread::FileChunkRead;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::fs::OpenOptions;
 use tokio::io::AsyncRead;

crates/disk/src/gen.rs

@@ -17,6 +17,7 @@ use netpod::Shape;
 use netpod::TsNano;
 use std::path::Path;
 use std::path::PathBuf;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::fs::OpenOptions;
 use tokio::io::AsyncWriteExt;

crates/disk/src/index.rs

@@ -4,6 +4,7 @@ use netpod::log::*;
 use netpod::range::evrange::NanoRange;
 use netpod::TsNano;
 use std::mem::size_of;
+use taskrun::tokio;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 use tokio::io::AsyncSeekExt;

crates/disk/src/paths.rs

@@ -6,6 +6,7 @@ use netpod::Node;
 use netpod::SfChFetchInfo;
 use netpod::TsNano;
 use std::path::PathBuf;
+use taskrun::tokio;
 
 pub fn datapath_for_keyspace(ks: u32, node: &Node) -> PathBuf {
     node.sf_databuffer

crates/disk/src/raw/generated.rs

@@ -16,6 +16,7 @@ use std::pin::Pin;
 use std::task::Context;
 use std::task::Poll;
 use std::time::Duration;
+use taskrun::tokio;
 
 pub trait TypedGenerator {
     type RustScalar;

crates/disk/src/read3.rs

@@ -5,6 +5,7 @@ use std::os::unix::prelude::RawFd;
 use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
 use std::sync::Once;
 use std::time::{Duration, Instant};
+use taskrun::tokio;
 use tokio::sync::{mpsc, oneshot};
 
 const DO_TRACE: bool = false;

crates/disk/src/read4.rs

@@ -2,9 +2,13 @@ use bytes::BytesMut;
 use err::Error;
 use netpod::log::*;
 use std::os::unix::prelude::RawFd;
-use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
+use std::sync::atomic::AtomicPtr;
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering;
 use std::sync::Once;
-use std::time::{Duration, Instant};
+use std::time::Duration;
+use std::time::Instant;
+use taskrun::tokio;
 use tokio::sync::mpsc;
 
 static READ4: AtomicPtr<Read4> = AtomicPtr::new(std::ptr::null_mut());