fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-02 20:51:21 +00:00
Code Issues Projects Releases Wiki Activity

Update soketto dependency to 0.1.0. (#1167)

Browse Source 
Also ensure error type in libp2p-websocket are `Sync`.
This commit is contained in:
Toralf Wittner 2019-06-05 17:43:33 +02:00 committed by Pierre Krieger
parent 134f472070
commit f7577c0f1f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transports/websocket/Cargo.toml
View File

@ -18,7 +18,7 @@ rw-stream-sink = { version = "0.1.1", path = "../../misc/rw-stream-sink" }
tokio-codec = "0.1.1" tokio-codec = "0.1.1"
tokio-io = "0.1.12" tokio-io = "0.1.12"
tokio-rustls = "0.10.0-alpha.3" tokio-rustls = "0.10.0-alpha.3"
soketto = "0.1.0-alpha.1" soketto = "0.1.0"
url = "1.7.2" url = "1.7.2"
webpki-roots = "0.16.0" webpki-roots = "0.16.0"

4
transports/websocket/src/error.rs
View File

@ -30,7 +30,7 @@ pub enum Error<E> {
/// A TLS related error. /// A TLS related error.
Tls(tls::Error), Tls(tls::Error),
/// Websocket handshake error. /// Websocket handshake error.
Handshake(Box<dyn error::Error + Send>), Handshake(Box<dyn error::Error + Send + Sync>),
/// The configured maximum of redirects have been made. /// The configured maximum of redirects have been made.
TooManyRedirects, TooManyRedirects,
/// A multi-address is not supported. /// A multi-address is not supported.
@ -38,7 +38,7 @@ pub enum Error<E> {
/// The location header URL was invalid. /// The location header URL was invalid.
InvalidRedirectLocation, InvalidRedirectLocation,
/// Websocket base framing error. /// Websocket base framing error.
Base(Box<dyn error::Error + Send>) Base(Box<dyn error::Error + Send + Sync>)
} }
impl<E: fmt::Display> fmt::Display for Error<E> { impl<E: fmt::Display> fmt::Display for Error<E> {

2
transports/websocket/src/tls.rs
View File

@ -139,7 +139,7 @@ pub enum Error {
/// An underlying I/O error. /// An underlying I/O error.
Io(io::Error), Io(io::Error),
/// Actual TLS error. /// Actual TLS error.
Tls(Box<dyn std::error::Error + Send>), Tls(Box<dyn std::error::Error + Send + Sync>),
/// The DNS name was invalid. /// The DNS name was invalid.
InvalidDnsName(String), InvalidDnsName(String),