actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-08-28 11:47:47 +02:00
Code Issues Releases Wiki Activity

Use associated type for NewService config

Browse Source
This commit is contained in:
Nikolay Kim
2019-05-12 06:03:50 -07:00
parent 76c317e0b2
commit f0776fca94
46 changed files with 810 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
actix-service/src/map_init_err.rs
View File

@@ -5,17 +5,17 @@ use futures::{Future, Poll};
use super::NewService;
/// `MapInitErr` service combinator
pub struct MapInitErr<A, F, E, C> {
pub struct MapInitErr<A, F, E> {
a: A,
f: F,
e: PhantomData<(E, C)>,
e: PhantomData<E>,
}
impl<A, F, E, C> MapInitErr<A, F, E, C> {
impl<A, F, E> MapInitErr<A, F, E> {
/// Create new `MapInitErr` combinator
pub fn new(a: A, f: F) -> Self
where
A: NewService<C>,
A: NewService,
F: Fn(A::InitError) -> E,
{
Self {
@@ -26,7 +26,7 @@ impl<A, F, E, C> MapInitErr<A, F, E, C> {
}
}
impl<A, F, E, C> Clone for MapInitErr<A, F, E, C>
impl<A, F, E> Clone for MapInitErr<A, F, E>
where
A: Clone,
F: Clone,
@@ -40,36 +40,37 @@ where
}
}
impl<A, F, E, C> NewService<C> for MapInitErr<A, F, E, C>
impl<A, F, E> NewService for MapInitErr<A, F, E>
where
A: NewService<C>,
A: NewService,
F: Fn(A::InitError) -> E + Clone,
{
type Request = A::Request;
type Response = A::Response;
type Error = A::Error;
type Config = A::Config;
type Service = A::Service;
type InitError = E;
type Future = MapInitErrFuture<A, F, E, C>;
type Future = MapInitErrFuture<A, F, E>;
fn new_service(&self, cfg: &C) -> Self::Future {
fn new_service(&self, cfg: &A::Config) -> Self::Future {
MapInitErrFuture::new(self.a.new_service(cfg), self.f.clone())
}
}
pub struct MapInitErrFuture<A, F, E, C>
pub struct MapInitErrFuture<A, F, E>
where
A: NewService<C>,
A: NewService,
F: Fn(A::InitError) -> E,
{
f: F,
fut: A::Future,
}
impl<A, F, E, C> MapInitErrFuture<A, F, E, C>
impl<A, F, E> MapInitErrFuture<A, F, E>
where
A: NewService<C>,
A: NewService,
F: Fn(A::InitError) -> E,
{
fn new(fut: A::Future, f: F) -> Self {
@@ -77,9 +78,9 @@ where
}
}
impl<A, F, E, C> Future for MapInitErrFuture<A, F, E, C>
impl<A, F, E> Future for MapInitErrFuture<A, F, E>
where
A: NewService<C>,
A: NewService,
F: Fn(A::InitError) -> E,
{
type Item = A::Service;