fix tokio import

pull/1/head
Markus Kohlhase 7 years ago
parent 9740711083
commit 475486a0a1
  1. 6
      src/connect.rs

@ -70,7 +70,7 @@ mod encryption {
#[cfg(not(feature="tls"))] #[cfg(not(feature="tls"))]
mod encryption { mod encryption {
use futures::{future, Future}; use futures::{future, Future};
use tokio_io::{AsyncRead, AsyncWrite}; use tokio::io::{AsyncRead, AsyncWrite};
use tungstenite::Error; use tungstenite::Error;
use tungstenite::stream::Mode; use tungstenite::stream::Mode;
@ -78,9 +78,9 @@ mod encryption {
pub type AutoStream<S> = S; pub type AutoStream<S> = S;
pub fn wrap_stream<S>(socket: S, _domain: String, mode: Mode) pub fn wrap_stream<S>(socket: S, _domain: String, mode: Mode)
-> Box<Future<Item=AutoStream<S>, Error=Error>> -> Box<Future<Item=AutoStream<S>, Error=Error> + Send>
where where
S: 'static + AsyncRead + AsyncWrite, S: 'static + AsyncRead + AsyncWrite + Send,
{ {
match mode { match mode {
Mode::Plain => Box::new(future::ok(socket)), Mode::Plain => Box::new(future::ok(socket)),

Loading…
Cancel
Save