Exporting existing models is already handled by the "export-validator"

hannobraun · Jul 28, 2022 · 7dd24b3 · 7dd24b3
1 parent 90013a8
commit 7dd24b3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 88 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/fj-app/Cargo.toml b/crates/fj-app/Cargo.toml
@@ -62,7 +62,3 @@ features = ["derive"]
 [dependencies.tracing-subscriber]
 version = "0.3.15"
 features = ["env-filter", "fmt"]
-
-[dev-dependencies]
-stl = "0.2.1"
-tempfile = "3.3.0"
diff --git a/crates/fj-app/tests/smoke_test.rs b/crates/fj-app/tests/smoke_test.rs
diff --git a/crates/fj/src/abi/mod.rs b/crates/fj/src/abi/mod.rs
@@ -59,14 +59,14 @@ macro_rules! register_model {
         unsafe extern "C" fn fj_model_init(
             mut host: *mut $crate::abi::Host<'_>,
         ) -> $crate::abi::InitResult {
-            let host: &mut dyn $crate::Host = &mut *host;
-
-            let result: Result<
+            let init: fn(
+                &mut dyn $crate::Host,
+            ) -> Result<
                 $crate::PluginMetadata,
                 Box<dyn std::error::Error + Send + Sync>,
-            > = $init(host);
+            > = $init;
 
-            match result {
+            match init(&mut *host) {
                 Ok(meta) => $crate::abi::InitResult::Ok(meta.into()),
                 Err(e) => $crate::abi::InitResult::Err(e.into()),
             }