chore: v15.7.1 (#109)

JosephLenton · Sep 7, 2024 · e8acc48 · e8acc48
1 parent 2652d29
commit e8acc48
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "axum-test"
 authors = ["Joseph Lenton <josephlenton@gmail.com>"]
-version = "15.7.0"
+version = "15.7.1"
 rust-version = "1.75"
 edition = "2021"
 license = "MIT"

diff --git a/src/internals/transport_layer/mock_transport_layer.rs b/src/internals/transport_layer/mock_transport_layer.rs
@@ -32,9 +32,9 @@ where
 
 impl<S, RouterService> TransportLayer for MockTransportLayer<S>
 where
-    S: Service<Request<Body>, Response = RouterService> + Clone + Send + std::marker::Sync,
+    S: Service<Request<Body>, Response = RouterService> + Clone + Send + Sync + 'static,
     AnyhowError: From<S::Error>,
-    S::Future: Send + std::marker::Sync,
+    S::Future: Send + Sync,
     RouterService: Service<Request<Body>, Response = AxumResponse>,
     AnyhowError: From<RouterService::Error>,
 {

diff --git a/src/transport_layer/into_transport_layer/into_make_service.rs b/src/transport_layer/into_transport_layer/into_make_service.rs
@@ -18,8 +18,8 @@ where
     S: Service<AxumRequest, Response = AxumResponse, Error = Infallible>
         + Clone
         + Send
-        + 'static
-        + std::marker::Sync,
+        + Sync
+        + 'static,
     S::Future: Send,
 {
     fn into_http_transport_layer(

diff --git a/src/transport_layer/transport_layer.rs b/src/transport_layer/transport_layer.rs
@@ -9,7 +9,7 @@ use url::Url;
 
 use crate::transport_layer::TransportLayerType;
 
-pub trait TransportLayer: Debug + Send + std::marker::Sync {
+pub trait TransportLayer: Debug + Send + Sync + 'static {
     fn send<'a>(
         &'a self,
         request: Request<Body>,
@@ -21,3 +21,20 @@ pub trait TransportLayer: Debug + Send + std::marker::Sync {
 
     fn get_type(&self) -> TransportLayerType;
 }
+
+#[cfg(test)]
+mod test_sync {
+    use super::*;
+    use tokio::sync::OnceCell;
+
+    #[test]
+    fn it_should_compile_with_tokyo_once_cell() {
+        // if it compiles, it works!
+        fn _take_tokio_once_cell<T>(layer: T) -> OnceCell<Box<dyn TransportLayer>>
+        where
+            T: TransportLayer,
+        {
+            OnceCell::new_with(Some(Box::new(layer)))
+        }
+    }
+}