Make stopper optional

Author: rusty

src/listener/tcp_listener.rs

@@ -9,6 +9,8 @@ use async_std::net::{self, SocketAddr, TcpStream};
 use async_std::prelude::*;
 use async_std::{io, task};
 
+use futures_util::future::Either;
+
 /// This represents a tide [Listener](crate::listener::Listener) that
 /// wraps an [async_std::net::TcpListener]. It is implemented as an
 /// enum in order to allow creation of a tide::listener::TcpListener
@@ -98,7 +100,12 @@ where
             .take()
             .expect("`Listener::bind` must be called before `Listener::accept`");
 
-        let mut incoming = server.stopper.clone().stop_stream(listener.incoming());
+        let incoming = listener.incoming();
+        let mut incoming = if let Some(stopper) = server.stopper.clone() {
+            Either::Left(stopper.stop_stream(incoming))
+        } else {
+            Either::Right(incoming)
+        };
 
         while let Some(stream) = incoming.next().await {
             match stream {

src/listener/unix_listener.rs

@@ -10,6 +10,8 @@ use async_std::path::PathBuf;
 use async_std::prelude::*;
 use async_std::{io, task};
 
+use futures_util::future::Either;
+
 /// This represents a tide [Listener](crate::listener::Listener) that
 /// wraps an [async_std::os::unix::net::UnixListener]. It is implemented as an
 /// enum in order to allow creation of a tide::listener::UnixListener
@@ -96,7 +98,12 @@ where
             .take()
             .expect("`Listener::bind` must be called before `Listener::accept`");
 
-        let mut incoming = server.stopper.clone().stop_stream(listener.incoming());
+        let incoming = listener.incoming();
+        let mut incoming = if let Some(stopper) = server.stopper.clone() {
+            Either::Left(stopper.stop_stream(incoming))
+        } else {
+            Either::Right(incoming)
+        };
 
         while let Some(stream) = incoming.next().await {
             match stream {

src/server.rs

@@ -40,7 +40,7 @@ pub struct Server<State> {
     /// We don't use a Mutex around the Vec here because adding a middleware during execution should be an error.
     #[allow(clippy::rc_buffer)]
     middleware: Arc<Vec<Arc<dyn Middleware<State>>>>,
-    pub(crate) stopper: Stopper,
+    pub(crate) stopper: Option<Stopper>,
 }
 
 impl Server<()> {
@@ -116,7 +116,7 @@ where
                 Arc::new(log::LogMiddleware::new()),
             ]),
             state,
-            stopper: Stopper::new(),
+            stopper: None,
         }
     }
 
@@ -342,7 +342,7 @@ where
     /// stopper.stop();
     /// ```
     pub fn with_stopper(&mut self, stopper: Stopper) -> &mut Self {
-        self.stopper = stopper;
+        self.stopper = Some(stopper);
         self
     }
 }