diff --git a/actix-service/src/apply.rs b/actix-service/src/apply.rs index 2a821fe8..1335bcf8 100644 --- a/actix-service/src/apply.rs +++ b/actix-service/src/apply.rs @@ -89,9 +89,9 @@ where /// `ApplyNewService` new service combinator pub struct ApplyNewService where - T::Error: From, // T::InitError: From, T: NewTransform, + T::Error: From, S: NewService, { transform: T, @@ -116,9 +116,9 @@ where } } -impl ApplyNewService, S> +impl ApplyNewService, S> where - F: FnMut(Req, &mut S::Service) -> Out + Clone, + F: FnMut(In, &mut S::Service) -> Out + Clone, Out: IntoFuture, Out::Error: From, S: NewService, diff --git a/actix-service/src/blank.rs b/actix-service/src/blank.rs index ff736123..6a385dca 100644 --- a/actix-service/src/blank.rs +++ b/actix-service/src/blank.rs @@ -12,10 +12,6 @@ pub struct Blank { } impl Blank { - //pub fn new() -> Blank { - // Blank { _t: PhantomData } - //} - pub fn err(self) -> Blank { Blank { _t: PhantomData } } diff --git a/actix-utils/Cargo.toml b/actix-utils/Cargo.toml index ca652119..a71e29a4 100644 --- a/actix-utils/Cargo.toml +++ b/actix-utils/Cargo.toml @@ -19,7 +19,7 @@ path = "src/lib.rs" [dependencies] #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" bytes = "0.4" futures = "0.1"