refactor(server): remove more 'static bounds on Server

seanmonstar · seanmonstar · commit b5e70a0dd198 · 2019-10-24T13:37:11.000-07:00
diff --git a/src/server/conn.rs b/src/server/conn.rs
@@ -902,7 +902,7 @@ pub(crate) mod spawn_all {
     impl<I, S, E> Watcher<I, S, E> for NoopWatcher
     where
         I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-        S: HttpService<Body> + 'static,
+        S: HttpService<Body>,
         <S::ResBody as Payload>::Data: Unpin,
         E: H2Exec<S::Future, S::ResBody>,
     {
@@ -1017,7 +1017,7 @@ mod upgrades {
 
     impl<I, B, S, E> UpgradeableConnection<I, S, E>
     where
-        S: HttpService<Body, ResBody=B>,// + 'static,
+        S: HttpService<Body, ResBody=B>,
         S::Error: Into<Box<dyn StdError + Send + Sync>>,
         I: AsyncRead + AsyncWrite + Unpin,
         B: Payload + 'static,
@@ -1035,7 +1035,7 @@ mod upgrades {
 
     impl<I, B, S, E> Future for UpgradeableConnection<I, S, E>
     where
-        S: HttpService<Body, ResBody=B> + 'static,
+        S: HttpService<Body, ResBody=B>,
         S::Error: Into<Box<dyn StdError + Send + Sync>>,
         I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
         B: Payload + 'static,
diff --git a/src/server/mod.rs b/src/server/mod.rs
@@ -149,7 +149,6 @@ where
     IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     S: MakeServiceRef<IO, Body, ResBody=B>,
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
-    S::Service: 'static,
     B: Payload,
     B::Data: Unpin,
     E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
@@ -206,7 +205,6 @@ where
     IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     S: MakeServiceRef<IO, Body, ResBody=B>,
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
-    S::Service: 'static,
     B: Payload,
     B::Data: Unpin,
     E: H2Exec<<S::Service as HttpService<Body>>::Future, B>,
@@ -392,7 +390,6 @@ impl<I, E> Builder<I, E> {
         I::Conn: AsyncRead + AsyncWrite + Unpin + Send + 'static,
         S: MakeServiceRef<I::Conn, Body, ResBody=B>,
         S::Error: Into<Box<dyn StdError + Send + Sync>>,
-        S::Service: 'static,
         B: Payload,
         B::Data: Unpin,
         E: NewSvcExec<I::Conn, S::Future, S::Service, E, NoopWatcher>,
diff --git a/src/server/shutdown.rs b/src/server/shutdown.rs
@@ -50,7 +50,6 @@ where
     IE: Into<Box<dyn StdError + Send + Sync>>,
     IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     S: MakeServiceRef<IO, Body, ResBody=B>,
-    S::Service: 'static,
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
     B: Payload,
     B::Data: Unpin,
@@ -106,7 +105,7 @@ pub struct GracefulWatcher(Watch);
 impl<I, S, E> Watcher<I, S, E> for GracefulWatcher
 where
     I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
-    S: HttpService<Body> + 'static,
+    S: HttpService<Body>,
     <S::ResBody as Payload>::Data: Unpin,
     E: H2Exec<S::Future, S::ResBody>,
 {
