Bypass redundant version functions

hannobraun · Nov 15, 2022 · 5b8d94a · 5b8d94a
1 parent 2daa042
commit 5b8d94a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/crates/fj-host/src/model.rs b/crates/fj-host/src/model.rs
@@ -113,9 +113,9 @@ impl Model {
             } else {
                 let version_pkg_host = fj::version::VERSION_PKG.to_string();
 
-                let version_pkg_model: libloading::Symbol<fn() -> Version> =
-                    lib.get(b"version_pkg").map_err(Error::LoadingVersion)?;
-                let version_pkg_mode = version_pkg_model().to_string();
+                let version_pkg_model: libloading::Symbol<*const Version> =
+                    lib.get(b"VERSION_PKG").map_err(Error::LoadingVersion)?;
+                let version_pkg_mode = (**version_pkg_model).to_string();
 
                 debug!(
                     "Comparing package versions (host: {}, model: {})",
@@ -132,9 +132,9 @@ impl Model {
 
                 let version_full_host = fj::version::VERSION_FULL.to_string();
 
-                let version_full_model: libloading::Symbol<fn() -> Version> =
-                    lib.get(b"version_full").map_err(Error::LoadingVersion)?;
-                let version_full_model = version_full_model().to_string();
+                let version_full_model: libloading::Symbol<*const Version> =
+                    lib.get(b"VERSION_FULL").map_err(Error::LoadingVersion)?;
+                let version_full_model = (**version_full_model).to_string();
 
                 debug!(
                     "Comparing full versions (host: {}, model: {})",

diff --git a/crates/fj/src/version.rs b/crates/fj/src/version.rs
@@ -66,13 +66,3 @@ unsafe impl Send for Version {}
 // There is no reason why a `&Version` wouldn't be `Send`, so per definition,
 // `Version` can be `Sync`.
 unsafe impl Sync for Version {}
-
-#[no_mangle]
-extern "C" fn version_pkg() -> Version {
-    VERSION_PKG
-}
-
-#[no_mangle]
-extern "C" fn version_full() -> Version {
-    VERSION_FULL
-}