From 8a03a33aa635bfec3532703ef91f4a2b9c7b8da3 Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Sun, 13 Dec 2020 09:04:39 +0800
Subject: [PATCH] fix merge

---
 actix-server/src/service.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/actix-server/src/service.rs b/actix-server/src/service.rs
index 8ebe36a2..9e75562b 100644
--- a/actix-server/src/service.rs
+++ b/actix-server/src/service.rs
@@ -61,20 +61,20 @@ where
     }
 
     fn call(&mut self, (guard, req): (Option<CounterGuard>, MioStream)) -> Self::Future {
-        match FromStream::from_mio(stream) {
+        ready(match FromStream::from_mio(req) {
             Ok(stream) => {
                 let f = self.service.call(stream);
                 actix_rt::spawn(async move {
-                  let _ = f.await;
-                  drop(guard);
+                    let _ = f.await;
+                    drop(guard);
                 });
-                ready(Ok(()))
+                Ok(())
             }
-            Err(e) => { 
-              error!("Can not convert to an async tcp stream: {}", e);
-                ready(Err(()))
+            Err(e) => {
+                error!("Can not convert to an async tcp stream: {}", e);
+                Err(())
             }
-        };
+        })
     }
 }