feat(safe): modified build.rs

rustq · Nov 10, 2024 · 76d7fb0 · 76d7fb0
1 parent 7136881
commit 76d7fb0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/build.rs b/build.rs
@@ -11,7 +11,7 @@ fn main() {
         .status()
         .expect("Unable to update the submodule repositories");
 
-    cxx_build::bridge("src/lib.rs")
+    cxx_build::bridge("src/safe.rs")
         .file("src/safe.cc")
         .file("include/taitank/src/taitank.cc")
         .file("include/taitank/src/taitank_style.cc")

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,23 +1,7 @@
+mod safe;
+use safe::ffi;
 use cxx::UniquePtr;
 
-#[cxx::bridge]
-mod ffi {
-
-    unsafe extern "C++" {
-        include!("taitank-safe/include/safe.h");
-
-        type TaitankSafeNode;
-        fn node_create() -> UniquePtr<TaitankSafeNode>;
-        fn set_width(node: &UniquePtr<TaitankSafeNode>, width: f64);
-        fn set_height(node: &UniquePtr<TaitankSafeNode>, height: f64);
-        fn set_direction(node: &UniquePtr<TaitankSafeNode>, direction: i32);
-        fn do_layout(node: &UniquePtr<TaitankSafeNode>, parent_width: f64, parent_height: f64);
-        fn get_width(node: &UniquePtr<TaitankSafeNode>) -> f64;
-        fn get_height(node: &UniquePtr<TaitankSafeNode>) -> f64;
-        fn get_left(node: &UniquePtr<TaitankSafeNode>) -> f64;
-        fn get_top(node: &UniquePtr<TaitankSafeNode>) -> f64;
-    }
-}
 
 struct TaitankSafeNode {
     unique_ptr: UniquePtr<ffi::TaitankSafeNode>

diff --git a/src/safe.rs b/src/safe.rs
@@ -0,0 +1,19 @@
+#[cxx::bridge]
+pub mod ffi {
+
+    unsafe extern "C++" {
+        include!("taitank-safe/include/safe.h");
+
+        type TaitankSafeNode;
+        fn node_create() -> UniquePtr<TaitankSafeNode>;
+        fn set_width(node: &UniquePtr<TaitankSafeNode>, width: f64);
+        fn set_height(node: &UniquePtr<TaitankSafeNode>, height: f64);
+        fn set_direction(node: &UniquePtr<TaitankSafeNode>, direction: i32);
+        fn do_layout(node: &UniquePtr<TaitankSafeNode>, parent_width: f64, parent_height: f64);
+        fn get_width(node: &UniquePtr<TaitankSafeNode>) -> f64;
+        fn get_height(node: &UniquePtr<TaitankSafeNode>) -> f64;
+        fn get_left(node: &UniquePtr<TaitankSafeNode>) -> f64;
+        fn get_top(node: &UniquePtr<TaitankSafeNode>) -> f64;
+    }
+}
+