Fix inventory crate for macos

Lupus · Nov 5, 2024 · db64581 · db64581
1 parent 7706451
commit db64581
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ waker-fn = "1.2"
 futures-lite = "2.3"
 ocaml-gen = "0.1.5"
 highway = "1.2.0"
+linkme = "0.3.29"
 tokio = { version="1.40.0", features=["rt","rt-multi-thread"] }
 ocaml-rs-smartptr = { version = "0.1.0" }
 ocaml-lwt-interop-macro = { path="macro", version = "0.1.0" }
@@ -31,4 +32,4 @@ members = [
 ]
 
 [patch.crates-io]
-ocaml-rs-smartptr = { git = "https://github.com/Lupus/ocaml-rs-smartptr.git" }
+ocaml-rs-smartptr = { git = "https://github.com/Lupus/ocaml-rs-smartptr.git", branch="linkme" }
diff --git a/src/stubs.rs b/src/stubs.rs
@@ -57,7 +57,8 @@ pub fn lwti_executor_run_pending(executor: Executor) {
 //////////               Register Types & Traits                     //////////
 ///////////////////////////////////////////////////////////////////////////////
 
-register_rtti! {
+#[linkme::distributed_slice(ocaml_rs_smartptr::registry::REGISTRY_PLUGINS)]
+static REGISTRY_PLUGIN: ocaml_rs_smartptr::registry::Plugin = register_rtti!({
     register_type!(
         {
             ty: crate::domain_executor::DomainExecutor,
@@ -72,23 +73,25 @@ register_rtti! {
             object_safe_traits: [],
         }
     );
-}
+});
 
 ///////////////////////////////////////////////////////////////////////////////
 //////////               OCaml bindings generation                   //////////
 ///////////////////////////////////////////////////////////////////////////////
 
-ocaml_gen_bindings! {
-    decl_module!("Future", {
-        decl_type!(Future => "t");
-        decl_func!(lwti_mlbox_future_create => "create");
-        decl_func!(lwti_mlbox_future_resolve => "resolve");
-        decl_func!(lwti_mlbox_future_reject => "reject");
-    });
-
-    decl_module!("Executor", {
-        decl_type!(Executor => "t");
-        decl_func!(lwti_executor_create => "create");
-        decl_func!(lwti_executor_run_pending => "run_pending");
+#[linkme::distributed_slice(ocaml_rs_smartptr::ocaml_gen_extras::OCAML_GEN_PLUGINS)]
+static OCAML_GEN_PLUGIN: ocaml_rs_smartptr::ocaml_gen_extras::OcamlGenPlugin =
+    ocaml_gen_bindings!({
+        decl_module!("Future", {
+            decl_type!(Future => "t");
+            decl_func!(lwti_mlbox_future_create => "create");
+            decl_func!(lwti_mlbox_future_resolve => "resolve");
+            decl_func!(lwti_mlbox_future_reject => "reject");
+        });
+
+        decl_module!("Executor", {
+            decl_type!(Executor => "t");
+            decl_func!(lwti_executor_create => "create");
+            decl_func!(lwti_executor_run_pending => "run_pending");
+        });
     });
-}
diff --git a/test-stubs/Cargo.toml b/test-stubs/Cargo.toml
@@ -13,6 +13,7 @@ async-task = "4.7.1"
 ocaml = "1.0.1"
 futures-lite = "2.3"
 paste = "1.0.15"
+linkme = "0.3.29"
 tokio = { version="*", features=["time"] }
 ocaml-rs-smartptr = { version = "0.1.0" }
 ocaml-lwt-interop = { path=".." }

diff --git a/test-stubs/src/lib.rs b/test-stubs/src/lib.rs
@@ -64,11 +64,13 @@ pub fn lwti_tests_test_sync_call(f: OCamlFunc<(), ()>) {
 //////////               OCaml bindings generation                   //////////
 ///////////////////////////////////////////////////////////////////////////////
 
-ocaml_gen_bindings! {
-    decl_module!("Tests", {
-        decl_func!(lwti_tests_bench => "bench");
-        decl_func!(lwti_tests_test1 => "test_1");
-        decl_func!(lwti_tests_test2 => "test_2");
-        decl_func!(lwti_tests_test_sync_call => "test_sync_call");
+#[linkme::distributed_slice(ocaml_rs_smartptr::ocaml_gen_extras::OCAML_GEN_PLUGINS)]
+static OCAML_GEN_PLUGIN: ocaml_rs_smartptr::ocaml_gen_extras::OcamlGenPlugin =
+    ocaml_gen_bindings!({
+        decl_module!("Tests", {
+            decl_func!(lwti_tests_bench => "bench");
+            decl_func!(lwti_tests_test1 => "test_1");
+            decl_func!(lwti_tests_test2 => "test_2");
+            decl_func!(lwti_tests_test_sync_call => "test_sync_call");
+        });
     });
-}