actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-06-28 22:20:36 +02:00
Code Issues Releases Wiki Activity

remove fn state service

Browse Source
This commit is contained in:
Nikolay Kim
2018-09-19 08:04:31 -07:00
parent 601c8a4ee6
commit 4c422983ba
5 changed files with 18 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
src/service/fn_state_service.rs
View File

@ -1,145 +0,0 @@
use std::marker;
use futures::{Async, Future, IntoFuture, Poll};
use super::{IntoNewService, NewService, Service};
pub struct FnStateService<S, F, Req, Resp, Err, Fut>
where
F: Fn(&mut S, Req) -> Fut,
Fut: IntoFuture<Item = Resp, Error = Err>,
{
f: F,
state: S,
_t: marker::PhantomData<(Req, Resp, Err)>,
}
impl<S, F, Req, Resp, Err, Fut> FnStateService<S, F, Req, Resp, Err, Fut>
where
F: Fn(&mut S, Req) -> Fut,
Fut: IntoFuture<Item = Resp, Error = Err>,
{
pub fn new(state: S, f: F) -> Self {
FnStateService {
f,
state,
_t: marker::PhantomData,
}
}
}
impl<S, F, Req, Resp, Err, Fut> Clone for FnStateService<S, F, Req, Resp, Err, Fut>
where
S: Clone,
F: Fn(&mut S, Req) -> Fut + Clone,
Fut: IntoFuture<Item = Resp, Error = Err>,
{
fn clone(&self) -> Self {
FnStateService {
f: self.f.clone(),
state: self.state.clone(),
_t: marker::PhantomData,
}
}
}
impl<S, F, Req, Resp, Err, Fut> Service for FnStateService<S, F, Req, Resp, Err, Fut>
where
F: Fn(&mut S, Req) -> Fut,
Fut: IntoFuture<Item = Resp, Error = Err>,
{
type Request = Req;
type Response = Resp;
type Error = Err;
type Future = Fut::Future;
fn poll_ready(&mut self) -> Poll<(), Self::Error> {
Ok(Async::Ready(()))
}
fn call(&mut self, req: Req) -> Self::Future {
(self.f)(&mut self.state, req).into_future()
}
}
/// `NewService` for state and handler functions
pub struct FnStateNewService<S, F1, F2, Req, Resp, Err1, Err2, Fut1, Fut2> {
f: F1,
state: F2,
_t: marker::PhantomData<(S, Req, Resp, Err1, Err2, Fut1, Fut2)>,
}
impl<S, F1, F2, Req, Resp, Err1, Err2, Fut1, Fut2>
FnStateNewService<S, F1, F2, Req, Resp, Err1, Err2, Fut1, Fut2>
{
fn new(f: F1, state: F2) -> Self {
FnStateNewService {
f,
state,
_t: marker::PhantomData,
}
}
}
impl<S, F1, F2, Req, Resp, Err1, Err2, Fut1, Fut2> NewService
for FnStateNewService<S, F1, F2, Req, Resp, Err1, Err2, Fut1, Fut2>
where
S: 'static,
F1: Fn(&mut S, Req) -> Fut1 + Clone + 'static,
F2: Fn() -> Fut2,
Fut1: IntoFuture<Item = Resp, Error = Err1> + 'static,
Fut2: IntoFuture<Item = S, Error = Err2> + 'static,
Req: 'static,
Resp: 'static,
Err1: 'static,
Err2: 'static,
{
type Request = Req;
type Response = Resp;
type Error = Err1;
type Service = FnStateService<S, F1, Req, Resp, Err1, Fut1>;
type InitError = Err2;
type Future = Box<Future<Item = Self::Service, Error = Self::InitError>>;
fn new_service(&self) -> Self::Future {
let f = self.f.clone();
Box::new(
(self.state)()
.into_future()
.and_then(move |state| Ok(FnStateService::new(state, f))),
)
}
}
impl<S, F1, F2, Req, Resp, Err1, Err2, Fut1, Fut2>
IntoNewService<FnStateNewService<S, F1, F2, Req, Resp, Err1, Err2, Fut1, Fut2>> for (F1, F2)
where
S: 'static,
F1: Fn(&mut S, Req) -> Fut1 + Clone + 'static,
F2: Fn() -> Fut2,
Fut1: IntoFuture<Item = Resp, Error = Err1> + 'static,
Fut2: IntoFuture<Item = S, Error = Err2> + 'static,
Req: 'static,
Resp: 'static,
Err1: 'static,
Err2: 'static,
{
fn into_new_service(
self,
) -> FnStateNewService<S, F1, F2, Req, Resp, Err1, Err2, Fut1, Fut2> {
FnStateNewService::new(self.0, self.1)
}
}
impl<S, F1, F2, Req, Resp, Err1, Err2, Fut1, Fut2> Clone
for FnStateNewService<S, F1, F2, Req, Resp, Err1, Err2, Fut1, Fut2>
where
F1: Fn(&mut S, Req) -> Fut1 + Clone + 'static,
F2: Fn() -> Fut2 + Clone,
Fut1: IntoFuture<Item = Resp, Error = Err1>,
Fut2: IntoFuture<Item = S, Error = Err2>,
{
fn clone(&self) -> Self {
Self::new(self.f.clone(), self.state.clone())
}
}

2
src/service/mod.rs
View File

@ -6,7 +6,6 @@ pub use tower_service::{NewService, Service};
mod and_then;
mod apply;
mod fn_service;
mod fn_state_service;
mod from_err;
mod map;
mod map_err;
@ -15,7 +14,6 @@ mod map_init_err;
pub use self::and_then::{AndThen, AndThenNewService};
pub use self::apply::{Apply, ApplyNewService};
pub use self::fn_service::{FnNewService, FnService};
pub use self::fn_state_service::{FnStateNewService, FnStateService};
pub use self::from_err::{FromErr, FromErrNewService};
pub use self::map::{Map, MapNewService};
pub use self::map_err::{MapErr, MapErrNewService};