Fix layers being cloned for each request (#2586)

tokio-rs · Mar 14, 2024 · 19f6f79 · 19f6f79
1 parent 3569950
commit 19f6f79
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/axum/CHANGELOG.md b/axum/CHANGELOG.md
@@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # Unreleased
 
-- None.
+- **fixed:** Fixed layers being cloned when calling `axum::serve` directly with
+  a `Router` or `MethodRouter` ([#2586])
+
+[#2586]: https://github.com/tokio-rs/axum/pull/2586
 
 # 0.7.4 (13. January, 2024)
 

diff --git a/axum/src/routing/method_routing.rs b/axum/src/routing/method_routing.rs
@@ -1239,7 +1239,7 @@ const _: () = {
         }
 
         fn call(&mut self, _req: IncomingStream<'_>) -> Self::Future {
-            std::future::ready(Ok(self.clone()))
+            std::future::ready(Ok(self.clone().with_state(())))
         }
     }
 };

diff --git a/axum/src/routing/mod.rs b/axum/src/routing/mod.rs
@@ -492,7 +492,9 @@ const _: () = {
         }
 
         fn call(&mut self, _req: IncomingStream<'_>) -> Self::Future {
-            std::future::ready(Ok(self.clone()))
+            // call `Router::with_state` such that everything is turned into `Route` eagerly
+            // rather than doing that per request
+            std::future::ready(Ok(self.clone().with_state(())))
         }
     }
 };