chore(tower): improve

viz-tower/src/layer.rs

@@ -0,0 +1,25 @@
+use viz_core::Transform;
+
+use crate::Middleware;
+
+/// Transforms a Tower layer into Viz Middleware.
+#[derive(Debug)]
+pub struct Layered<L>(L);
+
+impl<L> Layered<L> {
+    /// Creates a new tower layer.
+    pub fn new(l: L) -> Self {
+        Self(l)
+    }
+}
+
+impl<L, H> Transform<H> for Layered<L>
+where
+    L: Clone,
+{
+    type Output = Middleware<L, H>;
+
+    fn transform(&self, h: H) -> Self::Output {
+        Middleware::new(self.0.clone(), h)
+    }
+}

viz-tower/src/lib.rs

@@ -9,7 +9,10 @@ mod service;
 pub use service::HandlerService;
 
 mod middleware;
-pub use middleware::{Layered, Middleware};
+pub use middleware::Middleware;
+
+mod layer;
+pub use layer::Layered;
 
 /// Converts a tower [`Service`] into a [`Handler`].
 #[derive(Debug, Clone)]

viz-tower/src/middleware.rs

@@ -1,33 +1,10 @@
 use tower::{Layer, Service, ServiceExt};
 use viz_core::{
     async_trait, Body, BoxError, Bytes, Error, Handler, HttpBody, Request, Response, Result,
-    Transform,
 };
 
 use crate::HandlerService;
 
-/// Transforms a Tower layer into Viz Middleware.
-#[derive(Debug)]
-pub struct Layered<L>(L);
-
-impl<L> Layered<L> {
-    /// Creates a new tower layer.
-    pub fn new(l: L) -> Self {
-        Self(l)
-    }
-}
-
-impl<L, H> Transform<H> for Layered<L>
-where
-    L: Clone,
-{
-    type Output = Middleware<L, H>;
-
-    fn transform(&self, h: H) -> Self::Output {
-        Middleware::new(self.0.clone(), h)
-    }
-}
-
 /// A [`Service`] created from a [`Handler`] by applying a Tower middleware.
 #[derive(Debug, Clone)]
 pub struct Middleware<L, H> {

viz-tower/src/service.rs

@@ -26,7 +26,7 @@ where
 
 impl<H> Service<Request> for HandlerService<H>
 where
-    H: Handler<Request, Output = Result<Response>> + Clone + Send + 'static,
+    H: Handler<Request, Output = Result<Response>> + Send + Clone + 'static,
 {
     type Response = Response;
     type Error = Error;