tls: update to std-future (#1224)

tokio-tls/tests/google.rs

@@ -1,15 +1,14 @@
 #![deny(warnings, rust_2018_idioms)]
+#![feature(async_await)]
 
 use cfg_if::cfg_if;
 use env_logger;
-use futures::Future;
 use native_tls;
 use native_tls::TlsConnector;
 use std::io;
 use std::net::ToSocketAddrs;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
-use tokio::runtime::Runtime;
-use tokio_io::io::{flush, read_to_end, write_all};
 use tokio_tls;
 
 macro_rules! t {
@@ -51,35 +50,24 @@ cfg_if! {
     }
 }
 
-fn native2io(e: native_tls::Error) -> io::Error {
-    io::Error::new(io::ErrorKind::Other, e)
-}
-
-#[test]
-fn fetch_google() {
+#[tokio::test]
+async fn fetch_google() {
     drop(env_logger::try_init());
 
     // First up, resolve google.com
     let addr = t!("google.com:443".to_socket_addrs()).next().unwrap();
 
-    // Create an event loop and connect a socket to our resolved address.c
-    let l = t!(Runtime::new());
-    let client = TcpStream::connect(&addr);
+    let socket = TcpStream::connect(&addr).await.unwrap();
 
     // Send off the request by first negotiating an SSL handshake, then writing
     // of our request, then flushing, then finally read off the response.
-    let data = client
-        .and_then(move |socket| {
-            let builder = TlsConnector::builder();
-            let connector = t!(builder.build());
-            let connector = tokio_tls::TlsConnector::from(connector);
-            connector.connect("google.com", socket).map_err(native2io)
-        })
-        .and_then(|socket| write_all(socket, b"GET / HTTP/1.0\r\n\r\n"))
-        .and_then(|(socket, _)| flush(socket))
-        .and_then(|socket| read_to_end(socket, Vec::new()));
-
-    let (_, data) = t!(l.block_on(data));
+    let builder = TlsConnector::builder();
+    let connector = t!(builder.build());
+    let connector = tokio_tls::TlsConnector::from(connector);
+    let mut socket = t!(connector.connect("google.com", socket).await);
+    t!(socket.write_all(b"GET / HTTP/1.0\r\n\r\n").await);
+    let mut data = Vec::new();
+    t!(socket.read_to_end(&mut data).await);
 
     // any response code is fine
     assert!(data.starts_with(b"HTTP/1.0 "));
@@ -89,26 +77,27 @@ fn fetch_google() {
     assert!(data.ends_with("</html>") || data.ends_with("</HTML>"));
 }
 
+fn native2io(e: native_tls::Error) -> io::Error {
+    io::Error::new(io::ErrorKind::Other, e)
+}
+
 // see comment in bad.rs for ignore reason
 #[cfg_attr(all(target_os = "macos", feature = "force-openssl"), ignore)]
-#[test]
-fn wrong_hostname_error() {
+#[tokio::test]
+async fn wrong_hostname_error() {
     drop(env_logger::try_init());
 
     let addr = t!("google.com:443".to_socket_addrs()).next().unwrap();
 
-    let l = t!(Runtime::new());
-    let client = TcpStream::connect(&addr);
-    let data = client.and_then(move |socket| {
-        let builder = TlsConnector::builder();
-        let connector = t!(builder.build());
-        let connector = tokio_tls::TlsConnector::from(connector);
-        connector
-            .connect("rust-lang.org", socket)
-            .map_err(native2io)
-    });
+    let socket = t!(TcpStream::connect(&addr).await);
+    let builder = TlsConnector::builder();
+    let connector = t!(builder.build());
+    let connector = tokio_tls::TlsConnector::from(connector);
+    let res = connector
+        .connect("rust-lang.org", socket)
+        .await
+        .map_err(native2io);
 
-    let res = l.block_on(data);
     assert!(res.is_err());
     assert_bad_hostname_error(&res.err().unwrap());
 }