Remove unused codes and strange safety features (#243)

lune-org · Oct 13, 2024 · 11bf0b6 · 11bf0b6
1 parent c656a48
commit 11bf0b6
Show file tree

Hide file tree

Showing 28 changed files with 191 additions and 312 deletions.
diff --git a/crates/lune-std-ffi/src/c/c_arr.rs b/crates/lune-std-ffi/src/c/c_arr.rs
@@ -10,7 +10,7 @@ use super::{
 };
 use crate::ffi::{
     ffi_association::{get_association, set_association},
-    FfiBox, GetNativeDataHandle, NativeConvert, NativeDataHandle, NativeSize,
+    FfiBox, GetNativeData, NativeConvert, NativeData, NativeSize,
 };
 
 // This is a series of some type.
@@ -110,7 +110,7 @@ impl NativeConvert for CArr {
         &self,
         lua: &'lua Lua,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
         value: LuaValue<'lua>,
     ) -> LuaResult<()> {
         let LuaValue::Table(ref table) = value else {
@@ -134,7 +134,7 @@ impl NativeConvert for CArr {
         &self,
         lua: &'lua Lua,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
         let table = lua.create_table_with_capacity(self.length, 0)?;
         for i in 0..self.length {
@@ -187,9 +187,6 @@ impl LuaUserData for CArr {
                 if !data_handle.check_boundary(offset, this.get_size()) {
                     return Err(LuaError::external("Out of bounds"));
                 }
-                if !data_handle.check_readable(offset, this.get_size()) {
-                    return Err(LuaError::external("Unreadable data handle"));
-                }
 
                 unsafe { this.luavalue_from(lua, offset, data_handle) }
             },
@@ -203,7 +200,7 @@ impl LuaUserData for CArr {
                 if !data_handle.check_boundary(offset, this.size) {
                     return Err(LuaError::external("Out of bounds"));
                 }
-                if !data_handle.checek_writable(offset, this.size) {
+                if !data_handle.is_writable() {
                     return Err(LuaError::external("Unwritable data handle"));
                 }
 

diff --git a/crates/lune-std-ffi/src/c/c_struct.rs b/crates/lune-std-ffi/src/c/c_struct.rs
@@ -10,7 +10,7 @@ use super::{
 };
 use crate::ffi::{
     ffi_association::{get_association, set_association},
-    FfiBox, GetNativeDataHandle, NativeConvert, NativeDataHandle, NativeSignedness, NativeSize,
+    FfiBox, GetNativeData, NativeConvert, NativeData, NativeSignedness, NativeSize,
     FFI_STATUS_NAMES,
 };
 
@@ -135,7 +135,7 @@ impl NativeConvert for CStruct {
         &self,
         lua: &'lua Lua,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
         value: LuaValue<'lua>,
     ) -> LuaResult<()> {
         let LuaValue::Table(ref table) = value else {
@@ -156,7 +156,7 @@ impl NativeConvert for CStruct {
         &self,
         lua: &'lua Lua,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
         let table = lua.create_table_with_capacity(self.conv.len(), 0)?;
         for (i, conv) in self.conv.iter().enumerate() {

diff --git a/crates/lune-std-ffi/src/c/c_type.rs b/crates/lune-std-ffi/src/c/c_type.rs
@@ -9,8 +9,8 @@ use num::cast::AsPrimitive;
 
 use super::{association_names::CTYPE_STATIC, c_helper::get_ensured_size, CArr, CPtr};
 use crate::ffi::{
-    ffi_association::set_association, native_num_cast, FfiBox, GetNativeDataHandle, NativeConvert,
-    NativeDataHandle, NativeSignedness, NativeSize,
+    ffi_association::set_association, native_num_cast, FfiBox, GetNativeData, NativeConvert,
+    NativeData, NativeSignedness, NativeSize,
 };
 
 // We can't get a CType<T> through mlua, something like
@@ -42,8 +42,8 @@ pub trait CTypeCast {
     fn try_cast_num<T, U>(
         &self,
         ctype: &LuaAnyUserData,
-        from: &Ref<dyn NativeDataHandle>,
-        into: &Ref<dyn NativeDataHandle>,
+        from: &Ref<dyn NativeData>,
+        into: &Ref<dyn NativeData>,
     ) -> LuaResult<Option<()>>
     where
         T: AsPrimitive<U>,
@@ -62,8 +62,8 @@ pub trait CTypeCast {
         &self,
         from_ctype: &LuaAnyUserData,
         into_ctype: &LuaAnyUserData,
-        _from: &Ref<dyn NativeDataHandle>,
-        _into: &Ref<dyn NativeDataHandle>,
+        _from: &Ref<dyn NativeData>,
+        _into: &Ref<dyn NativeData>,
     ) -> LuaResult<()> {
         Err(Self::cast_failed_with(self, from_ctype, into_ctype))
     }

diff --git a/crates/lune-std-ffi/src/c/types/f32.rs b/crates/lune-std-ffi/src/c/types/f32.rs
@@ -5,7 +5,7 @@ use mlua::prelude::*;
 use num::cast::AsPrimitive;
 
 use super::super::c_type::CType;
-use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
+use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
 
 impl NativeSignedness for CType<f32> {
     fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<f32> {
         _lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
         value: LuaValue<'lua>,
     ) -> LuaResult<()> {
         let value: f32 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<f32> {
         lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
         let value = unsafe { (*data_handle.get_pointer(offset).cast::<f32>()).into_lua(lua)? };
         Ok(value)

diff --git a/crates/lune-std-ffi/src/c/types/f64.rs b/crates/lune-std-ffi/src/c/types/f64.rs
@@ -5,7 +5,7 @@ use mlua::prelude::*;
 use num::cast::AsPrimitive;
 
 use super::super::c_type::CType;
-use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
+use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
 
 impl NativeSignedness for CType<f64> {
     fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<f64> {
         _lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
         value: LuaValue<'lua>,
     ) -> LuaResult<()> {
         let value: f64 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<f64> {
         lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
         let value = unsafe { (*data_handle.get_pointer(offset).cast::<f64>()).into_lua(lua)? };
         Ok(value)

diff --git a/crates/lune-std-ffi/src/c/types/i128.rs b/crates/lune-std-ffi/src/c/types/i128.rs
@@ -5,7 +5,7 @@ use mlua::prelude::*;
 use num::cast::AsPrimitive;
 
 use super::super::c_type::CType;
-use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
+use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
 
 impl NativeSignedness for CType<i128> {
     fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<i128> {
         _lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
         value: LuaValue<'lua>,
     ) -> LuaResult<()> {
         let value: i128 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<i128> {
         lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
         let value = unsafe { (*data_handle.get_pointer(offset).cast::<i128>()).into_lua(lua)? };
         Ok(value)

diff --git a/crates/lune-std-ffi/src/c/types/i16.rs b/crates/lune-std-ffi/src/c/types/i16.rs
@@ -5,7 +5,7 @@ use mlua::prelude::*;
 use num::cast::AsPrimitive;
 
 use super::super::c_type::CType;
-use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
+use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
 
 impl NativeSignedness for CType<i16> {
     fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<i16> {
         _lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
         value: LuaValue<'lua>,
     ) -> LuaResult<()> {
         let value: i16 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<i16> {
         lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
         let value = unsafe { (*data_handle.get_pointer(offset).cast::<i16>()).into_lua(lua)? };
         Ok(value)

diff --git a/crates/lune-std-ffi/src/c/types/i32.rs b/crates/lune-std-ffi/src/c/types/i32.rs
@@ -5,7 +5,7 @@ use mlua::prelude::*;
 use num::cast::AsPrimitive;
 
 use super::super::c_type::CType;
-use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
+use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
 
 impl NativeSignedness for CType<i32> {
     fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<i32> {
         _lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
         value: LuaValue<'lua>,
     ) -> LuaResult<()> {
         let value: i32 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<i32> {
         lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
         let value = unsafe { (*data_handle.get_pointer(offset).cast::<i32>()).into_lua(lua)? };
         Ok(value)

diff --git a/crates/lune-std-ffi/src/c/types/i64.rs b/crates/lune-std-ffi/src/c/types/i64.rs
@@ -5,7 +5,7 @@ use mlua::prelude::*;
 use num::cast::AsPrimitive;
 
 use super::super::c_type::CType;
-use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
+use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
 
 impl NativeSignedness for CType<i64> {
     fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<i64> {
         _lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
         value: LuaValue<'lua>,
     ) -> LuaResult<()> {
         let value: i64 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<i64> {
         lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
         let value = unsafe { (*data_handle.get_pointer(offset).cast::<i64>()).into_lua(lua)? };
         Ok(value)

diff --git a/crates/lune-std-ffi/src/c/types/i8.rs b/crates/lune-std-ffi/src/c/types/i8.rs
@@ -5,7 +5,7 @@ use mlua::prelude::*;
 use num::cast::AsPrimitive;
 
 use super::super::c_type::CType;
-use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
+use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
 
 impl NativeSignedness for CType<i8> {
     fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<i8> {
         _lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
         value: LuaValue<'lua>,
     ) -> LuaResult<()> {
         let value: i8 = match value {
@@ -42,7 +42,7 @@ impl NativeConvert for CType<i8> {
         lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
         let value = unsafe { (*data_handle.get_pointer(offset).cast::<i8>()).into_lua(lua)? };
         Ok(value)

diff --git a/crates/lune-std-ffi/src/c/types/isize.rs b/crates/lune-std-ffi/src/c/types/isize.rs
@@ -5,7 +5,7 @@ use mlua::prelude::*;
 use num::cast::AsPrimitive;
 
 use super::super::c_type::CType;
-use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
+use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
 
 impl NativeSignedness for CType<isize> {
     fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<isize> {
         _lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
         value: LuaValue<'lua>,
     ) -> LuaResult<()> {
         let value: isize = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<isize> {
         lua: &'lua Lua,
         // _type_userdata: &LuaAnyUserData<'lua>,
         offset: isize,
-        data_handle: &Ref<dyn NativeDataHandle>,
+        data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
         let value = unsafe { (*data_handle.get_pointer(offset).cast::<isize>()).into_lua(lua)? };
         Ok(value)