From ac62e2dbf9f667827f3fcb25f5e076172b6bb410 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sat, 9 Mar 2019 07:27:35 -0800
Subject: [PATCH] revert generic request in actix-utils

---
 actix-utils/src/cloneable.rs | 11 ++---
 actix-utils/src/either.rs    | 62 +++++++++++++++++++--------
 actix-utils/src/framed.rs    | 48 +++++++++++----------
 actix-utils/src/inflight.rs  | 19 +++++----
 actix-utils/src/keepalive.rs |  6 ++-
 actix-utils/src/order.rs     | 83 ++++++++++++++++++++----------------
 actix-utils/src/stream.rs    | 36 +++++++++-------
 actix-utils/src/time.rs      |  4 +-
 actix-utils/src/timeout.rs   | 23 +++++-----
 9 files changed, 173 insertions(+), 119 deletions(-)

diff --git a/actix-utils/src/cloneable.rs b/actix-utils/src/cloneable.rs
index 16a8a2e3..933e6a1f 100644
--- a/actix-utils/src/cloneable.rs
+++ b/actix-utils/src/cloneable.rs
@@ -13,9 +13,9 @@ pub struct CloneableService<T: 'static> {
 }
 
 impl<T: 'static> CloneableService<T> {
-    pub fn new<R>(service: T) -> Self
+    pub fn new(service: T) -> Self
     where
-        T: Service<R>,
+        T: Service,
     {
         Self {
             service: Cell::new(service),
@@ -33,10 +33,11 @@ impl<T: 'static> Clone for CloneableService<T> {
     }
 }
 
-impl<T, R> Service<R> for CloneableService<T>
+impl<T> Service for CloneableService<T>
 where
-    T: Service<R> + 'static,
+    T: Service + 'static,
 {
+    type Request = T::Request;
     type Response = T::Response;
     type Error = T::Error;
     type Future = T::Future;
@@ -45,7 +46,7 @@ where
         self.service.get_mut().poll_ready()
     }
 
-    fn call(&mut self, req: R) -> Self::Future {
+    fn call(&mut self, req: T::Request) -> Self::Future {
         self.service.get_mut().call(req)
     }
 }
diff --git a/actix-utils/src/either.rs b/actix-utils/src/either.rs
index 29bb5c7f..885cd095 100644
--- a/actix-utils/src/either.rs
+++ b/actix-utils/src/either.rs
@@ -21,11 +21,12 @@ impl<A: Clone, B: Clone> Clone for EitherService<A, B> {
     }
 }
 
-impl<A, B, R> Service<R> for EitherService<A, B>
+impl<A, B> Service for EitherService<A, B>
 where
-    A: Service<R>,
-    B: Service<R, Response = A::Response, Error = A::Error>,
+    A: Service,
+    B: Service<Request = A::Request, Response = A::Response, Error = A::Error>,
 {
+    type Request = A::Request;
     type Response = A::Response;
     type Error = A::Error;
     type Future = future::Either<A::Future, B::Future>;
@@ -37,7 +38,7 @@ where
         }
     }
 
-    fn call(&mut self, req: R) -> Self::Future {
+    fn call(&mut self, req: A::Request) -> Self::Future {
         match self {
             EitherService::A(ref mut inner) => future::Either::A(inner.call(req)),
             EitherService::B(ref mut inner) => future::Either::B(inner.call(req)),
@@ -52,33 +53,52 @@ pub enum Either<A, B> {
 }
 
 impl<A, B> Either<A, B> {
-    pub fn new_a<R, C>(srv: A) -> Self
+    pub fn new_a<C>(srv: A) -> Self
     where
-        A: NewService<R, C>,
-        B: NewService<R, C, Response = A::Response, Error = A::Error, InitError = A::InitError>,
+        A: NewService<C>,
+        B: NewService<
+            C,
+            Request = A::Request,
+            Response = A::Response,
+            Error = A::Error,
+            InitError = A::InitError,
+        >,
     {
         Either::A(srv)
     }
 
-    pub fn new_b<R, C>(srv: B) -> Self
+    pub fn new_b<C>(srv: B) -> Self
     where
-        A: NewService<R, C>,
-        B: NewService<R, C, Response = A::Response, Error = A::Error, InitError = A::InitError>,
+        A: NewService<C>,
+        B: NewService<
+            C,
+            Request = A::Request,
+            Response = A::Response,
+            Error = A::Error,
+            InitError = A::InitError,
+        >,
     {
         Either::B(srv)
     }
 }
 
-impl<A, B, R, C> NewService<R, C> for Either<A, B>
+impl<A, B, C> NewService<C> for Either<A, B>
 where
-    A: NewService<R, C>,
-    B: NewService<R, C, Response = A::Response, Error = A::Error, InitError = A::InitError>,
+    A: NewService<C>,
+    B: NewService<
+        C,
+        Request = A::Request,
+        Response = A::Response,
+        Error = A::Error,
+        InitError = A::InitError,
+    >,
 {
+    type Request = A::Request;
     type Response = A::Response;
     type Error = A::Error;
     type InitError = A::InitError;
     type Service = EitherService<A::Service, B::Service>;
-    type Future = EitherNewService<A, B, R, C>;
+    type Future = EitherNewService<A, B, C>;
 
     fn new_service(&self, cfg: &C) -> Self::Future {
         match self {
@@ -98,15 +118,21 @@ impl<A: Clone, B: Clone> Clone for Either<A, B> {
 }
 
 #[doc(hidden)]
-pub enum EitherNewService<A: NewService<R, C>, B: NewService<R, C>, R, C> {
+pub enum EitherNewService<A: NewService<C>, B: NewService<C>, C> {
     A(<A::Future as IntoFuture>::Future),
     B(<B::Future as IntoFuture>::Future),
 }
 
-impl<A, B, R, C> Future for EitherNewService<A, B, R, C>
+impl<A, B, C> Future for EitherNewService<A, B, C>
 where
-    A: NewService<R, C>,
-    B: NewService<R, C, Response = A::Response, Error = A::Error, InitError = A::InitError>,
+    A: NewService<C>,
+    B: NewService<
+        C,
+        Request = A::Request,
+        Response = A::Response,
+        Error = A::Error,
+        InitError = A::InitError,
+    >,
 {
     type Item = EitherService<A::Service, B::Service>;
     type Error = A::InitError;
diff --git a/actix-utils/src/framed.rs b/actix-utils/src/framed.rs
index 7b086248..11d4b0e1 100644
--- a/actix-utils/src/framed.rs
+++ b/actix-utils/src/framed.rs
@@ -23,15 +23,15 @@ pub struct FramedNewService<S, T, U, C> {
 impl<S, T, U, C> FramedNewService<S, T, U, C>
 where
     C: Clone,
-    S: NewService<Request<U>, C, Response = Response<U>>,
+    S: NewService<C, Request = Request<U>, Response = Response<U>>,
     S::Error: 'static,
-    <S::Service as Service<Request<U>>>::Future: 'static,
+    <S::Service as Service>::Future: 'static,
     T: AsyncRead + AsyncWrite,
     U: Decoder + Encoder,
     <U as Encoder>::Item: 'static,
     <U as Encoder>::Error: std::fmt::Debug,
 {
-    pub fn new<F1: IntoNewService<S, Request<U>, C>>(factory: F1) -> Self {
+    pub fn new<F1: IntoNewService<S, C>>(factory: F1) -> Self {
         Self {
             factory: factory.into_new_service(),
             _t: PhantomData,
@@ -51,17 +51,18 @@ where
     }
 }
 
-impl<S, T, U, C> NewService<Framed<T, U>, C> for FramedNewService<S, T, U, C>
+impl<S, T, U, C> NewService<C> for FramedNewService<S, T, U, C>
 where
     C: Clone,
-    S: NewService<Request<U>, C, Response = Response<U>> + Clone,
+    S: NewService<C, Request = Request<U>, Response = Response<U>> + Clone,
     S::Error: 'static,
-    <S::Service as Service<Request<U>>>::Future: 'static,
+    <S::Service as Service>::Future: 'static,
     T: AsyncRead + AsyncWrite,
     U: Decoder + Encoder,
     <U as Encoder>::Item: 'static,
     <U as Encoder>::Error: std::fmt::Debug,
 {
+    type Request = Framed<T, U>;
     type Response = FramedTransport<S::Service, T, U>;
     type Error = S::InitError;
     type InitError = S::InitError;
@@ -97,17 +98,18 @@ where
     }
 }
 
-impl<S, T, U, C> Service<Framed<T, U>> for FramedService<S, T, U, C>
+impl<S, T, U, C> Service for FramedService<S, T, U, C>
 where
-    S: NewService<Request<U>, C, Response = Response<U>>,
+    S: NewService<C, Request = Request<U>, Response = Response<U>>,
     S::Error: 'static,
-    <S::Service as Service<Request<U>>>::Future: 'static,
+    <S::Service as Service>::Future: 'static,
     T: AsyncRead + AsyncWrite,
     U: Decoder + Encoder,
     <U as Encoder>::Item: 'static,
     <U as Encoder>::Error: std::fmt::Debug,
     C: Clone,
 {
+    type Request = Framed<T, U>;
     type Response = FramedTransport<S::Service, T, U>;
     type Error = S::InitError;
     type Future = FramedServiceResponseFuture<S, T, U, C>;
@@ -127,9 +129,9 @@ where
 #[doc(hidden)]
 pub struct FramedServiceResponseFuture<S, T, U, C>
 where
-    S: NewService<Request<U>, C, Response = Response<U>>,
+    S: NewService<C, Request = Request<U>, Response = Response<U>>,
     S::Error: 'static,
-    <S::Service as Service<Request<U>>>::Future: 'static,
+    <S::Service as Service>::Future: 'static,
     T: AsyncRead + AsyncWrite,
     U: Decoder + Encoder,
     <U as Encoder>::Item: 'static,
@@ -141,9 +143,9 @@ where
 
 impl<S, T, U, C> Future for FramedServiceResponseFuture<S, T, U, C>
 where
-    S: NewService<Request<U>, C, Response = Response<U>>,
+    S: NewService<C, Request = Request<U>, Response = Response<U>>,
     S::Error: 'static,
-    <S::Service as Service<Request<U>>>::Future: 'static,
+    <S::Service as Service>::Future: 'static,
     T: AsyncRead + AsyncWrite,
     U: Decoder + Encoder,
     <U as Encoder>::Item: 'static,
@@ -180,7 +182,7 @@ impl<E, U: Encoder + Decoder> From<E> for FramedTransportError<E, U> {
 /// and pass then to the service.
 pub struct FramedTransport<S, T, U>
 where
-    S: Service<Request<U>, Response = Response<U>>,
+    S: Service<Request = Request<U>, Response = Response<U>>,
     S::Error: 'static,
     S::Future: 'static,
     T: AsyncRead + AsyncWrite,
@@ -194,7 +196,7 @@ where
     inner: Cell<FramedTransportInner<<U as Encoder>::Item, S::Error>>,
 }
 
-enum TransportState<S: Service<Request<U>>, U: Encoder + Decoder> {
+enum TransportState<S: Service, U: Encoder + Decoder> {
     Processing,
     Error(FramedTransportError<S::Error, U>),
     FramedError(FramedTransportError<S::Error, U>),
@@ -208,7 +210,7 @@ struct FramedTransportInner<I, E> {
 
 impl<S, T, U> FramedTransport<S, T, U>
 where
-    S: Service<Request<U>, Response = Response<U>>,
+    S: Service<Request = Request<U>, Response = Response<U>>,
     S::Error: 'static,
     S::Future: 'static,
     T: AsyncRead + AsyncWrite,
@@ -300,7 +302,7 @@ where
 
 impl<S, T, U> FramedTransport<S, T, U>
 where
-    S: Service<Request<U>, Response = Response<U>>,
+    S: Service<Request = Request<U>, Response = Response<U>>,
     S::Error: 'static,
     S::Future: 'static,
     T: AsyncRead + AsyncWrite,
@@ -308,7 +310,7 @@ where
     <U as Encoder>::Item: 'static,
     <U as Encoder>::Error: std::fmt::Debug,
 {
-    pub fn new<F: IntoService<S, Request<U>>>(framed: Framed<T, U>, service: F) -> Self {
+    pub fn new<F: IntoService<S>>(framed: Framed<T, U>, service: F) -> Self {
         FramedTransport {
             framed,
             service: service.into_service(),
@@ -346,7 +348,7 @@ where
 
 impl<S, T, U> Future for FramedTransport<S, T, U>
 where
-    S: Service<Request<U>, Response = Response<U>>,
+    S: Service<Request = Request<U>, Response = Response<U>>,
     S::Error: 'static,
     S::Future: 'static,
     T: AsyncRead + AsyncWrite,
@@ -406,19 +408,20 @@ where
     }
 }
 
-impl<T, U, F> NewService<T, ()> for IntoFramed<T, U, F>
+impl<T, C, U, F> NewService<C> for IntoFramed<T, U, F>
 where
     T: AsyncRead + AsyncWrite,
     F: Fn() -> U + Send + Clone + 'static,
     U: Encoder + Decoder,
 {
+    type Request = T;
     type Response = Framed<T, U>;
     type Error = ();
     type InitError = ();
     type Service = IntoFramedService<T, U, F>;
     type Future = FutureResult<Self::Service, Self::InitError>;
 
-    fn new_service(&self, _: &()) -> Self::Future {
+    fn new_service(&self, _: &C) -> Self::Future {
         ok(IntoFramedService {
             factory: self.factory.clone(),
             _t: PhantomData,
@@ -436,12 +439,13 @@ where
     _t: PhantomData<(T,)>,
 }
 
-impl<T, U, F> Service<T> for IntoFramedService<T, U, F>
+impl<T, U, F> Service for IntoFramedService<T, U, F>
 where
     T: AsyncRead + AsyncWrite,
     F: Fn() -> U + Send + Clone + 'static,
     U: Encoder + Decoder,
 {
+    type Request = T;
     type Response = Framed<T, U>;
     type Error = ();
     type Future = FutureResult<Self::Response, Self::Error>;
diff --git a/actix-utils/src/inflight.rs b/actix-utils/src/inflight.rs
index 1462e32a..41955f35 100644
--- a/actix-utils/src/inflight.rs
+++ b/actix-utils/src/inflight.rs
@@ -24,7 +24,8 @@ impl Default for InFlight {
     }
 }
 
-impl<S: Service<R>, R> Transform<S, R> for InFlight {
+impl<S: Service> Transform<S> for InFlight {
+    type Request = S::Request;
     type Response = S::Response;
     type Error = S::Error;
     type InitError = Void;
@@ -50,13 +51,14 @@ impl<S> InFlightService<S> {
     }
 }
 
-impl<T, R> Service<R> for InFlightService<T>
+impl<T> Service for InFlightService<T>
 where
-    T: Service<R>,
+    T: Service,
 {
+    type Request = T::Request;
     type Response = T::Response;
     type Error = T::Error;
-    type Future = InFlightServiceResponse<T, R>;
+    type Future = InFlightServiceResponse<T>;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {
         self.service.poll_ready()?;
@@ -69,7 +71,7 @@ where
         }
     }
 
-    fn call(&mut self, req: R) -> Self::Future {
+    fn call(&mut self, req: T::Request) -> Self::Future {
         InFlightServiceResponse {
             fut: self.service.call(req),
             _guard: self.count.get(),
@@ -78,12 +80,12 @@ where
 }
 
 #[doc(hidden)]
-pub struct InFlightServiceResponse<T: Service<R>, R> {
+pub struct InFlightServiceResponse<T: Service> {
     fut: T::Future,
     _guard: CounterGuard,
 }
 
-impl<T: Service<R>, R> Future for InFlightServiceResponse<T, R> {
+impl<T: Service> Future for InFlightServiceResponse<T> {
     type Item = T::Response;
     type Error = T::Error;
 
@@ -105,7 +107,8 @@ mod tests {
 
     struct SleepService(Duration);
 
-    impl Service<()> for SleepService {
+    impl Service for SleepService {
+        type Request = ();
         type Response = ();
         type Error = ();
         type Future = Box<Future<Item = (), Error = ()>>;
diff --git a/actix-utils/src/keepalive.rs b/actix-utils/src/keepalive.rs
index 89929db7..81305423 100644
--- a/actix-utils/src/keepalive.rs
+++ b/actix-utils/src/keepalive.rs
@@ -43,10 +43,11 @@ where
     }
 }
 
-impl<R, E, F> NewService<R, ()> for KeepAlive<R, E, F>
+impl<R, E, F> NewService<()> for KeepAlive<R, E, F>
 where
     F: Fn() -> E + Clone,
 {
+    type Request = R;
     type Response = R;
     type Error = E;
     type InitError = Void;
@@ -88,10 +89,11 @@ where
     }
 }
 
-impl<R, E, F> Service<R> for KeepAliveService<R, E, F>
+impl<R, E, F> Service for KeepAliveService<R, E, F>
 where
     F: Fn() -> E,
 {
+    type Request = R;
     type Response = R;
     type Error = E;
     type Future = FutureResult<R, E>;
diff --git a/actix-utils/src/order.rs b/actix-utils/src/order.rs
index 8b0e6b6e..b267a0b4 100644
--- a/actix-utils/src/order.rs
+++ b/actix-utils/src/order.rs
@@ -52,39 +52,46 @@ pub struct InOrder<S> {
     _t: PhantomData<S>,
 }
 
-impl<S> InOrder<S> {
-    pub fn new<R>() -> Self
-    where
-        S: Service<R>,
-        S::Response: 'static,
-        S::Future: 'static,
-        S::Error: 'static,
-    {
-        Self { _t: PhantomData }
-    }
-
-    pub fn service<R>(service: S) -> InOrderService<S, R>
-    where
-        S: Service<R>,
-        S::Response: 'static,
-        S::Future: 'static,
-        S::Error: 'static,
-    {
-        InOrderService::new(service)
-    }
-}
-
-impl<S, R> Transform<S, R> for InOrder<S>
+impl<S> InOrder<S>
 where
-    S: Service<R>,
+    S: Service,
     S::Response: 'static,
     S::Future: 'static,
     S::Error: 'static,
 {
+    pub fn new() -> Self {
+        Self { _t: PhantomData }
+    }
+
+    pub fn service(service: S) -> InOrderService<S> {
+        InOrderService::new(service)
+    }
+}
+
+impl<S> Default for InOrder<S>
+where
+    S: Service,
+    S::Response: 'static,
+    S::Future: 'static,
+    S::Error: 'static,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<S> Transform<S> for InOrder<S>
+where
+    S: Service,
+    S::Response: 'static,
+    S::Future: 'static,
+    S::Error: 'static,
+{
+    type Request = S::Request;
     type Response = S::Response;
     type Error = InOrderError<S::Error>;
     type InitError = Void;
-    type Transform = InOrderService<S, R>;
+    type Transform = InOrderService<S>;
     type Future = FutureResult<Self::Transform, Self::InitError>;
 
     fn new_transform(&self, service: S) -> Self::Future {
@@ -92,15 +99,15 @@ where
     }
 }
 
-pub struct InOrderService<S: Service<R>, R> {
+pub struct InOrderService<S: Service> {
     service: S,
     task: Rc<AtomicTask>,
     acks: VecDeque<Record<S::Response, S::Error>>,
 }
 
-impl<S, R> InOrderService<S, R>
+impl<S> InOrderService<S>
 where
-    S: Service<R>,
+    S: Service,
     S::Response: 'static,
     S::Future: 'static,
     S::Error: 'static,
@@ -114,16 +121,17 @@ where
     }
 }
 
-impl<S, R> Service<R> for InOrderService<S, R>
+impl<S> Service for InOrderService<S>
 where
-    S: Service<R>,
+    S: Service,
     S::Response: 'static,
     S::Future: 'static,
     S::Error: 'static,
 {
+    type Request = S::Request;
     type Response = S::Response;
     type Error = InOrderError<S::Error>;
-    type Future = InOrderServiceResponse<S, R>;
+    type Future = InOrderServiceResponse<S>;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {
         // poll_ready could be called from different task
@@ -148,7 +156,7 @@ where
         Ok(Async::Ready(()))
     }
 
-    fn call(&mut self, request: R) -> Self::Future {
+    fn call(&mut self, request: S::Request) -> Self::Future {
         let (tx1, rx1) = oneshot::channel();
         let (tx2, rx2) = oneshot::channel();
         self.acks.push_back(Record { rx: rx1, tx: tx2 });
@@ -165,11 +173,11 @@ where
 }
 
 #[doc(hidden)]
-pub struct InOrderServiceResponse<S: Service<R>, R> {
+pub struct InOrderServiceResponse<S: Service> {
     rx: oneshot::Receiver<Result<S::Response, S::Error>>,
 }
 
-impl<S: Service<R>, R> Future for InOrderServiceResponse<S, R> {
+impl<S: Service> Future for InOrderServiceResponse<S> {
     type Item = S::Response;
     type Error = InOrderError<S::Error>;
 
@@ -196,7 +204,8 @@ mod tests {
 
     struct Srv;
 
-    impl Service<oneshot::Receiver<usize>> for Srv {
+    impl Service for Srv {
+        type Request = oneshot::Receiver<usize>;
         type Response = usize;
         type Error = ();
         type Future = Box<Future<Item = usize, Error = ()>>;
@@ -210,11 +219,11 @@ mod tests {
         }
     }
 
-    struct SrvPoll<S: Service<oneshot::Receiver<usize>>> {
+    struct SrvPoll<S: Service> {
         s: S,
     }
 
-    impl<S: Service<oneshot::Receiver<usize>>> Future for SrvPoll<S> {
+    impl<S: Service> Future for SrvPoll<S> {
         type Item = ();
         type Error = ();
 
diff --git a/actix-utils/src/stream.rs b/actix-utils/src/stream.rs
index b82a66e8..7274fa56 100644
--- a/actix-utils/src/stream.rs
+++ b/actix-utils/src/stream.rs
@@ -38,12 +38,12 @@ impl<S, T, E, C> StreamNewService<S, T, E, C>
 where
     C: Clone,
     S: IntoStream,
-    T: NewService<Request<S>, C, Response = (), Error = E, InitError = E>,
+    T: NewService<C, Request = Request<S>, Response = (), Error = E, InitError = E>,
     T::Future: 'static,
     T::Service: 'static,
-    <T::Service as Service<Request<S>>>::Future: 'static,
+    <T::Service as Service>::Future: 'static,
 {
-    pub fn new<F: IntoNewService<T, Request<S>, C>>(factory: F) -> Self {
+    pub fn new<F: IntoNewService<T, C>>(factory: F) -> Self {
         Self {
             factory: Rc::new(factory.into_new_service()),
             _t: PhantomData,
@@ -60,15 +60,16 @@ impl<S, T, E, C> Clone for StreamNewService<S, T, E, C> {
     }
 }
 
-impl<S, T, E, C> NewService<S, C> for StreamNewService<S, T, E, C>
+impl<S, T, E, C> NewService<C> for StreamNewService<S, T, E, C>
 where
     C: Clone,
     S: IntoStream + 'static,
-    T: NewService<Request<S>, C, Response = (), Error = E, InitError = E>,
+    T: NewService<C, Request = Request<S>, Response = (), Error = E, InitError = E>,
     T::Future: 'static,
     T::Service: 'static,
-    <T::Service as Service<Request<S>>>::Future: 'static,
+    <T::Service as Service>::Future: 'static,
 {
+    type Request = S;
     type Response = ();
     type Error = E;
     type InitError = E;
@@ -90,15 +91,16 @@ pub struct StreamService<S, T, E, C = ()> {
     _t: PhantomData<(S, E)>,
 }
 
-impl<S, T, E, C> Service<S> for StreamService<S, T, E, C>
+impl<S, T, E, C> Service for StreamService<S, T, E, C>
 where
     S: IntoStream + 'static,
-    T: NewService<Request<S>, C, Response = (), Error = E, InitError = E>,
+    T: NewService<C, Request = Request<S>, Response = (), Error = E, InitError = E>,
     T::Future: 'static,
     T::Service: 'static,
-    <T::Service as Service<Request<S>>>::Future: 'static,
+    <T::Service as Service>::Future: 'static,
     C: Clone,
 {
+    type Request = S;
     type Response = ();
     type Error = E;
     type Future = Box<Future<Item = (), Error = E>>;
@@ -119,7 +121,7 @@ where
 pub struct StreamDispatcher<S, T>
 where
     S: IntoStream + 'static,
-    T: Service<Request<S>, Response = ()> + 'static,
+    T: Service<Request = Request<S>, Response = ()> + 'static,
     T::Future: 'static,
 {
     stream: S,
@@ -131,13 +133,13 @@ where
 impl<S, T> StreamDispatcher<S, T>
 where
     S: Stream,
-    T: Service<Request<S>, Response = ()>,
+    T: Service<Request = Request<S>, Response = ()>,
     T::Future: 'static,
 {
     pub fn new<F1, F2>(stream: F1, service: F2) -> Self
     where
         F1: IntoStream<Stream = S, Item = S::Item, Error = S::Error>,
-        F2: IntoService<T, Request<S>>,
+        F2: IntoService<T>,
     {
         let (err_tx, err_rx) = mpsc::unbounded();
         StreamDispatcher {
@@ -152,7 +154,7 @@ where
 impl<S, T> Future for StreamDispatcher<S, T>
 where
     S: Stream,
-    T: Service<Request<S>, Response = ()>,
+    T: Service<Request = Request<S>, Response = ()>,
     T::Future: 'static,
 {
     type Item = ();
@@ -230,14 +232,15 @@ impl<T> Clone for TakeItem<T> {
     }
 }
 
-impl<T: Stream> NewService<T, ()> for TakeItem<T> {
+impl<T: Stream, C> NewService<C> for TakeItem<T> {
+    type Request = T;
     type Response = (Option<T::Item>, T);
     type Error = T::Error;
     type InitError = ();
     type Service = TakeItemService<T>;
     type Future = FutureResult<Self::Service, Self::InitError>;
 
-    fn new_service(&self, _: &()) -> Self::Future {
+    fn new_service(&self, _: &C) -> Self::Future {
         ok(TakeItemService { _t: PhantomData })
     }
 }
@@ -253,7 +256,8 @@ impl<T> Clone for TakeItemService<T> {
     }
 }
 
-impl<T: Stream> Service<T> for TakeItemService<T> {
+impl<T: Stream> Service for TakeItemService<T> {
+    type Request = T;
     type Response = (Option<T::Item>, T);
     type Error = T::Error;
     type Future = TakeItemServiceResponse<T>;
diff --git a/actix-utils/src/time.rs b/actix-utils/src/time.rs
index 57e09846..c30052d0 100644
--- a/actix-utils/src/time.rs
+++ b/actix-utils/src/time.rs
@@ -42,6 +42,7 @@ impl Default for LowResTime {
 }
 
 impl NewService<()> for LowResTime {
+    type Request = ();
     type Response = Instant;
     type Error = Void;
     type InitError = Void;
@@ -87,7 +88,8 @@ impl LowResTimeService {
     }
 }
 
-impl Service<()> for LowResTimeService {
+impl Service for LowResTimeService {
+    type Request = ();
     type Response = Instant;
     type Error = Void;
     type Future = FutureResult<Self::Response, Self::Error>;
diff --git a/actix-utils/src/timeout.rs b/actix-utils/src/timeout.rs
index 10b90aa5..85d69731 100644
--- a/actix-utils/src/timeout.rs
+++ b/actix-utils/src/timeout.rs
@@ -80,10 +80,11 @@ impl<E> Clone for Timeout<E> {
     }
 }
 
-impl<S, R, E> Transform<S, R> for Timeout<E>
+impl<S, E> Transform<S> for Timeout<E>
 where
-    S: Service<R>,
+    S: Service,
 {
+    type Request = S::Request;
     type Response = S::Response;
     type Error = TimeoutError<S::Error>;
     type InitError = E;
@@ -111,19 +112,20 @@ impl<S> TimeoutService<S> {
     }
 }
 
-impl<S, R> Service<R> for TimeoutService<S>
+impl<S> Service for TimeoutService<S>
 where
-    S: Service<R>,
+    S: Service,
 {
+    type Request = S::Request;
     type Response = S::Response;
     type Error = TimeoutError<S::Error>;
-    type Future = TimeoutServiceResponse<S, R>;
+    type Future = TimeoutServiceResponse<S>;
 
     fn poll_ready(&mut self) -> Poll<(), Self::Error> {
         self.service.poll_ready().map_err(TimeoutError::Service)
     }
 
-    fn call(&mut self, request: R) -> Self::Future {
+    fn call(&mut self, request: S::Request) -> Self::Future {
         TimeoutServiceResponse {
             fut: self.service.call(request),
             sleep: Delay::new(clock::now() + self.timeout),
@@ -133,14 +135,14 @@ where
 
 /// `TimeoutService` response future
 #[derive(Debug)]
-pub struct TimeoutServiceResponse<T: Service<R>, R> {
+pub struct TimeoutServiceResponse<T: Service> {
     fut: T::Future,
     sleep: Delay,
 }
 
-impl<T, R> Future for TimeoutServiceResponse<T, R>
+impl<T> Future for TimeoutServiceResponse<T>
 where
-    T: Service<R>,
+    T: Service,
 {
     type Item = T::Response;
     type Error = TimeoutError<T::Error>;
@@ -175,7 +177,8 @@ mod tests {
 
     struct SleepService(Duration);
 
-    impl Service<()> for SleepService {
+    impl Service for SleepService {
+        type Request = ();
         type Response = ();
         type Error = ();
         type Future = Box<Future<Item = (), Error = ()>>;