feat(server): Remove Send + Sync requirement for Body in with_graceful_shutdown

espindola · seanmonstar · commit 1d553e52c695 · 2021-10-12T16:47:03.000-07:00
Also expand the single threaded example to use that.
diff --git a/examples/single_threaded.rs b/examples/single_threaded.rs
@@ -2,6 +2,7 @@
 
 use std::cell::Cell;
 use std::rc::Rc;
+use tokio::sync::oneshot;
 
 use hyper::body::{Bytes, HttpBody};
 use hyper::header::{HeaderMap, HeaderValue};
@@ -81,6 +82,13 @@ async fn run() {
 
     let server = Server::bind(&addr).executor(LocalExec).serve(make_service);
 
+    // Just shows that with_graceful_shutdown compiles with !Send,
+    // !Sync HttpBody.
+    let (_tx, rx) = oneshot::channel::<()>();
+    let server = server.with_graceful_shutdown(async move {
+        rx.await.ok();
+    });
+
     println!("Listening on http://{}", addr);
 
     // The server would block on current thread to await !Send futures.
diff --git a/src/server/server.rs b/src/server/server.rs
@@ -121,7 +121,7 @@ where
     IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     S: MakeServiceRef<IO, Body, ResBody = B>,
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
-    B: HttpBody + Send + Sync + 'static,
+    B: HttpBody + 'static,
     B::Error: Into<Box<dyn StdError + Send + Sync>>,
     E: ConnStreamExec<<S::Service as HttpService<Body>>::Future, B>,
     E: NewSvcExec<IO, S::Future, S::Service, E, GracefulWatcher>,
diff --git a/src/server/shutdown.rs b/src/server/shutdown.rs
@@ -54,7 +54,7 @@ where
     IO: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     S: MakeServiceRef<IO, Body, ResBody = B>,
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
-    B: HttpBody + Send + Sync + 'static,
+    B: HttpBody + 'static,
     B::Error: Into<Box<dyn StdError + Send + Sync>>,
     F: Future<Output = ()>,
     E: ConnStreamExec<<S::Service as HttpService<Body>>::Future, B>,
@@ -103,7 +103,7 @@ where
     I: AsyncRead + AsyncWrite + Unpin + Send + 'static,
     S: HttpService<Body>,
     E: ConnStreamExec<S::Future, S::ResBody>,
-    S::ResBody: Send + Sync + 'static,
+    S::ResBody: 'static,
     <S::ResBody as HttpBody>::Error: Into<Box<dyn StdError + Send + Sync>>,
 {
     type Future =
@@ -119,7 +119,7 @@ where
     S: HttpService<Body>,
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
     I: AsyncRead + AsyncWrite + Unpin,
-    S::ResBody: HttpBody + Send + 'static,
+    S::ResBody: HttpBody + 'static,
     <S::ResBody as HttpBody>::Error: Into<Box<dyn StdError + Send + Sync>>,
     E: ConnStreamExec<S::Future, S::ResBody>,
 {
