From f7577c0f1f958f5c470bbe3eb50973a7b9a8fe0f Mon Sep 17 00:00:00 2001 From: Toralf Wittner Date: Wed, 5 Jun 2019 17:43:33 +0200 Subject: [PATCH] Update soketto dependency to 0.1.0. (#1167) Also ensure error type in libp2p-websocket are `Sync`. --- transports/websocket/Cargo.toml | 2 +- transports/websocket/src/error.rs | 4 ++-- transports/websocket/src/tls.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml index cb8bda5d..100b870d 100644 --- a/transports/websocket/Cargo.toml +++ b/transports/websocket/Cargo.toml @@ -18,7 +18,7 @@ rw-stream-sink = { version = "0.1.1", path = "../../misc/rw-stream-sink" } tokio-codec = "0.1.1" tokio-io = "0.1.12" tokio-rustls = "0.10.0-alpha.3" -soketto = "0.1.0-alpha.1" +soketto = "0.1.0" url = "1.7.2" webpki-roots = "0.16.0" diff --git a/transports/websocket/src/error.rs b/transports/websocket/src/error.rs index 10bea425..65a5d835 100644 --- a/transports/websocket/src/error.rs +++ b/transports/websocket/src/error.rs @@ -30,7 +30,7 @@ pub enum Error { /// A TLS related error. Tls(tls::Error), /// Websocket handshake error. - Handshake(Box), + Handshake(Box), /// The configured maximum of redirects have been made. TooManyRedirects, /// A multi-address is not supported. @@ -38,7 +38,7 @@ pub enum Error { /// The location header URL was invalid. InvalidRedirectLocation, /// Websocket base framing error. - Base(Box) + Base(Box) } impl fmt::Display for Error { diff --git a/transports/websocket/src/tls.rs b/transports/websocket/src/tls.rs index 7e7cb246..96f91f20 100644 --- a/transports/websocket/src/tls.rs +++ b/transports/websocket/src/tls.rs @@ -139,7 +139,7 @@ pub enum Error { /// An underlying I/O error. Io(io::Error), /// Actual TLS error. - Tls(Box), + Tls(Box), /// The DNS name was invalid. InvalidDnsName(String),