actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-09-02 07:16:37 +02:00
Code Issues Releases Wiki Activity

rename Apply service

Browse Source
This commit is contained in:
Nikolay Kim
2018-08-30 09:26:27 -07:00
parent e0513e4085
commit a928d82895
3 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/service/apply.rs
View File

@@ -3,8 +3,8 @@ use std::marker::PhantomData;
use futures::{Async, Future, Poll};
use {NewService, Service};
/// `Apply` service combinator
pub struct Apply<T, F, R, Req, Resp, Err> {
/// `ApplyService` service combinator
pub struct ApplyService<T, F, R, Req, Resp, Err> {
service: T,
f: F,
r: PhantomData<R>,
@@ -13,7 +13,7 @@ pub struct Apply<T, F, R, Req, Resp, Err> {
e: PhantomData<Err>,
}
impl<T, F, R, Req, Resp, Err> Apply<T, F, R, Req, Resp, Err>
impl<T, F, R, Req, Resp, Err> ApplyService<T, F, R, Req, Resp, Err>
where
T: Service,
F: Fn(Req, &mut T) -> R,
@@ -32,7 +32,7 @@ where
}
}
impl<T, F, R, Req, Resp, Err> Service for Apply<T, F, R, Req, Resp, Err>
impl<T, F, R, Req, Resp, Err> Service for ApplyService<T, F, R, Req, Resp, Err>
where
T: Service,
T::Error: Into<Err>,
@@ -53,8 +53,8 @@ where
}
}
/// `ApplyNewService` new service combinator
pub struct ApplyNewService<T, F, R, Req, Resp, Err> {
/// `Apply` new service combinator
pub struct Apply<T, F, R, Req, Resp, Err> {
service: T,
f: F,
r: PhantomData<R>,
@@ -63,7 +63,7 @@ pub struct ApplyNewService<T, F, R, Req, Resp, Err> {
e: PhantomData<Err>,
}
impl<T, F, R, Req, Resp, Err> ApplyNewService<T, F, R, Req, Resp, Err>
impl<T, F, R, Req, Resp, Err> Apply<T, F, R, Req, Resp, Err>
where
T: NewService,
F: Fn(Req, &mut T::Service) -> R,
@@ -82,7 +82,7 @@ where
}
}
impl<T, F, R, Req, Resp, Err> Clone for ApplyNewService<T, F, R, Req, Resp, Err>
impl<T, F, R, Req, Resp, Err> Clone for Apply<T, F, R, Req, Resp, Err>
where
T: NewService + Clone,
F: Fn(Req, &mut T::Service) -> R + Clone,
@@ -100,7 +100,7 @@ where
}
}
impl<T, F, R, Req, Resp, Err> NewService for ApplyNewService<T, F, R, Req, Resp, Err>
impl<T, F, R, Req, Resp, Err> NewService for Apply<T, F, R, Req, Resp, Err>
where
T: NewService,
T::Error: Into<Err>,
@@ -110,17 +110,17 @@ where
type Request = Req;
type Response = Resp;
type Error = Err;
type Service = Apply<T::Service, F, R, Req, Resp, Err>;
type Service = ApplyService<T::Service, F, R, Req, Resp, Err>;
type InitError = T::InitError;
type Future = ApplyNewServiceFuture<T, F, R, Req, Resp, Err>;
type Future = ApplyFuture<T, F, R, Req, Resp, Err>;
fn new_service(&self) -> Self::Future {
ApplyNewServiceFuture::new(self.service.new_service(), self.f.clone())
ApplyFuture::new(self.service.new_service(), self.f.clone())
}
}
pub struct ApplyNewServiceFuture<T, F, R, Req, Resp, Err>
pub struct ApplyFuture<T, F, R, Req, Resp, Err>
where
T: NewService,
F: Fn(Req, &mut T::Service) -> R,
@@ -134,14 +134,14 @@ where
e: PhantomData<Err>,
}
impl<T, F, R, Req, Resp, Err> ApplyNewServiceFuture<T, F, R, Req, Resp, Err>
impl<T, F, R, Req, Resp, Err> ApplyFuture<T, F, R, Req, Resp, Err>
where
T: NewService,
F: Fn(Req, &mut T::Service) -> R,
R: Future<Item = Resp, Error = Err>,
{
fn new(fut: T::Future, f: F) -> Self {
ApplyNewServiceFuture {
ApplyFuture {
f: Some(f),
fut,
r: PhantomData,
@@ -152,18 +152,21 @@ where
}
}
impl<T, F, R, Req, Resp, Err> Future for ApplyNewServiceFuture<T, F, R, Req, Resp, Err>
impl<T, F, R, Req, Resp, Err> Future for ApplyFuture<T, F, R, Req, Resp, Err>
where
T: NewService,
F: Fn(Req, &mut T::Service) -> R,
R: Future<Item = Resp, Error = Err>,
{
type Item = Apply<T::Service, F, R, Req, Resp, Err>;
type Item = ApplyService<T::Service, F, R, Req, Resp, Err>;
type Error = T::InitError;
fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
if let Async::Ready(service) = self.fut.poll()? {
Ok(Async::Ready(Apply::new(self.f.take().unwrap(), service)))
Ok(Async::Ready(ApplyService::new(
self.f.take().unwrap(),
service,
)))
} else {
Ok(Async::NotReady)
}