From 14b249b804d371007a0ab8ed45d8e4a47fe49818 Mon Sep 17 00:00:00 2001
From: fakeshadow <24548779@qq.com>
Date: Thu, 4 Mar 2021 03:39:29 -0800
Subject: [PATCH] update to actix-0.11.0-beta.3 for actix-web-actors (#2042)

---
 actix-web-actors/Cargo.toml     | 2 +-
 actix-web-actors/src/context.rs | 4 ++--
 actix-web-actors/src/ws.rs      | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml
index 58508071a..e0c4fc073 100644
--- a/actix-web-actors/Cargo.toml
+++ b/actix-web-actors/Cargo.toml
@@ -16,7 +16,7 @@ name = "actix_web_actors"
 path = "src/lib.rs"
 
 [dependencies]
-actix = { version = "0.11.0-beta.2", default-features = false }
+actix = { version = "0.11.0-beta.3", default-features = false }
 actix-codec = "0.4.0-beta.1"
 actix-http = "3.0.0-beta.3"
 actix-web = { version = "4.0.0-beta.3", default-features = false }
diff --git a/actix-web-actors/src/context.rs b/actix-web-actors/src/context.rs
index bd6635cba..d7459aea4 100644
--- a/actix-web-actors/src/context.rs
+++ b/actix-web-actors/src/context.rs
@@ -44,7 +44,7 @@ where
     #[inline]
     fn spawn<F>(&mut self, fut: F) -> SpawnHandle
     where
-        F: ActorFuture<Output = (), Actor = A> + 'static,
+        F: ActorFuture<A, Output = ()> + 'static,
     {
         self.inner.spawn(fut)
     }
@@ -52,7 +52,7 @@ where
     #[inline]
     fn wait<F>(&mut self, fut: F)
     where
-        F: ActorFuture<Output = (), Actor = A> + 'static,
+        F: ActorFuture<A, Output = ()> + 'static,
     {
         self.inner.wait(fut)
     }
diff --git a/actix-web-actors/src/ws.rs b/actix-web-actors/src/ws.rs
index de2802d21..77d7041f0 100644
--- a/actix-web-actors/src/ws.rs
+++ b/actix-web-actors/src/ws.rs
@@ -211,14 +211,14 @@ where
 {
     fn spawn<F>(&mut self, fut: F) -> SpawnHandle
     where
-        F: ActorFuture<Output = (), Actor = A> + 'static,
+        F: ActorFuture<A, Output = ()> + 'static,
     {
         self.inner.spawn(fut)
     }
 
     fn wait<F>(&mut self, fut: F)
     where
-        F: ActorFuture<Output = (), Actor = A> + 'static,
+        F: ActorFuture<A, Output = ()> + 'static,
     {
         self.inner.wait(fut)
     }
@@ -495,7 +495,6 @@ where
 
         if !*this.closed {
             loop {
-                this = self.as_mut().project();
                 match Pin::new(&mut this.stream).poll_next(cx) {
                     Poll::Ready(Some(Ok(chunk))) => {
                         this.buf.extend_from_slice(&chunk[..]);