From 6e19dde3e7be1b87a7cf5ad12923476c91be4a79 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Fri, 25 Dec 2020 02:05:31 +0000
Subject: [PATCH] update other crates

---
 actix-connect/src/connector.rs |  6 ++---
 actix-connect/src/lib.rs       | 12 +++++-----
 actix-connect/src/resolve.rs   |  6 ++---
 actix-connect/src/service.rs   | 17 ++++++--------
 actix-server/src/config.rs     | 28 +++++++++++-----------
 actix-server/src/service.rs    | 31 +++++++++++++-----------
 actix-tracing/src/lib.rs       | 33 ++++++++++----------------
 actix-utils/Cargo.toml         |  2 +-
 actix-utils/src/dispatcher.rs  | 39 ++++++++++++++++++++----------
 actix-utils/src/timeout.rs     | 43 +++++++++++++++++++---------------
 10 files changed, 113 insertions(+), 104 deletions(-)

diff --git a/actix-connect/src/connector.rs b/actix-connect/src/connector.rs
index 9dc9a2ad..e4c86d91 100644
--- a/actix-connect/src/connector.rs
+++ b/actix-connect/src/connector.rs
@@ -40,8 +40,7 @@ impl<T> Clone for TcpConnectorFactory<T> {
     }
 }
 
-impl<T: Address> ServiceFactory for TcpConnectorFactory<T> {
-    type Request = Connect<T>;
+impl<T: Address> ServiceFactory<Connect<T>> for TcpConnectorFactory<T> {
     type Response = Connection<T, TcpStream>;
     type Error = ConnectError;
     type Config = ();
@@ -70,8 +69,7 @@ impl<T> Clone for TcpConnector<T> {
     }
 }
 
-impl<T: Address> Service for TcpConnector<T> {
-    type Request = Connect<T>;
+impl<T: Address> Service<Connect<T>> for TcpConnector<T> {
     type Response = Connection<T, TcpStream>;
     type Error = ConnectError;
     #[allow(clippy::type_complexity)]
diff --git a/actix-connect/src/lib.rs b/actix-connect/src/lib.rs
index 36d0b98a..d2111d41 100644
--- a/actix-connect/src/lib.rs
+++ b/actix-connect/src/lib.rs
@@ -76,8 +76,8 @@ pub async fn start_default_resolver() -> Result<AsyncResolver, ConnectError> {
 /// Create TCP connector service.
 pub fn new_connector<T: Address + 'static>(
     resolver: AsyncResolver,
-) -> impl Service<Request = Connect<T>, Response = Connection<T, TcpStream>, Error = ConnectError>
-       + Clone {
+) -> impl Service<Connect<T>, Response = Connection<T, TcpStream>, Error = ConnectError> + Clone
+{
     pipeline(Resolver::new(resolver)).and_then(TcpConnector::new())
 }
 
@@ -85,8 +85,8 @@ pub fn new_connector<T: Address + 'static>(
 pub fn new_connector_factory<T: Address + 'static>(
     resolver: AsyncResolver,
 ) -> impl ServiceFactory<
+    Connect<T>,
     Config = (),
-    Request = Connect<T>,
     Response = Connection<T, TcpStream>,
     Error = ConnectError,
     InitError = (),
@@ -96,15 +96,15 @@ pub fn new_connector_factory<T: Address + 'static>(
 
 /// Create connector service with default parameters.
 pub fn default_connector<T: Address + 'static>(
-) -> impl Service<Request = Connect<T>, Response = Connection<T, TcpStream>, Error = ConnectError>
-       + Clone {
+) -> impl Service<Connect<T>, Response = Connection<T, TcpStream>, Error = ConnectError> + Clone
+{
     pipeline(Resolver::default()).and_then(TcpConnector::new())
 }
 
 /// Create connector service factory with default parameters.
 pub fn default_connector_factory<T: Address + 'static>() -> impl ServiceFactory<
+    Connect<T>,
     Config = (),
-    Request = Connect<T>,
     Response = Connection<T, TcpStream>,
     Error = ConnectError,
     InitError = (),
diff --git a/actix-connect/src/resolve.rs b/actix-connect/src/resolve.rs
index bfb1482f..85edf0d8 100644
--- a/actix-connect/src/resolve.rs
+++ b/actix-connect/src/resolve.rs
@@ -54,8 +54,7 @@ impl<T> Clone for ResolverFactory<T> {
     }
 }
 
-impl<T: Address> ServiceFactory for ResolverFactory<T> {
-    type Request = Connect<T>;
+impl<T: Address> ServiceFactory<Connect<T>> for ResolverFactory<T> {
     type Response = Connect<T>;
     type Error = ConnectError;
     type Config = ();
@@ -102,8 +101,7 @@ impl<T> Clone for Resolver<T> {
     }
 }
 
-impl<T: Address> Service for Resolver<T> {
-    type Request = Connect<T>;
+impl<T: Address> Service<Connect<T>> for Resolver<T> {
     type Response = Connect<T>;
     type Error = ConnectError;
     #[allow(clippy::type_complexity)]
diff --git a/actix-connect/src/service.rs b/actix-connect/src/service.rs
index 1047e3df..ef5d04da 100644
--- a/actix-connect/src/service.rs
+++ b/actix-connect/src/service.rs
@@ -70,8 +70,7 @@ impl<T> Clone for ConnectServiceFactory<T> {
     }
 }
 
-impl<T: Address> ServiceFactory for ConnectServiceFactory<T> {
-    type Request = Connect<T>;
+impl<T: Address> ServiceFactory<Connect<T>> for ConnectServiceFactory<T> {
     type Response = Connection<T, TcpStream>;
     type Error = ConnectError;
     type Config = ();
@@ -90,8 +89,7 @@ pub struct ConnectService<T> {
     resolver: Resolver<T>,
 }
 
-impl<T: Address> Service for ConnectService<T> {
-    type Request = Connect<T>;
+impl<T: Address> Service<Connect<T>> for ConnectService<T> {
     type Response = Connection<T, TcpStream>;
     type Error = ConnectError;
     type Future = ConnectServiceResponse<T>;
@@ -109,8 +107,8 @@ impl<T: Address> Service for ConnectService<T> {
 }
 
 enum ConnectState<T: Address> {
-    Resolve(<Resolver<T> as Service>::Future),
-    Connect(<TcpConnector<T> as Service>::Future),
+    Resolve(<Resolver<T> as Service<Connect<T>>>::Future),
+    Connect(<TcpConnector<T> as Service<Connect<T>>>::Future),
 }
 
 impl<T: Address> ConnectState<T> {
@@ -160,8 +158,7 @@ pub struct TcpConnectService<T> {
     resolver: Resolver<T>,
 }
 
-impl<T: Address + 'static> Service for TcpConnectService<T> {
-    type Request = Connect<T>;
+impl<T: Address + 'static> Service<Connect<T>> for TcpConnectService<T> {
     type Response = TcpStream;
     type Error = ConnectError;
     type Future = TcpConnectServiceResponse<T>;
@@ -179,8 +176,8 @@ impl<T: Address + 'static> Service for TcpConnectService<T> {
 }
 
 enum TcpConnectState<T: Address> {
-    Resolve(<Resolver<T> as Service>::Future),
-    Connect(<TcpConnector<T> as Service>::Future),
+    Resolve(<Resolver<T> as Service<Connect<T>>>::Future),
+    Connect(<TcpConnector<T> as Service<Connect<T>>>::Future),
 }
 
 impl<T: Address> TcpConnectState<T> {
diff --git a/actix-server/src/config.rs b/actix-server/src/config.rs
index 28996b9b..a1315a72 100644
--- a/actix-server/src/config.rs
+++ b/actix-server/src/config.rs
@@ -2,7 +2,10 @@ use std::collections::HashMap;
 use std::{fmt, io, net};
 
 use actix_rt::net::TcpStream;
-use actix_service as actix;
+use actix_service::{
+    fn_service, IntoServiceFactory as IntoBaseServiceFactory,
+    ServiceFactory as BaseServiceFactory,
+};
 use actix_utils::counter::CounterGuard;
 use futures_util::future::{ok, Future, FutureExt, LocalBoxFuture};
 use log::error;
@@ -141,12 +144,10 @@ impl InternalServiceFactory for ConfiguredService {
                     let name = names.remove(&token).unwrap().0;
                     res.push((
                         token,
-                        Box::new(StreamService::new(actix::fn_service(
-                            move |_: TcpStream| {
-                                error!("Service {:?} is not configured", name);
-                                ok::<_, ()>(())
-                            },
-                        ))),
+                        Box::new(StreamService::new(fn_service(move |_: TcpStream| {
+                            error!("Service {:?} is not configured", name);
+                            ok::<_, ()>(())
+                        }))),
                     ));
                 };
             }
@@ -208,8 +209,8 @@ impl ServiceRuntime {
     /// *ServiceConfig::bind()* or *ServiceConfig::listen()* methods.
     pub fn service<T, F>(&mut self, name: &str, service: F)
     where
-        F: actix::IntoServiceFactory<T>,
-        T: actix::ServiceFactory<Config = (), Request = TcpStream> + 'static,
+        F: IntoBaseServiceFactory<T, TcpStream>,
+        T: BaseServiceFactory<TcpStream, Config = ()> + 'static,
         T::Future: 'static,
         T::Service: 'static,
         T::InitError: fmt::Debug,
@@ -237,8 +238,8 @@ impl ServiceRuntime {
 }
 
 type BoxedNewService = Box<
-    dyn actix::ServiceFactory<
-        Request = (Option<CounterGuard>, StdStream),
+    dyn BaseServiceFactory<
+        (Option<CounterGuard>, StdStream),
         Response = (),
         Error = (),
         InitError = (),
@@ -252,15 +253,14 @@ struct ServiceFactory<T> {
     inner: T,
 }
 
-impl<T> actix::ServiceFactory for ServiceFactory<T>
+impl<T> BaseServiceFactory<(Option<CounterGuard>, StdStream)> for ServiceFactory<T>
 where
-    T: actix::ServiceFactory<Config = (), Request = TcpStream>,
+    T: BaseServiceFactory<TcpStream, Config = ()>,
     T::Future: 'static,
     T::Service: 'static,
     T::Error: 'static,
     T::InitError: fmt::Debug + 'static,
 {
-    type Request = (Option<CounterGuard>, StdStream);
     type Response = ();
     type Error = ();
     type Config = ();
diff --git a/actix-server/src/service.rs b/actix-server/src/service.rs
index 4fc49586..569ce048 100644
--- a/actix-server/src/service.rs
+++ b/actix-server/src/service.rs
@@ -3,7 +3,7 @@ use std::net::SocketAddr;
 use std::task::{Context, Poll};
 
 use actix_rt::spawn;
-use actix_service::{self as actix, Service, ServiceFactory as ActixServiceFactory};
+use actix_service::{Service, ServiceFactory as BaseServiceFactory};
 use actix_utils::counter::CounterGuard;
 use futures_util::future::{err, ok, LocalBoxFuture, Ready};
 use futures_util::{FutureExt, TryFutureExt};
@@ -13,7 +13,7 @@ use super::Token;
 use crate::socket::{FromStream, StdStream};
 
 pub trait ServiceFactory<Stream: FromStream>: Send + Clone + 'static {
-    type Factory: actix::ServiceFactory<Config = (), Request = Stream>;
+    type Factory: BaseServiceFactory<Stream, Config = ()>;
 
     fn create(&self) -> Self::Factory;
 }
@@ -28,31 +28,34 @@ pub(crate) trait InternalServiceFactory: Send {
 
 pub(crate) type BoxedServerService = Box<
     dyn Service<
-        Request = (Option<CounterGuard>, StdStream),
+        (Option<CounterGuard>, StdStream),
         Response = (),
         Error = (),
         Future = Ready<Result<(), ()>>,
     >,
 >;
 
-pub(crate) struct StreamService<T> {
-    service: T,
+pub(crate) struct StreamService<S, I> {
+    service: S,
+    _phantom: PhantomData<I>,
 }
 
-impl<T> StreamService<T> {
-    pub(crate) fn new(service: T) -> Self {
-        StreamService { service }
+impl<S, I> StreamService<S, I> {
+    pub(crate) fn new(service: S) -> Self {
+        StreamService {
+            service,
+            _phantom: PhantomData,
+        }
     }
 }
 
-impl<T, I> Service for StreamService<T>
+impl<S, I> Service<(Option<CounterGuard>, StdStream)> for StreamService<S, I>
 where
-    T: Service<Request = I>,
-    T::Future: 'static,
-    T::Error: 'static,
+    S: Service<I>,
+    S::Future: 'static,
+    S::Error: 'static,
     I: FromStream,
 {
-    type Request = (Option<CounterGuard>, StdStream);
     type Response = ();
     type Error = ();
     type Future = Ready<Result<(), ()>>;
@@ -144,7 +147,7 @@ where
 impl<F, T, I> ServiceFactory<I> for F
 where
     F: Fn() -> T + Send + Clone + 'static,
-    T: actix::ServiceFactory<Config = (), Request = I>,
+    T: BaseServiceFactory<I, Config = ()>,
     I: FromStream,
 {
     type Factory = T;
diff --git a/actix-tracing/src/lib.rs b/actix-tracing/src/lib.rs
index b61ffac8..ada61daa 100644
--- a/actix-tracing/src/lib.rs
+++ b/actix-tracing/src/lib.rs
@@ -27,12 +27,11 @@ impl<S, F> TracingService<S, F> {
     }
 }
 
-impl<S, F> Service for TracingService<S, F>
+impl<S, Req, F> Service<Req> for TracingService<S, F>
 where
-    S: Service,
-    F: Fn(&S::Request) -> Option<tracing::Span>,
+    S: Service<Req>,
+    F: Fn(&Req) -> Option<tracing::Span>,
 {
-    type Request = S::Request;
     type Response = S::Response;
     type Error = S::Error;
     type Future = Either<S::Future, Instrumented<S::Future>>;
@@ -41,7 +40,7 @@ where
         self.inner.poll_ready(ctx)
     }
 
-    fn call(&mut self, req: Self::Request) -> Self::Future {
+    fn call(&mut self, req: Req) -> Self::Future {
         let span = (self.make_span)(&req);
         let _enter = span.as_ref().map(|s| s.enter());
 
@@ -74,18 +73,12 @@ impl<S, U, F> TracingTransform<S, U, F> {
     }
 }
 
-impl<S, U, F> Transform<S> for TracingTransform<S, U, F>
+impl<S, Req, U, F> Transform<S, Req> for TracingTransform<S, U, F>
 where
-    S: Service,
-    U: ServiceFactory<
-        Request = S::Request,
-        Response = S::Response,
-        Error = S::Error,
-        Service = S,
-    >,
-    F: Fn(&S::Request) -> Option<tracing::Span> + Clone,
+    S: Service<Req>,
+    U: ServiceFactory<Req, Response = S::Response, Error = S::Error, Service = S>,
+    F: Fn(&Req) -> Option<tracing::Span> + Clone,
 {
-    type Request = S::Request;
     type Response = S::Response;
     type Error = S::Error;
     type Transform = TracingService<S, F>;
@@ -110,14 +103,14 @@ where
 ///     |req: &Request| Some(span!(Level::INFO, "request", req.id))
 /// );
 /// ```
-pub fn trace<S, U, F>(
+pub fn trace<S, Req, U, F>(
     service_factory: U,
     make_span: F,
-) -> ApplyTransform<TracingTransform<S::Service, S, F>, S>
+) -> ApplyTransform<TracingTransform<S::Service, S, F>, S, Req>
 where
-    S: ServiceFactory,
-    F: Fn(&S::Request) -> Option<tracing::Span> + Clone,
-    U: IntoServiceFactory<S>,
+    S: ServiceFactory<Req>,
+    F: Fn(&Req) -> Option<tracing::Span> + Clone,
+    U: IntoServiceFactory<S, Req>,
 {
     apply(
         TracingTransform::new(make_span),
diff --git a/actix-utils/Cargo.toml b/actix-utils/Cargo.toml
index f5bd5793..fb7ed151 100644
--- a/actix-utils/Cargo.toml
+++ b/actix-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-utils"
-version = "3.0.0"
+version = "2.0.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Various network related services and utilities for the Actix ecosystem."
 keywords = ["network", "framework", "async", "futures"]
diff --git a/actix-utils/src/dispatcher.rs b/actix-utils/src/dispatcher.rs
index c3cb4f16..1e55aa2c 100644
--- a/actix-utils/src/dispatcher.rs
+++ b/actix-utils/src/dispatcher.rs
@@ -1,4 +1,4 @@
-//! Framed dispatcher service and related utilities
+//! Framed dispatcher service and related utilities.
 
 #![allow(type_alias_bounds)]
 
@@ -11,6 +11,7 @@ use actix_codec::{AsyncRead, AsyncWrite, Decoder, Encoder, Framed};
 use actix_service::{IntoService, Service};
 use futures_core::stream::Stream;
 use log::debug;
+use pin_project_lite::pin_project;
 
 use crate::mpsc;
 
@@ -62,12 +63,12 @@ pub enum Message<T> {
     Close,
 }
 
-pin_project_lite::pin_project! {
+pin_project! {
     /// Dispatcher is a future that reads frames from Framed object
     /// and passes them to the service.
     pub struct Dispatcher<S, T, U, I>
     where
-        S: Service<Request = <U as Decoder>::Item, Response = I>,
+        S: Service<<U as Decoder>::Item, Response = I>,
         S::Error: 'static,
         S::Future: 'static,
         T: AsyncRead,
@@ -86,7 +87,11 @@ pin_project_lite::pin_project! {
     }
 }
 
-enum State<S: Service, U: Encoder<I> + Decoder, I> {
+enum State<S, U, I>
+where
+    S: Service<<U as Decoder>::Item>,
+    U: Encoder<I> + Decoder,
+{
     Processing,
     Error(DispatcherError<S::Error, U, I>),
     FramedError(DispatcherError<S::Error, U, I>),
@@ -94,7 +99,11 @@ enum State<S: Service, U: Encoder<I> + Decoder, I> {
     Stopping,
 }
 
-impl<S: Service, U: Encoder<I> + Decoder, I> State<S, U, I> {
+impl<S, U, I> State<S, U, I>
+where
+    S: Service<<U as Decoder>::Item>,
+    U: Encoder<I> + Decoder,
+{
     fn take_error(&mut self) -> DispatcherError<S::Error, U, I> {
         match mem::replace(self, State::Processing) {
             State::Error(err) => err,
@@ -112,7 +121,7 @@ impl<S: Service, U: Encoder<I> + Decoder, I> State<S, U, I> {
 
 impl<S, T, U, I> Dispatcher<S, T, U, I>
 where
-    S: Service<Request = <U as Decoder>::Item, Response = I>,
+    S: Service<<U as Decoder>::Item, Response = I>,
     S::Error: 'static,
     S::Future: 'static,
     T: AsyncRead + AsyncWrite,
@@ -121,7 +130,10 @@ where
     <U as Decoder>::Error: fmt::Debug,
     <U as Encoder<I>>::Error: fmt::Debug,
 {
-    pub fn new<F: IntoService<S>>(framed: Framed<T, U>, service: F) -> Self {
+    pub fn new<F>(framed: Framed<T, U>, service: F) -> Self
+    where
+        F: IntoService<S, <U as Decoder>::Item>,
+    {
         let (tx, rx) = mpsc::channel();
         Dispatcher {
             framed,
@@ -133,11 +145,14 @@ where
     }
 
     /// Construct new `Dispatcher` instance with customer `mpsc::Receiver`
-    pub fn with_rx<F: IntoService<S>>(
+    pub fn with_rx<F>(
         framed: Framed<T, U>,
         service: F,
         rx: mpsc::Receiver<Result<Message<I>, S::Error>>,
-    ) -> Self {
+    ) -> Self
+    where
+        F: IntoService<S, <U as Decoder>::Item>,
+    {
         let tx = rx.sender();
         Dispatcher {
             framed,
@@ -176,7 +191,7 @@ where
 
     fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> bool
     where
-        S: Service<Request = <U as Decoder>::Item, Response = I>,
+        S: Service<<U as Decoder>::Item, Response = I>,
         S::Error: 'static,
         S::Future: 'static,
         T: AsyncRead + AsyncWrite,
@@ -220,7 +235,7 @@ where
     /// write to framed object
     fn poll_write(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> bool
     where
-        S: Service<Request = <U as Decoder>::Item, Response = I>,
+        S: Service<<U as Decoder>::Item, Response = I>,
         S::Error: 'static,
         S::Future: 'static,
         T: AsyncRead + AsyncWrite,
@@ -271,7 +286,7 @@ where
 
 impl<S, T, U, I> Future for Dispatcher<S, T, U, I>
 where
-    S: Service<Request = <U as Decoder>::Item, Response = I>,
+    S: Service<<U as Decoder>::Item, Response = I>,
     S::Error: 'static,
     S::Future: 'static,
     T: AsyncRead + AsyncWrite,
diff --git a/actix-utils/src/timeout.rs b/actix-utils/src/timeout.rs
index f3489b85..d253d25d 100644
--- a/actix-utils/src/timeout.rs
+++ b/actix-utils/src/timeout.rs
@@ -2,6 +2,7 @@
 //!
 //! If the response does not complete within the specified timeout, the response
 //! will be aborted.
+
 use core::future::Future;
 use core::marker::PhantomData;
 use core::pin::Pin;
@@ -10,6 +11,7 @@ use core::{fmt, time};
 
 use actix_rt::time::{delay_for, Delay};
 use actix_service::{IntoService, Service, Transform};
+use pin_project_lite::pin_project;
 
 /// Applies a timeout to requests.
 #[derive(Debug)]
@@ -77,21 +79,21 @@ impl<E> Clone for Timeout<E> {
     }
 }
 
-impl<S, E> Transform<S> for Timeout<E>
+impl<S, E, Req> Transform<S, Req> for Timeout<E>
 where
-    S: Service,
+    S: Service<Req>,
 {
-    type Request = S::Request;
     type Response = S::Response;
     type Error = TimeoutError<S::Error>;
-    type Transform = TimeoutService<S>;
     type InitError = E;
+    type Transform = TimeoutService<S, Req>;
     type Future = TimeoutFuture<Self::Transform, Self::InitError>;
 
     fn new_transform(&self, service: S) -> Self::Future {
         let service = TimeoutService {
             service,
             timeout: self.timeout,
+            _phantom: PhantomData,
         };
 
         TimeoutFuture {
@@ -118,40 +120,41 @@ impl<T, E> Future for TimeoutFuture<T, E> {
 
 /// Applies a timeout to requests.
 #[derive(Debug, Clone)]
-pub struct TimeoutService<S> {
+pub struct TimeoutService<S, Req> {
     service: S,
     timeout: time::Duration,
+    _phantom: PhantomData<Req>,
 }
 
-impl<S> TimeoutService<S>
+impl<S, Req> TimeoutService<S, Req>
 where
-    S: Service,
+    S: Service<Req>,
 {
     pub fn new<U>(timeout: time::Duration, service: U) -> Self
     where
-        U: IntoService<S>,
+        U: IntoService<S, Req>,
     {
         TimeoutService {
             timeout,
             service: service.into_service(),
+            _phantom: PhantomData,
         }
     }
 }
 
-impl<S> Service for TimeoutService<S>
+impl<S, Req> Service<Req> for TimeoutService<S, Req>
 where
-    S: Service,
+    S: Service<Req>,
 {
-    type Request = S::Request;
     type Response = S::Response;
     type Error = TimeoutError<S::Error>;
-    type Future = TimeoutServiceResponse<S>;
+    type Future = TimeoutServiceResponse<S, Req>;
 
     fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.service.poll_ready(cx).map_err(TimeoutError::Service)
     }
 
-    fn call(&mut self, request: S::Request) -> Self::Future {
+    fn call(&mut self, request: Req) -> Self::Future {
         TimeoutServiceResponse {
             fut: self.service.call(request),
             sleep: delay_for(self.timeout),
@@ -159,19 +162,22 @@ where
     }
 }
 
-pin_project_lite::pin_project! {
+pin_project! {
     /// `TimeoutService` response future
     #[derive(Debug)]
-    pub struct TimeoutServiceResponse<T: Service> {
+    pub struct TimeoutServiceResponse<T, Req>
+    where
+        T: Service<Req>
+    {
         #[pin]
         fut: T::Future,
         sleep: Delay,
     }
 }
 
-impl<T> Future for TimeoutServiceResponse<T>
+impl<T, Req> Future for TimeoutServiceResponse<T, Req>
 where
-    T: Service,
+    T: Service<Req>,
 {
     type Output = Result<T::Response, TimeoutError<T::Error>>;
 
@@ -204,8 +210,7 @@ mod tests {
 
     struct SleepService(Duration);
 
-    impl Service for SleepService {
-        type Request = ();
+    impl Service<()> for SleepService {
         type Response = ();
         type Error = ();
         type Future = LocalBoxFuture<'static, Result<(), ()>>;