From 6848ba63fb8cfae8d252ff891b0fef34637c6a2e Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean@seanmonstar.com>
Date: Mon, 25 Jun 2018 11:35:57 -0700
Subject: [PATCH] test(server): use current_thread instead of rt::run with
 http2 tests

---
 tests/server.rs | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/tests/server.rs b/tests/server.rs
index 2dcb361f..1bb29150 100644
--- a/tests/server.rs
+++ b/tests/server.rs
@@ -48,8 +48,10 @@ fn try_h2() {
     let mut rt = Runtime::new().expect("runtime new");
 
     rt.block_on(hyper::rt::lazy(move || {
-        let client: Client<_, hyper::Body> = Client::builder().http2_only(true).build_http();
-        let uri = addr_str.parse::<hyper::Uri>().expect("server addr should parse");
+        let client = Client::builder()
+            .http2_only(true)
+            .build_http::<hyper::Body>();
+        let uri = addr_str.parse().expect("server addr should parse");
 
         client.get(uri)
             .and_then(|_res| { Ok(()) })
@@ -364,8 +366,11 @@ mod response_body_lengths {
         let addr_str = format!("http://{}", server.addr());
         server.reply().body("Hello, World!");
 
-        hyper::rt::run(hyper::rt::lazy(move || {
-            let client: Client<_, hyper::Body> = Client::builder().http2_only(true).build_http();
+        let mut rt = Runtime::new().expect("rt new");
+        rt.block_on(hyper::rt::lazy(move || {
+            let client = Client::builder()
+                .http2_only(true)
+                .build_http::<hyper::Body>();
             let uri = addr_str
                 .parse::<hyper::Uri>()
                 .expect("server addr should parse");
@@ -379,7 +384,7 @@ mod response_body_lengths {
                 })
                 .map(|_| ())
                 .map_err(|_e| ())
-        }));
+        })).unwrap();
     }
 
     #[test]
@@ -393,8 +398,11 @@ mod response_body_lengths {
             .header("content-length", "10")
             .body("Hello, World!");
 
-        hyper::rt::run(hyper::rt::lazy(move || {
-            let client: Client<_, hyper::Body> = Client::builder().http2_only(true).build_http();
+        let mut rt = Runtime::new().expect("rt new");
+        rt.block_on(hyper::rt::lazy(move || {
+            let client = Client::builder()
+                .http2_only(true)
+                .build_http::<hyper::Body>();
             let uri = addr_str
                 .parse::<hyper::Uri>()
                 .expect("server addr should parse");
@@ -1796,9 +1804,10 @@ fn serve_with_options(options: ServeOptions) -> Serve {
 
         let fut = spawn_all
             .select(shutdown_rx)
-            .then(|_| Ok(()));
+            .then(|_| Ok::<(), ()>(()));
 
-        tokio::run(fut);
+        let mut rt = Runtime::new().expect("rt new");
+        rt.block_on(fut).unwrap();
     }).expect("thread spawn");
 
     let addr = addr_rx.recv().expect("server addr rx");