Replace custom BoxCloneService struct with tower::util::BoxCloneSyncService

Author: Turbo87

.clippy.toml

@@ -1,4 +1 @@
 allow-mixed-uninlined-format-args = false
-disallowed-types = [
-    { path = "tower::util::BoxCloneService", reason = "Use our internal BoxCloneService which is Sync" },
-]

axum/src/box_clone_service.rs

@@ -427,7 +427,6 @@
 #[macro_use]
 pub(crate) mod macros;
 
-mod box_clone_service;
 mod boxed;
 mod extension;
 #[cfg(feature = "form")]

axum/src/lib.rs

@@ -1,4 +1,3 @@
-use crate::box_clone_service::BoxCloneService;
 use crate::response::{IntoResponse, Response};
 use axum_core::extract::{FromRequest, FromRequestParts, Request};
 use futures_util::future::BoxFuture;
@@ -12,6 +11,7 @@ use std::{
     task::{Context, Poll},
 };
 use tower::ServiceBuilder;
+use tower::util::BoxCloneSyncService;
 use tower_layer::Layer;
 use tower_service::Service;
 
@@ -302,7 +302,7 @@ macro_rules! impl_service {
                     };
 
                     let inner = ServiceBuilder::new()
-                        .layer_fn(BoxCloneService::new)
+                        .layer_fn(BoxCloneSyncService::new)
                         .map_response(IntoResponse::into_response)
                         .service(ready_inner);
                     let next = Next { inner };
@@ -337,7 +337,7 @@ where
 /// The remainder of a middleware stack, including the handler.
 #[derive(Debug, Clone)]
 pub struct Next {
-    inner: BoxCloneService<Request, Response, Infallible>,
+    inner: BoxCloneSyncService<Request, Response, Infallible>,
 }
 
 impl Next {

axum/src/middleware/from_fn.rs

@@ -1,6 +1,5 @@
 use crate::{
     body::{Body, HttpBody},
-    box_clone_service::BoxCloneService,
     response::Response,
 };
 use axum_core::{extract::Request, response::IntoResponse};
@@ -18,7 +17,7 @@ use std::{
     task::{ready, Context, Poll},
 };
 use tower::{
-    util::{MapErrLayer, MapResponseLayer, Oneshot},
+    util::{BoxCloneSyncService, MapErrLayer, MapResponseLayer, Oneshot},
     ServiceExt,
 };
 use tower_layer::Layer;
@@ -28,7 +27,7 @@ use tower_service::Service;
 ///
 /// You normally shouldn't need to care about this type. It's used in
 /// [`Router::layer`](super::Router::layer).
-pub struct Route<E = Infallible>(BoxCloneService<Request, Response, E>);
+pub struct Route<E = Infallible>(BoxCloneSyncService<Request, Response, E>);
 
 impl<E> Route<E> {
     pub(crate) fn new<T>(svc: T) -> Self
@@ -37,7 +36,7 @@ impl<E> Route<E> {
         T::Response: IntoResponse + 'static,
         T::Future: Send + 'static,
     {
-        Self(BoxCloneService::new(
+        Self(BoxCloneSyncService::new(
             svc.map_response(IntoResponse::into_response),
         ))
     }
@@ -115,15 +114,18 @@ pin_project! {
     /// Response future for [`Route`].
     pub struct RouteFuture<E> {
         #[pin]
-        inner: Oneshot<BoxCloneService<Request, Response, E>, Request>,
+        inner: Oneshot<BoxCloneSyncService<Request, Response, E>, Request>,
         method: Method,
         allow_header: Option<Bytes>,
         top_level: bool,
     }
 }
 
 impl<E> RouteFuture<E> {
-    fn new(method: Method, inner: Oneshot<BoxCloneService<Request, Response, E>, Request>) -> Self {
+    fn new(
+        method: Method,
+        inner: Oneshot<BoxCloneSyncService<Request, Response, E>, Request>,
+    ) -> Self {
         Self {
             inner,
             method,