From 3df3c3f86a78ac0e208898e6589f0430e4e54bcd Mon Sep 17 00:00:00 2001 From: Paco Dupont Date: Tue, 28 Dec 2021 16:54:17 +0100 Subject: [PATCH] fix: upgrade actix-http to beta.17 and remove deprecated PayloadStream --- integrations/actix-web/Cargo.toml | 2 +- integrations/actix-web/src/request.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integrations/actix-web/Cargo.toml b/integrations/actix-web/Cargo.toml index 67d15482..b7b9970d 100644 --- a/integrations/actix-web/Cargo.toml +++ b/integrations/actix-web/Cargo.toml @@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"] [dependencies] async-graphql = { path = "../..", version = "3.0.18" } actix = "0.12.0" -actix-http = "3.0.0-beta.15" +actix-http = "3.0.0-beta.17" actix-web = { version = "4.0.0-beta.14", default-features = false } actix-web-actors = "4.0.0-beta.8" async-channel = "1.6.1" diff --git a/integrations/actix-web/src/request.rs b/integrations/actix-web/src/request.rs index ecab4455..70cdc7a5 100644 --- a/integrations/actix-web/src/request.rs +++ b/integrations/actix-web/src/request.rs @@ -4,7 +4,7 @@ use std::io::{self, ErrorKind}; use std::pin::Pin; use actix_http::error::PayloadError; -use actix_web::dev::{Payload, PayloadStream}; +use actix_web::dev::Payload; use actix_web::http::{Method, StatusCode}; use actix_web::{http, Error, FromRequest, HttpRequest, HttpResponse, Responder, Result}; use futures_util::future::{self, FutureExt}; @@ -33,7 +33,7 @@ impl FromRequest for GraphQLRequest { type Error = Error; type Future = future::Map<::Future, BatchToRequestMapper>; - fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future { + fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future { GraphQLBatchRequest::from_request(req, payload).map(|res| { Ok(Self( res?.0 @@ -61,7 +61,7 @@ impl FromRequest for GraphQLBatchRequest { type Error = Error; type Future = Pin>>>; - fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future { + fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future { let config = req .app_data::() .cloned()