Merge pull request #203 from devraymondsh/develop

Refactore ABI with bridge_api

Author: giarve

source/loaders/rs_loader/rust/src/bridge_api.rs

@@ -0,0 +1,12 @@
+use crate::{c_void, LoaderLifecycleState};
+
+extern "C" {
+    fn loader_impl_get(loader_impl: *mut c_void) -> *mut c_void;
+}
+
+pub fn get_loader_lifecycle_state(loader_impl: *mut c_void) -> *mut LoaderLifecycleState {
+    let loader_lifecycle_state =
+        unsafe { loader_impl_get(loader_impl) } as *mut LoaderLifecycleState;
+
+    loader_lifecycle_state
+}

source/loaders/rs_loader/rust/src/lib.rs

@@ -4,6 +4,8 @@ pub use std::os::raw::c_char;
 pub use std::os::raw::c_int;
 pub use std::path::PathBuf;
 
+pub mod bridge_api;
+
 mod lifecycle;
 
 pub use lifecycle::rs_loader_impl_clear;

source/loaders/rs_loader/rust/src/lifecycle/destroy.rs

@@ -1,13 +1,8 @@
-use crate::{c_int, c_void, LoaderLifecycleState};
-
-extern "C" {
-    fn loader_impl_get(loader_impl: *mut c_void) -> *mut c_void;
-}
+use crate::{bridge_api, c_int, c_void};
 
 #[no_mangle]
 pub extern "C" fn rs_loader_impl_destroy(loader_impl: *mut c_void) -> c_int {
-    let loader_lifecycle_state =
-        unsafe { loader_impl_get(loader_impl) } as *mut LoaderLifecycleState;
+    let loader_lifecycle_state = bridge_api::get_loader_lifecycle_state(loader_impl);
 
     unsafe {
         loader_lifecycle_state.drop_in_place();

source/loaders/rs_loader/rust/src/lifecycle/execution_path.rs

@@ -1,16 +1,11 @@
-use crate::{c_char, c_int, c_void, CStr, LoaderLifecycleState, PathBuf};
-
-extern "C" {
-    fn loader_impl_get(loader_impl: *mut c_void) -> *mut c_void;
-}
+use crate::{bridge_api, c_char, c_int, c_void, CStr, PathBuf};
 
 #[no_mangle]
 pub extern "C" fn rs_loader_impl_execution_path(
     loader_impl: *mut c_void,
     path: *const c_char,
 ) -> c_int {
-    let loader_lifecycle_state =
-        unsafe { loader_impl_get(loader_impl) } as *mut LoaderLifecycleState;
+    let loader_lifecycle_state = bridge_api::get_loader_lifecycle_state(loader_impl);
 
     let c_path: &CStr = unsafe { CStr::from_ptr(path) };