mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-22 16:16:40 +00:00
Code Issues Projects Releases Wiki Activity

move into fn service impl

Browse source
This commit is contained in:
Nikolay Kim 2018-09-04 09:57:47 -07:00
parent 0390ff37d3
commit 41eddae266
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/service/fn_service.rs
View file

@ -6,7 +6,7 @@ use futures::{
}; };
use tower_service::{NewService, Service}; use tower_service::{NewService, Service};
use super::IntoNewService; use super::{IntoNewService, IntoService};
pub struct FnService<F, Req, Resp, E, Fut> pub struct FnService<F, Req, Resp, E, Fut>
where where
@ -68,6 +68,16 @@ where
} }
} }
impl<F, Req, Resp, Err, Fut> IntoService<FnService<F, Req, Resp, Err, Fut>> for F
where
F: Fn(Req) -> Fut + 'static,
Fut: IntoFuture<Item = Resp, Error = Err>,
{
fn into_service(self) -> FnService<F, Req, Resp, Err, Fut> {
FnService::new(self)
}
}
pub struct FnNewService<F, Req, Resp, Err, IErr, Fut> pub struct FnNewService<F, Req, Resp, Err, IErr, Fut>
where where
F: Fn(Req) -> Fut, F: Fn(Req) -> Fut,

20
src/service/mod.rs
View file

@ -103,15 +103,15 @@ pub trait NewServiceExt: NewService {
} }
} }
impl<T: Service> ServiceExt for T {} impl<T: ?Sized> ServiceExt for T where T: Service {}
impl<T: NewService> NewServiceExt for T {} impl<T: ?Sized> NewServiceExt for T where T: NewService {}
/// Trait for types that can be converted to a Service /// Trait for types that can be converted to a `Service`
pub trait IntoService<T> pub trait IntoService<T>
where where
T: Service, T: Service,
{ {
/// Create service /// Convert to a `Service`
fn into_service(self) -> T; fn into_service(self) -> T;
} }
@ -120,7 +120,7 @@ pub trait IntoNewService<T>
where where
T: NewService, T: NewService,
{ {
/// Create service /// Convert to an `NewService`
fn into_new_service(self) -> T; fn into_new_service(self) -> T;
} }
@ -141,13 +141,3 @@ where
self self
} }
} }
impl<F, Req, Resp, Err, Fut> IntoService<FnService<F, Req, Resp, Err, Fut>> for F
where
F: Fn(Req) -> Fut + 'static,
Fut: IntoFuture<Item = Resp, Error = Err>,
{
fn into_service(self) -> FnService<F, Req, Resp, Err, Fut> {
FnService::new(self)
}
}