actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 22:49:21 +02:00
Code Issues Releases Wiki Activity

refactor FromRequest trait

Browse Source
This commit is contained in:
Nikolay Kim
2019-04-07 14:43:07 -07:00
parent 3c650ca194
commit 75b213a6f0
18 changed files with 298 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
actix-multipart/src/extractor.rs
View File

@ -2,10 +2,8 @@
use bytes::Bytes;
use futures::Stream;
use actix_web::dev::ServiceFromRequest;
use actix_web::error::{Error, PayloadError};
use actix_web::FromRequest;
use actix_web::HttpMessage;
use actix_web::{dev::Payload, FromRequest, HttpRequest};
use crate::server::Multipart;
@ -50,8 +48,7 @@ where
type Future = Result<Multipart, Error>;
#[inline]
fn from_request(req: &mut ServiceFromRequest<P>) -> Self::Future {
let pl = req.take_payload();
Ok(Multipart::new(req.headers(), pl))
fn from_request(req: &HttpRequest, payload: &mut Payload<P>) -> Self::Future {
Ok(Multipart::new(req.headers(), payload.take()))
}
}