diff --git a/Cargo.toml b/Cargo.toml index 3862f103..1d8e3c59 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,13 +20,13 @@ stream = ["bytes"] [dependencies] log = "0.4" futures-preview = { version = "0.3.0-alpha.18", features = ["async-await", "nightly"] } -pin-project = "0.4.0-alpha.7" -tokio-io = "0.2.0-alpha.4" +pin-project = "0.4.0-alpha.9" +tokio-io = "0.2.0-alpha.5" [dependencies.tungstenite] #version = "0.9.1" -git = "https://github.com/dbcfd/tungstenite-rs.git" -branch = "expose-machine" +git = "https://github.com/snapview/tungstenite-rs.git" +branch = "master" default-features = false [dependencies.bytes] @@ -44,13 +44,13 @@ git = "https://github.com/sbstp/tokio-dns.git" [dependencies.tokio-net] optional = true -version = "0.2.0-alpha.4" +version = "0.2.0-alpha.5" [dependencies.tokio-tls] optional = true -version = "0.3.0-alpha.4" +version = "0.3.0-alpha.5" [dev-dependencies] -tokio = "0.2.0-alpha.4" +tokio = "0.2.0-alpha.5" url = "2.0.0" env_logger = "0.6.1" diff --git a/examples/autobahn-server.rs b/examples/autobahn-server.rs index fd82485d..f3b40ab1 100644 --- a/examples/autobahn-server.rs +++ b/examples/autobahn-server.rs @@ -1,4 +1,4 @@ -use futures::{SinkExt, StreamExt}; +use futures::StreamExt; use log::*; use std::net::{SocketAddr, ToSocketAddrs}; use tokio::net::{TcpListener, TcpStream}; diff --git a/tests/handshakes.rs b/tests/handshakes.rs index 8fd65628..cadec84c 100644 --- a/tests/handshakes.rs +++ b/tests/handshakes.rs @@ -5,7 +5,7 @@ use tokio_tungstenite::{accept_async, client_async}; #[tokio::test] async fn handshakes() { - let (mut tx, rx) = futures::channel::oneshot::channel(); + let (tx, rx) = futures::channel::oneshot::channel(); let f = async move { let address = "0.0.0.0:12345" @@ -25,7 +25,7 @@ async fn handshakes() { tokio::spawn(f); - rx.await; + rx.await.expect("Failed to wait for server to be ready"); let address = "0.0.0.0:12345" .to_socket_addrs() .expect("Not a valid address") @@ -35,7 +35,7 @@ async fn handshakes() { .await .expect("Failed to connect"); let url = url::Url::parse("ws://localhost:12345/").unwrap(); - let stream = client_async(url, tcp) + let _stream = client_async(url, tcp) .await .expect("Client failed to connect"); }