actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-30 16:34:36 +01:00
Code Issues Releases Wiki Activity

depend on repo

Browse Source
This commit is contained in:
Nikolay Kim 2019-02-03 11:16:24 -08:00
parent 429ad453d3
commit 5b8446105f
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actix-service/src/apply.rs
View File

@ -89,9 +89,9 @@ where
/// `ApplyNewService` new service combinator /// `ApplyNewService` new service combinator
pub struct ApplyNewService<T, S> pub struct ApplyNewService<T, S>
where where
T::Error: From<S::Error>,
// T::InitError: From<S::InitError>, // T::InitError: From<S::InitError>,
T: NewTransform<S::Service, InitError = S::InitError>, T: NewTransform<S::Service, InitError = S::InitError>,
T::Error: From<S::Error>,
S: NewService, S: NewService,
{ {
transform: T, transform: T,
@ -116,9 +116,9 @@ where
} }
} }
impl<F, S, Req, Out> ApplyNewService<FnNewTransform<F, S::Service, Req, Out, S::InitError>, S> impl<F, S, In, Out> ApplyNewService<FnNewTransform<F, S::Service, In, Out, S::InitError>, S>
where where
F: FnMut(Req, &mut S::Service) -> Out + Clone, F: FnMut(In, &mut S::Service) -> Out + Clone,
Out: IntoFuture, Out: IntoFuture,
Out::Error: From<S::Error>, Out::Error: From<S::Error>,
S: NewService, S: NewService,

4
actix-service/src/blank.rs
View File

@ -12,10 +12,6 @@ pub struct Blank<R, E> {
} }
impl<R, E> Blank<R, E> { impl<R, E> Blank<R, E> {
//pub fn new() -> Blank<R, E> {
// Blank { _t: PhantomData }
//}
pub fn err<E1>(self) -> Blank<R, E1> { pub fn err<E1>(self) -> Blank<R, E1> {
Blank { _t: PhantomData } Blank { _t: PhantomData }
} }

2
actix-utils/Cargo.toml
View File

@ -19,7 +19,7 @@ path = "src/lib.rs"
[dependencies] [dependencies]
#actix-service = "0.2.0" #actix-service = "0.2.0"
actix-service = { path="../actix-service" } actix-service = { git = "https://github.com/actix/actix-net.git" }
actix-codec = "0.1.0" actix-codec = "0.1.0"
bytes = "0.4" bytes = "0.4"
futures = "0.1" futures = "0.1"