Update to Rust 2024 edition and enhance thread safety with OnceLock

Author: aosoft

unity-native-plugin-tester/Cargo.toml

@@ -2,11 +2,11 @@
 name = "unity-native-plugin-tester"
 version = "0.8.0"
 authors = ["Yasuhiro Taniuchi"]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 description = "Unity Native Plugin API Tester Library"
 homepage = "https://github.com/aosoft/unity-native-plugin-rs"
-repository = "https://github.com/aosoft/unity-native-plugin-tester"
+repository = "https://github.com/aosoft/unity-native-plugin-rs"
 readme = "README.md"
 categories = ["api-bindings", "game-engines"]
 keywords = ["unity", "ffi"]

unity-native-plugin-tester/src/interface.rs

@@ -1,7 +1,9 @@
 use std::any::Any;
 use std::collections::HashMap;
+use std::fmt::Debug;
 use std::os::raw::c_ulonglong;
 use std::rc::Rc;
+use std::sync::OnceLock;
 use unity_native_plugin_sys::*;
 
 #[derive(Default, Copy, Clone, Eq, PartialEq, Hash)]
@@ -24,6 +26,17 @@ pub struct TesterContextInterfaces {
     interfaces: IUnityInterfaces,
 }
 
+impl Debug for TesterContextInterfaces {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("TesterContextInterfaces").finish()
+    }
+}
+
+
+// maybe thread safety
+unsafe impl Send for TesterContextInterfaces {}
+unsafe impl Sync for TesterContextInterfaces {}
+
 impl TesterContextInterfaces {
     pub fn new() -> Self {
         TesterContextInterfaces {
@@ -54,15 +67,15 @@ impl TesterContextInterfaces {
     }
 
     pub fn register_interface<T: UnityInterfaceBase + UnityInterfaceID>(
-        &mut self,
+        &self,
         interface: Option<Rc<dyn UnityInterfaceBase>>,
     ) {
         let guid = T::get_interface_guid();
         self.register_interface_split(guid.m_GUIDHigh, guid.m_GUIDLow, interface);
     }
 
     pub fn register_interface_split(
-        &mut self,
+        &self,
         high: ::std::os::raw::c_ulonglong,
         low: ::std::os::raw::c_ulonglong,
         interface: Option<Rc<dyn UnityInterfaceBase>>,
@@ -75,11 +88,11 @@ impl TesterContextInterfaces {
     }
 }
 
-static mut UNITY_INTERFACES: Option<TesterContextInterfaces> = None;
+static UNITY_INTERFACES: OnceLock<TesterContextInterfaces> = OnceLock::new();
 
 extern "system" fn get_interface(guid: UnityInterfaceGUID) -> *mut IUnityInterface {
     unsafe {
-        if let Some(i) = UNITY_INTERFACES.as_ref().unwrap().get_interface(guid) {
+        if let Some(i) = UNITY_INTERFACES.get().unwrap().get_interface(guid) {
             i.as_ref().get_unity_interface()
         } else {
             std::ptr::null_mut()
@@ -95,7 +108,7 @@ extern "system" fn get_interface_split(
 ) -> *mut IUnityInterface {
     unsafe {
         if let Some(i) = UNITY_INTERFACES
-            .as_ref()
+            .get()
             .unwrap()
             .get_interface_split(high, low)
         {
@@ -113,9 +126,9 @@ extern "system" fn register_interface_split(
 ) {
 }
 
-pub unsafe fn get_unity_interfaces() -> &'static mut TesterContextInterfaces {
+pub unsafe fn get_unity_interfaces() -> &'static TesterContextInterfaces {
     unsafe {
-        UNITY_INTERFACES.as_mut().unwrap()
+        UNITY_INTERFACES.get().unwrap()
     }
 }
 
@@ -132,15 +145,15 @@ pub unsafe fn get_unity_interface<T: UnityInterfaceBase + UnityInterfaceID>() ->
 
 pub fn initialize_unity_interfaces() {
     unsafe {
-        UNITY_INTERFACES = Some(TesterContextInterfaces::new());
+        UNITY_INTERFACES.set(TesterContextInterfaces::new()).unwrap();
         unity_native_plugin::interface::UnityInterfaces::set_native_unity_interfaces(
             crate::interface::get_unity_interfaces().interfaces(),
         );
     }
 }
 
 pub fn finalize_unity_interfaces() {
-    unsafe {
-        UNITY_INTERFACES = None;
-    }
+    /*unsafe {
+        UNITY_INTERFACES.res = None;
+    }*/
 }