berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into tokio0.3

This commit is contained in:
Rob Ede 2021-01-03 04:19:48 +00:00 committed by GitHub
parent ce8ad0afe2 ad608aa64e
commit a835313524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/resource.rs
View File

@ -12,7 +12,7 @@ use actix_service::{
apply, apply_fn_factory, IntoServiceFactory, Service, ServiceFactory, apply, apply_fn_factory, IntoServiceFactory, Service, ServiceFactory,
ServiceFactoryExt, Transform, ServiceFactoryExt, Transform,
}; };
use futures_util::future::{ok, Either, LocalBoxFuture, Ready}; use futures_core::future::LocalBoxFuture;
use crate::data::Data; use crate::data::Data;
use crate::dev::{insert_slash, AppService, HttpServiceFactory, ResourceDef}; use crate::dev::{insert_slash, AppService, HttpServiceFactory, ResourceDef};
@ -523,10 +523,7 @@ pub struct ResourceService {
impl Service<ServiceRequest> for ResourceService { impl Service<ServiceRequest> for ResourceService {
type Response = ServiceResponse; type Response = ServiceResponse;
type Error = Error; type Error = Error;
type Future = Either< type Future = LocalBoxFuture<'static, Result<ServiceResponse, Error>>;
Ready<Result<ServiceResponse, Error>>,
LocalBoxFuture<'static, Result<ServiceResponse, Error>>,
>;
fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> { fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
Poll::Ready(Ok(())) Poll::Ready(Ok(()))
@ -538,20 +535,22 @@ impl Service<ServiceRequest> for ResourceService {
if let Some(ref data) = self.data { if let Some(ref data) = self.data {
req.add_data_container(data.clone()); req.add_data_container(data.clone());
} }
return Either::Right(route.call(req)); return route.call(req);
} }
} }
if let Some(ref mut default) = self.default { if let Some(ref mut default) = self.default {
if let Some(ref data) = self.data { if let Some(ref data) = self.data {
req.add_data_container(data.clone()); req.add_data_container(data.clone());
} }
Either::Right(default.call(req)) default.call(req)
} else { } else {
let req = req.into_parts().0; let req = req.into_parts().0;
Either::Left(ok(ServiceResponse::new( Box::pin(async {
req, Ok(ServiceResponse::new(
Response::MethodNotAllowed().finish(), req,
))) Response::MethodNotAllowed().finish(),
))
})
} }
} }
} }

13
src/scope.rs
View File

@ -12,7 +12,7 @@ use actix_service::{
apply, apply_fn_factory, IntoServiceFactory, Service, ServiceFactory, apply, apply_fn_factory, IntoServiceFactory, Service, ServiceFactory,
ServiceFactoryExt, Transform, ServiceFactoryExt, Transform,
}; };
use futures_util::future::{ok, Either, LocalBoxFuture, Ready}; use futures_core::future::LocalBoxFuture;
use crate::config::ServiceConfig; use crate::config::ServiceConfig;
use crate::data::Data; use crate::data::Data;
@ -29,7 +29,6 @@ use crate::service::{
type Guards = Vec<Box<dyn Guard>>; type Guards = Vec<Box<dyn Guard>>;
type HttpService = BoxService<ServiceRequest, ServiceResponse, Error>; type HttpService = BoxService<ServiceRequest, ServiceResponse, Error>;
type HttpNewService = BoxServiceFactory<(), ServiceRequest, ServiceResponse, Error, ()>; type HttpNewService = BoxServiceFactory<(), ServiceRequest, ServiceResponse, Error, ()>;
type BoxedResponse = LocalBoxFuture<'static, Result<ServiceResponse, Error>>;
/// Resources scope. /// Resources scope.
/// ///
@ -605,7 +604,7 @@ pub struct ScopeService {
impl Service<ServiceRequest> for ScopeService { impl Service<ServiceRequest> for ScopeService {
type Response = ServiceResponse; type Response = ServiceResponse;
type Error = Error; type Error = Error;
type Future = Either<BoxedResponse, Ready<Result<Self::Response, Self::Error>>>; type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> { fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
Poll::Ready(Ok(())) Poll::Ready(Ok(()))
@ -627,15 +626,17 @@ impl Service<ServiceRequest> for ScopeService {
if let Some(ref data) = self.data { if let Some(ref data) = self.data {
req.add_data_container(data.clone()); req.add_data_container(data.clone());
} }
Either::Left(srv.call(req)) srv.call(req)
} else if let Some(ref mut default) = self.default { } else if let Some(ref mut default) = self.default {
if let Some(ref data) = self.data { if let Some(ref data) = self.data {
req.add_data_container(data.clone()); req.add_data_container(data.clone());
} }
Either::Left(default.call(req)) default.call(req)
} else { } else {
let req = req.into_parts().0; let req = req.into_parts().0;
Either::Right(ok(ServiceResponse::new(req, Response::NotFound().finish()))) Box::pin(async {
Ok(ServiceResponse::new(req, Response::NotFound().finish()))
})
} }
} }
} }