diff --git a/integrations/actix-web/Cargo.toml b/integrations/actix-web/Cargo.toml index 1c4eaf64..4da6e776 100644 --- a/integrations/actix-web/Cargo.toml +++ b/integrations/actix-web/Cargo.toml @@ -14,10 +14,10 @@ categories = ["network-programming", "asynchronous"] [dependencies] async-graphql = { path = "../..", version = "=2.11.0" } -actix = "0.11.1" -actix-http = "3.0.0-beta.6" -actix-web = { version = "4.0.0-beta.6", default-features = false } -actix-web-actors = { git = "https://github.com/actix/actix-web.git", rev = "0bb035c" } +actix = "0.12" +actix-http = "3.0.0-beta.8" +actix-web = { version = "4.0.0-beta.8", default-features = false } +actix-web-actors = "4.0.0-beta.6" futures-util = { version = "0.3.13", default-features = false } serde_json = "1.0.64" serde_urlencoded = "0.7.0" diff --git a/integrations/actix-web/src/subscription.rs b/integrations/actix-web/src/subscription.rs index 152a49ec..c366d843 100644 --- a/integrations/actix-web/src/subscription.rs +++ b/integrations/actix-web/src/subscription.rs @@ -6,8 +6,8 @@ use actix::{ Actor, ActorContext, ActorFutureExt, ActorStreamExt, AsyncContext, ContextFutureSpawner, StreamHandler, WrapFuture, WrapStream, }; -use actix_http::error::PayloadError; -use actix_http::{ws, Error}; +use actix_http::ws::Item; +use actix_web::error::{Error, PayloadError}; use actix_web::web::{BufMut, Bytes, BytesMut}; use actix_web::{HttpRequest, HttpResponse}; use actix_web_actors::ws::{CloseReason, Message, ProtocolError, WebsocketContext}; @@ -179,16 +179,16 @@ where None } Message::Continuation(item) => match item { - ws::Item::FirstText(bytes) | ws::Item::FirstBinary(bytes) => { + Item::FirstText(bytes) | ws::Item::FirstBinary(bytes) => { self.continuation.clear(); self.continuation.put(bytes); None } - ws::Item::Continue(bytes) => { + Item::Continue(bytes) => { self.continuation.put(bytes); None } - ws::Item::Last(bytes) => { + Item::Last(bytes) => { self.continuation.put(bytes); Some(std::mem::take(&mut self.continuation).freeze()) }