From 29402d25b75f50219c1ddc0220b9a84d31e7a62d Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Sun, 28 Mar 2021 21:22:04 +0800
Subject: [PATCH] fix clippy

---
 actix-server/src/test_server.rs | 38 +++++++++++++--------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/actix-server/src/test_server.rs b/actix-server/src/test_server.rs
index c2478f92..35707293 100644
--- a/actix-server/src/test_server.rs
+++ b/actix-server/src/test_server.rs
@@ -48,19 +48,12 @@ impl TestServer {
 
         // run server in separate thread
         thread::spawn(move || {
-            let sys = System::new();
-            sys.block_on(async {
-                actix_rt::spawn(async move {
-                    let _ = factory(Server::build())
-                        .workers(1)
-                        .disable_signals()
-                        .run()
-                        .await;
-                })
-            });
+            System::new().block_on(async {
+                let server = factory(Server::build()).workers(1).disable_signals().run();
+                tx.send(System::current()).unwrap();
 
-            tx.send(System::current()).unwrap();
-            sys.run()
+                server.await
+            })
         });
         let system = rx.recv().unwrap();
 
@@ -83,18 +76,17 @@ impl TestServer {
             let local_addr = tcp.local_addr().unwrap();
 
             sys.block_on(async {
-                actix_rt::spawn(async move {
-                    let _ = Server::build()
-                        .listen("test", tcp, factory)
-                        .unwrap()
-                        .workers(1)
-                        .disable_signals()
-                        .run()
-                        .await;
-                });
+                let server = Server::build()
+                    .listen("test", tcp, factory)
+                    .unwrap()
+                    .workers(1)
+                    .disable_signals()
+                    .run();
+
                 tx.send((System::current(), local_addr)).unwrap();
-            });
-            sys.run()
+
+                server.await
+            })
         });
 
         let (system, addr) = rx.recv().unwrap();