share inventory collect across types

leptos-rs · Jan 19, 2024 · 62298db · 62298db
1 parent 9855bc5
commit 62298db
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/server_fn/src/lib.rs b/server_fn/src/lib.rs
@@ -443,6 +443,17 @@ impl<Req, Res> Clone for ServerFnTraitObj<Req, Res> {
 type LazyServerFnMap<Req, Res> =
     Lazy<DashMap<&'static str, ServerFnTraitObj<Req, Res>>>;
 
+#[cfg(feature = "ssr")]
+impl<Req: 'static, Res: 'static> inventory::Collect
+    for ServerFnTraitObj<Req, Res>
+{
+    #[inline]
+    fn registry() -> &'static inventory::Registry {
+        static REGISTRY: inventory::Registry = inventory::Registry::new();
+        &REGISTRY
+    }
+}
+
 /// Axum integration.
 #[cfg(feature = "axum")]
 pub mod axum {
@@ -453,8 +464,6 @@ pub mod axum {
     use axum::body::Body;
     use http::{Method, Request, Response, StatusCode};
 
-    inventory::collect!(ServerFnTraitObj<Request<Body>, Response<Body>>);
-
     static REGISTERED_SERVER_FUNCTIONS: LazyServerFnMap<
         Request<Body>,
         Response<Body>,
@@ -539,8 +548,6 @@ pub mod actix {
     #[doc(hidden)]
     pub use send_wrapper::SendWrapper;
 
-    inventory::collect!(ServerFnTraitObj<ActixRequest, ActixResponse>);
-
     static REGISTERED_SERVER_FUNCTIONS: LazyServerFnMap<
         ActixRequest,
         ActixResponse,