anna/async-graphql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #770 from PacoDu/fix-actix-http-payload-stream-deprecated

Browse Source 
fix: upgrade actix-http to beta.17 and remove deprecated PayloadStream
This commit is contained in:
Sunli 2021-12-30 10:01:01 +08:00 committed by GitHub
commit 79c56894e8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integrations/actix-web/Cargo.toml
View File

@ -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"

6
integrations/actix-web/src/request.rs
View File

@ -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<<GraphQLBatchRequest as FromRequest>::Future, BatchToRequestMapper>;
fn from_request(req: &HttpRequest, payload: &mut Payload<PayloadStream>) -> 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<Box<dyn Future<Output = Result<GraphQLBatchRequest>>>>;
fn from_request(req: &HttpRequest, payload: &mut Payload<PayloadStream>) -> Self::Future {
fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
let config = req
.app_data::<MultipartOptions>()
.cloned()