From 253f8c92919dbe3e2e89fad556758dce9de60cee Mon Sep 17 00:00:00 2001
From: Constantin Nickel <constantin.nickel@gmail.com>
Date: Wed, 23 Dec 2020 15:02:55 +0100
Subject: [PATCH] Update to tokio 1.0

---
 Cargo.toml             | 9 +++++----
 examples/tokio-echo.rs | 2 +-
 src/tokio/openssl.rs   | 9 ++++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8320524..87edf9b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ version = "1.0"
 
 [dependencies.real-tokio-openssl]
 optional = true
-version = "0.5"
+version = "0.6"
 package = "tokio-openssl"
 
 [dependencies.openssl]
@@ -66,17 +66,17 @@ package = "native-tls"
 
 [dependencies.tokio]
 optional = true
-version = "0.3"
+version = "1.0"
 features = ["net"]
 
 [dependencies.real-tokio-native-tls]
 optional = true
-version = "0.2"
+version = "0.3"
 package = "tokio-native-tls"
 
 [dependencies.real-tokio-rustls]
 optional = true
-version = "^0.20"
+version = "^0.22"
 package = "tokio-rustls"
 
 [dependencies.webpki-roots]
@@ -96,6 +96,7 @@ futures = "0.3"
 url = "2.0.0"
 env_logger = "0.8"
 async-std = { version = "1.0", features = ["attributes", "unstable"] }
+tokio = { version = "1.0", features = ["full"] }
 
 [[example]]
 name = "autobahn-client"
diff --git a/examples/tokio-echo.rs b/examples/tokio-echo.rs
index 9a8a805..d4ed890 100644
--- a/examples/tokio-echo.rs
+++ b/examples/tokio-echo.rs
@@ -33,6 +33,6 @@ async fn run() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut rt = tokio::runtime::Runtime::new()?;
+    let rt = tokio::runtime::Runtime::new()?;
     rt.block_on(run())
 }
diff --git a/src/tokio/openssl.rs b/src/tokio/openssl.rs
index 3202ae2..9c3d461 100644
--- a/src/tokio/openssl.rs
+++ b/src/tokio/openssl.rs
@@ -1,5 +1,4 @@
 use openssl::ssl::{ConnectConfiguration, SslConnector, SslMethod};
-use real_tokio_openssl::connect;
 use real_tokio_openssl::SslStream as TlsStream;
 
 use tungstenite::client::{uri_mode, IntoClientRequest};
@@ -47,8 +46,12 @@ where
                         .configure()
                         .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?
                 };
-                connect(connector, &domain, socket)
-                    .await
+
+                let ssl = connector
+                    .into_ssl(&domain)
+                    .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
+
+                TlsStream::new(ssl, socket)
                     .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?
             };
             Ok(StreamSwitcher::Tls(TokioAdapter(stream)))