replace transmute to box from/into

hkrn · Aug 21, 2024 · 8705065 · 8705065
1 parent faa0f70
commit 8705065
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 22 deletions.
diff --git a/rust/plugin_wasm/src/model/c_api.rs b/rust/plugin_wasm/src/model/c_api.rs
@@ -51,12 +51,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginModelIOCreateWithLocation(
         let result = instance.create();
         if result.is_ok() {
             let plugin = Box::new(instance);
-            return unsafe {
-                std::mem::transmute::<
-                    Box<nanoem_application_plugin_model_io_t>,
-                    *mut nanoem_application_plugin_model_io_t,
-                >(plugin)
-            };
+            return Box::into_raw(plugin);
         }
     }
     null_mut()
@@ -738,7 +733,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginModelIODestroy(
     plugin: *mut nanoem_application_plugin_model_io_t,
 ) {
     if !plugin.is_null() {
-        let _: Box<nanoem_application_plugin_model_io_t> = unsafe { std::mem::transmute(plugin) };
+        let _ = unsafe { Box::from_raw(plugin) };
     }
 }
 

diff --git a/rust/plugin_wasm/src/motion/c_api.rs b/rust/plugin_wasm/src/motion/c_api.rs
@@ -51,12 +51,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginMotionIOCreateWithLocation(
         let result = instance.create();
         if result.is_ok() {
             let plugin = Box::new(instance);
-            return unsafe {
-                std::mem::transmute::<
-                    Box<nanoem_application_plugin_motion_io_t>,
-                    *mut nanoem_application_plugin_motion_io_t,
-                >(plugin)
-            };
+            return Box::into_raw(plugin);
         }
     }
     null_mut()
@@ -719,7 +714,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginMotionIODestroy(
     plugin: *mut nanoem_application_plugin_motion_io_t,
 ) {
     if !plugin.is_null() {
-        let _: Box<nanoem_application_plugin_motion_io_t> = unsafe { std::mem::transmute(plugin) };
+        let _ = unsafe { Box::from_raw(plugin) };
     }
 }
 

diff --git a/rust/plugin_wasm_test_model_full/src/lib.rs b/rust/plugin_wasm_test_model_full/src/lib.rs
@@ -97,7 +97,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginModelIOCreate(
         .unwrap()
     );
     let plugin = Box::<nanoem_application_plugin_model_io_t>::default();
-    std::mem::transmute(plugin)
+    Box::into_raw(plugin)
 }
 
 /// # Safety
@@ -804,7 +804,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginModelIODestroy(
         .unwrap()
     );
     if !plugin.is_null() {
-        let _: Box<nanoem_application_plugin_model_io_t> = std::mem::transmute(plugin);
+        let _ = unsafe { Box::from_raw(plugin) };
     }
 }
 

diff --git a/rust/plugin_wasm_test_model_minimum/src/lib.rs b/rust/plugin_wasm_test_model_minimum/src/lib.rs
@@ -67,7 +67,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginModelIOCreate(
         .unwrap()
     );
     let plugin = Box::<nanoem_application_plugin_model_io_t>::default();
-    std::mem::transmute(plugin)
+    Box::into_raw(plugin)
 }
 
 /// # Safety
@@ -319,7 +319,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginModelIODestroy(
         .unwrap()
     );
     if !plugin.is_null() {
-        let _: Box<nanoem_application_plugin_model_io_t> = std::mem::transmute(plugin);
+        let _ = unsafe { Box::from_raw(plugin) };
     }
 }
 

diff --git a/rust/plugin_wasm_test_motion_full/src/lib.rs b/rust/plugin_wasm_test_motion_full/src/lib.rs
@@ -97,7 +97,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginMotionIOCreate(
         .unwrap()
     );
     let plugin = Box::<nanoem_application_plugin_motion_io_t>::default();
-    std::mem::transmute(plugin)
+    Box::into_raw(plugin)
 }
 
 /// # Safety
@@ -785,7 +785,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginMotionIODestroy(
         .unwrap()
     );
     if !plugin.is_null() {
-        let _: Box<nanoem_application_plugin_motion_io_t> = std::mem::transmute(plugin);
+        let _ = unsafe { Box::from_raw(plugin) };
     }
 }
 

diff --git a/rust/plugin_wasm_test_motion_minimum/src/lib.rs b/rust/plugin_wasm_test_motion_minimum/src/lib.rs
@@ -67,7 +67,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginMotionIOCreate(
         .unwrap()
     );
     let plugin = Box::<nanoem_application_plugin_motion_io_t>::default();
-    std::mem::transmute(plugin)
+    Box::into_raw(plugin)
 }
 
 /// # Safety
@@ -337,7 +337,7 @@ pub unsafe extern "C" fn nanoemApplicationPluginMotionIODestroy(
         .unwrap()
     );
     if !plugin.is_null() {
-        let _: Box<nanoem_application_plugin_motion_io_t> = std::mem::transmute(plugin);
+        let _ = unsafe { Box::from_raw(plugin) };
     }
 }