feat: remove syncwrapper from axum integration

shuttle-hq · Mar 3, 2023 · 791c034 · 791c034
1 parent bbe3cb7
commit 791c034
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/service/Cargo.toml b/service/Cargo.toml
@@ -31,7 +31,6 @@ salvo = { version = "0.37.5", optional = true }
 serde_json = { workspace = true }
 serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "rustls_backend", "model"], optional = true }
 poise = { version = "0.5.2", optional = true }
-sync_wrapper = { version = "0.1.1", optional = true }
 thiserror = { workspace = true }
 thruster = { version = "1.3.0", optional = true }
 tide = { version = "0.16.0", optional = true }
@@ -70,7 +69,7 @@ codegen = ["shuttle-codegen/frameworks"]
 loader = ["cargo", "libloading"]
 
 web-actix-web = ["actix-web", "num_cpus"]
-web-axum = ["axum", "sync_wrapper"]
+web-axum = ["axum"]
 web-rocket = ["rocket"]
 web-thruster = ["thruster"]
 web-tide = ["tide", "async-std"]

diff --git a/service/src/lib.rs b/service/src/lib.rs
@@ -540,19 +540,20 @@ pub type ShuttleWarp<T> = Result<warp::filters::BoxedFilter<T>, Error>;
 
 #[cfg(feature = "web-axum")]
 #[async_trait]
-impl Service for sync_wrapper::SyncWrapper<axum::Router> {
+impl Service for axum::Router {
     async fn bind(mut self, addr: SocketAddr) -> Result<(), error::Error> {
-        let router = self.into_inner();
-
         axum::Server::bind(&addr)
-            .serve(router.into_make_service())
+            .serve(self.into_make_service())
             .await
             .map_err(error::CustomError::new)?;
 
         Ok(())
     }
 }
 
+#[cfg(feature = "web-axum")]
+pub type ShuttleAxum = Result<axum::Router, Error>;
+
 #[cfg(feature = "web-actix-web")]
 #[async_trait]
 impl<F> Service for F
@@ -575,9 +576,6 @@ where
 #[cfg(feature = "web-actix-web")]
 pub type ShuttleActixWeb<F> = Result<F, Error>;
 
-#[cfg(feature = "web-axum")]
-pub type ShuttleAxum = Result<sync_wrapper::SyncWrapper<axum::Router>, Error>;
-
 #[cfg(feature = "web-salvo")]
 #[async_trait]
 impl Service for salvo::Router {