Move serve implementation out of WithGracefulShutdown

axum/src/serve/mod.rs

@@ -267,14 +267,14 @@ where
 
     fn into_future(self) -> Self::IntoFuture {
         private::ServeFuture(Box::pin(async move {
-            self.run().await;
+            do_serve(self.listener, self.make_service, self.signal).await;
             Ok(())
         }))
     }
 }
 
 #[cfg(all(feature = "tokio", any(feature = "http1", feature = "http2")))]
-impl<L, M, S, F> WithGracefulShutdown<L, M, S, F>
+async fn do_serve<L, M, F, S>(mut listener: L, mut make_service: M, signal: F)
 where
     L: Listener,
     L::Addr: Debug,
@@ -284,14 +284,6 @@ where
     S::Future: Send,
     F: Future<Output = ()> + Send + 'static,
 {
-    async fn run(self) {
-        let Self {
-            mut listener,
-            mut make_service,
-            signal,
-            _marker: _,
-        } = self;
-
     let (signal_tx, signal_rx) = watch::channel(());
     tokio::spawn(async move {
         signal.await;
@@ -371,7 +363,6 @@ where
     );
     close_tx.closed().await;
 }
-}
 
 /// An incoming stream.
 ///