From 11740dc1ebbfaad4f4c3405b0912d0a2ffd580e1 Mon Sep 17 00:00:00 2001 From: John Smith Date: Wed, 29 Jun 2022 13:57:53 -0400 Subject: [PATCH] update --- external/cursive | 2 +- veilid-cli/src/tools.rs | 1 - veilid-server/Cargo.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/external/cursive b/external/cursive index f29f750a..fea04c2f 160000 --- a/external/cursive +++ b/external/cursive @@ -1 +1 @@ -Subproject commit f29f750aade5a669d90ac9ea3a96e8299c4c66c0 +Subproject commit fea04c2f9bb8c4c9551ca6eb4f2cb1268551120f diff --git a/veilid-cli/src/tools.rs b/veilid-cli/src/tools.rs index eb25ad23..3ec094d2 100644 --- a/veilid-cli/src/tools.rs +++ b/veilid-cli/src/tools.rs @@ -20,7 +20,6 @@ cfg_if! { } else if #[cfg(feature="rt-tokio")] { pub use tokio::task::JoinHandle; pub use tokio::net::TcpStream; - pub use tokio_util::compat::*; pub use tokio::time::error::Elapsed as TimeoutError; pub fn spawn_local + 'static, T: 'static>(f: F) -> JoinHandle { tokio::task::spawn_local(f) diff --git a/veilid-server/Cargo.toml b/veilid-server/Cargo.toml index b117048c..806a7a13 100644 --- a/veilid-server/Cargo.toml +++ b/veilid-server/Cargo.toml @@ -25,12 +25,12 @@ tracing-opentelemetry = "^0" opentelemetry = { version = "^0" } opentelemetry-otlp = { version = "^0" } opentelemetry-semantic-conventions = "^0" -clap = "^3" async-std = { version = "^1", features = ["unstable"], optional = true } tokio = { version = "^1", features = ["full"], optional = true } tokio-stream = { version = "^0", features = ["net"], optional = true } tokio-util = { version = "^0", features = ["compat"], optional = true} async-tungstenite = { version = "^0", features = ["async-tls"] } +clap = "^3" directories = "^4" capnp = "^0" parking_lot = "^0"