Skip to content

Commit 11bf0b6

Browse files
qwreeyqwreey
committed
Remove unused codes and strange safety features (#243)
1 parent c656a48 commit 11bf0b6

28 files changed

+191
-312
lines changed

‎crates/lune-std-ffi/src/c/c_arr.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::{
1010
};
1111
use crate::ffi::{
1212
ffi_association::{get_association, set_association},
13-
FfiBox, GetNativeDataHandle, NativeConvert, NativeDataHandle, NativeSize,
13+
FfiBox, GetNativeData, NativeConvert, NativeData, NativeSize,
1414
};
1515

1616
// This is a series of some type.
@@ -110,7 +110,7 @@ impl NativeConvert for CArr {
110110
&self,
111111
lua: &'lua Lua,
112112
offset: isize,
113-
data_handle: &Ref<dyn NativeDataHandle>,
113+
data_handle: &Ref<dyn NativeData>,
114114
value: LuaValue<'lua>,
115115
) -> LuaResult<()> {
116116
let LuaValue::Table(ref table) = value else {
@@ -134,7 +134,7 @@ impl NativeConvert for CArr {
134134
&self,
135135
lua: &'lua Lua,
136136
offset: isize,
137-
data_handle: &Ref<dyn NativeDataHandle>,
137+
data_handle: &Ref<dyn NativeData>,
138138
) -> LuaResult<LuaValue<'lua>> {
139139
let table = lua.create_table_with_capacity(self.length, 0)?;
140140
for i in 0..self.length {
@@ -187,9 +187,6 @@ impl LuaUserData for CArr {
187187
if !data_handle.check_boundary(offset, this.get_size()) {
188188
return Err(LuaError::external("Out of bounds"));
189189
}
190-
if !data_handle.check_readable(offset, this.get_size()) {
191-
return Err(LuaError::external("Unreadable data handle"));
192-
}
193190

194191
unsafe { this.luavalue_from(lua, offset, data_handle) }
195192
},
@@ -203,7 +200,7 @@ impl LuaUserData for CArr {
203200
if !data_handle.check_boundary(offset, this.size) {
204201
return Err(LuaError::external("Out of bounds"));
205202
}
206-
if !data_handle.checek_writable(offset, this.size) {
203+
if !data_handle.is_writable() {
207204
return Err(LuaError::external("Unwritable data handle"));
208205
}
209206

‎crates/lune-std-ffi/src/c/c_struct.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::{
1010
};
1111
use crate::ffi::{
1212
ffi_association::{get_association, set_association},
13-
FfiBox, GetNativeDataHandle, NativeConvert, NativeDataHandle, NativeSignedness, NativeSize,
13+
FfiBox, GetNativeData, NativeConvert, NativeData, NativeSignedness, NativeSize,
1414
FFI_STATUS_NAMES,
1515
};
1616

@@ -135,7 +135,7 @@ impl NativeConvert for CStruct {
135135
&self,
136136
lua: &'lua Lua,
137137
offset: isize,
138-
data_handle: &Ref<dyn NativeDataHandle>,
138+
data_handle: &Ref<dyn NativeData>,
139139
value: LuaValue<'lua>,
140140
) -> LuaResult<()> {
141141
let LuaValue::Table(ref table) = value else {
@@ -156,7 +156,7 @@ impl NativeConvert for CStruct {
156156
&self,
157157
lua: &'lua Lua,
158158
offset: isize,
159-
data_handle: &Ref<dyn NativeDataHandle>,
159+
data_handle: &Ref<dyn NativeData>,
160160
) -> LuaResult<LuaValue<'lua>> {
161161
let table = lua.create_table_with_capacity(self.conv.len(), 0)?;
162162
for (i, conv) in self.conv.iter().enumerate() {

‎crates/lune-std-ffi/src/c/c_type.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use num::cast::AsPrimitive;
99

1010
use super::{association_names::CTYPE_STATIC, c_helper::get_ensured_size, CArr, CPtr};
1111
use crate::ffi::{
12-
ffi_association::set_association, native_num_cast, FfiBox, GetNativeDataHandle, NativeConvert,
13-
NativeDataHandle, NativeSignedness, NativeSize,
12+
ffi_association::set_association, native_num_cast, FfiBox, GetNativeData, NativeConvert,
13+
NativeData, NativeSignedness, NativeSize,
1414
};
1515

1616
// We can't get a CType<T> through mlua, something like
@@ -42,8 +42,8 @@ pub trait CTypeCast {
4242
fn try_cast_num<T, U>(
4343
&self,
4444
ctype: &LuaAnyUserData,
45-
from: &Ref<dyn NativeDataHandle>,
46-
into: &Ref<dyn NativeDataHandle>,
45+
from: &Ref<dyn NativeData>,
46+
into: &Ref<dyn NativeData>,
4747
) -> LuaResult<Option<()>>
4848
where
4949
T: AsPrimitive<U>,
@@ -62,8 +62,8 @@ pub trait CTypeCast {
6262
&self,
6363
from_ctype: &LuaAnyUserData,
6464
into_ctype: &LuaAnyUserData,
65-
_from: &Ref<dyn NativeDataHandle>,
66-
_into: &Ref<dyn NativeDataHandle>,
65+
_from: &Ref<dyn NativeData>,
66+
_into: &Ref<dyn NativeData>,
6767
) -> LuaResult<()> {
6868
Err(Self::cast_failed_with(self, from_ctype, into_ctype))
6969
}

‎crates/lune-std-ffi/src/c/types/f32.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use mlua::prelude::*;
55
use num::cast::AsPrimitive;
66

77
use super::super::c_type::CType;
8-
use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
8+
use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
99

1010
impl NativeSignedness for CType<f32> {
1111
fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<f32> {
1919
_lua: &'lua Lua,
2020
// _type_userdata: &LuaAnyUserData<'lua>,
2121
offset: isize,
22-
data_handle: &Ref<dyn NativeDataHandle>,
22+
data_handle: &Ref<dyn NativeData>,
2323
value: LuaValue<'lua>,
2424
) -> LuaResult<()> {
2525
let value: f32 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<f32> {
4646
lua: &'lua Lua,
4747
// _type_userdata: &LuaAnyUserData<'lua>,
4848
offset: isize,
49-
data_handle: &Ref<dyn NativeDataHandle>,
49+
data_handle: &Ref<dyn NativeData>,
5050
) -> LuaResult<LuaValue<'lua>> {
5151
let value = unsafe { (*data_handle.get_pointer(offset).cast::<f32>()).into_lua(lua)? };
5252
Ok(value)

‎crates/lune-std-ffi/src/c/types/f64.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use mlua::prelude::*;
55
use num::cast::AsPrimitive;
66

77
use super::super::c_type::CType;
8-
use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
8+
use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
99

1010
impl NativeSignedness for CType<f64> {
1111
fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<f64> {
1919
_lua: &'lua Lua,
2020
// _type_userdata: &LuaAnyUserData<'lua>,
2121
offset: isize,
22-
data_handle: &Ref<dyn NativeDataHandle>,
22+
data_handle: &Ref<dyn NativeData>,
2323
value: LuaValue<'lua>,
2424
) -> LuaResult<()> {
2525
let value: f64 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<f64> {
4646
lua: &'lua Lua,
4747
// _type_userdata: &LuaAnyUserData<'lua>,
4848
offset: isize,
49-
data_handle: &Ref<dyn NativeDataHandle>,
49+
data_handle: &Ref<dyn NativeData>,
5050
) -> LuaResult<LuaValue<'lua>> {
5151
let value = unsafe { (*data_handle.get_pointer(offset).cast::<f64>()).into_lua(lua)? };
5252
Ok(value)

‎crates/lune-std-ffi/src/c/types/i128.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use mlua::prelude::*;
55
use num::cast::AsPrimitive;
66

77
use super::super::c_type::CType;
8-
use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
8+
use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
99

1010
impl NativeSignedness for CType<i128> {
1111
fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<i128> {
1919
_lua: &'lua Lua,
2020
// _type_userdata: &LuaAnyUserData<'lua>,
2121
offset: isize,
22-
data_handle: &Ref<dyn NativeDataHandle>,
22+
data_handle: &Ref<dyn NativeData>,
2323
value: LuaValue<'lua>,
2424
) -> LuaResult<()> {
2525
let value: i128 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<i128> {
4646
lua: &'lua Lua,
4747
// _type_userdata: &LuaAnyUserData<'lua>,
4848
offset: isize,
49-
data_handle: &Ref<dyn NativeDataHandle>,
49+
data_handle: &Ref<dyn NativeData>,
5050
) -> LuaResult<LuaValue<'lua>> {
5151
let value = unsafe { (*data_handle.get_pointer(offset).cast::<i128>()).into_lua(lua)? };
5252
Ok(value)

‎crates/lune-std-ffi/src/c/types/i16.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use mlua::prelude::*;
55
use num::cast::AsPrimitive;
66

77
use super::super::c_type::CType;
8-
use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
8+
use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
99

1010
impl NativeSignedness for CType<i16> {
1111
fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<i16> {
1919
_lua: &'lua Lua,
2020
// _type_userdata: &LuaAnyUserData<'lua>,
2121
offset: isize,
22-
data_handle: &Ref<dyn NativeDataHandle>,
22+
data_handle: &Ref<dyn NativeData>,
2323
value: LuaValue<'lua>,
2424
) -> LuaResult<()> {
2525
let value: i16 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<i16> {
4646
lua: &'lua Lua,
4747
// _type_userdata: &LuaAnyUserData<'lua>,
4848
offset: isize,
49-
data_handle: &Ref<dyn NativeDataHandle>,
49+
data_handle: &Ref<dyn NativeData>,
5050
) -> LuaResult<LuaValue<'lua>> {
5151
let value = unsafe { (*data_handle.get_pointer(offset).cast::<i16>()).into_lua(lua)? };
5252
Ok(value)

‎crates/lune-std-ffi/src/c/types/i32.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use mlua::prelude::*;
55
use num::cast::AsPrimitive;
66

77
use super::super::c_type::CType;
8-
use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
8+
use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
99

1010
impl NativeSignedness for CType<i32> {
1111
fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<i32> {
1919
_lua: &'lua Lua,
2020
// _type_userdata: &LuaAnyUserData<'lua>,
2121
offset: isize,
22-
data_handle: &Ref<dyn NativeDataHandle>,
22+
data_handle: &Ref<dyn NativeData>,
2323
value: LuaValue<'lua>,
2424
) -> LuaResult<()> {
2525
let value: i32 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<i32> {
4646
lua: &'lua Lua,
4747
// _type_userdata: &LuaAnyUserData<'lua>,
4848
offset: isize,
49-
data_handle: &Ref<dyn NativeDataHandle>,
49+
data_handle: &Ref<dyn NativeData>,
5050
) -> LuaResult<LuaValue<'lua>> {
5151
let value = unsafe { (*data_handle.get_pointer(offset).cast::<i32>()).into_lua(lua)? };
5252
Ok(value)

‎crates/lune-std-ffi/src/c/types/i64.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use mlua::prelude::*;
55
use num::cast::AsPrimitive;
66

77
use super::super::c_type::CType;
8-
use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
8+
use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
99

1010
impl NativeSignedness for CType<i64> {
1111
fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<i64> {
1919
_lua: &'lua Lua,
2020
// _type_userdata: &LuaAnyUserData<'lua>,
2121
offset: isize,
22-
data_handle: &Ref<dyn NativeDataHandle>,
22+
data_handle: &Ref<dyn NativeData>,
2323
value: LuaValue<'lua>,
2424
) -> LuaResult<()> {
2525
let value: i64 = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<i64> {
4646
lua: &'lua Lua,
4747
// _type_userdata: &LuaAnyUserData<'lua>,
4848
offset: isize,
49-
data_handle: &Ref<dyn NativeDataHandle>,
49+
data_handle: &Ref<dyn NativeData>,
5050
) -> LuaResult<LuaValue<'lua>> {
5151
let value = unsafe { (*data_handle.get_pointer(offset).cast::<i64>()).into_lua(lua)? };
5252
Ok(value)

‎crates/lune-std-ffi/src/c/types/i8.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use mlua::prelude::*;
55
use num::cast::AsPrimitive;
66

77
use super::super::c_type::CType;
8-
use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
8+
use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
99

1010
impl NativeSignedness for CType<i8> {
1111
fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<i8> {
1919
_lua: &'lua Lua,
2020
// _type_userdata: &LuaAnyUserData<'lua>,
2121
offset: isize,
22-
data_handle: &Ref<dyn NativeDataHandle>,
22+
data_handle: &Ref<dyn NativeData>,
2323
value: LuaValue<'lua>,
2424
) -> LuaResult<()> {
2525
let value: i8 = match value {
@@ -42,7 +42,7 @@ impl NativeConvert for CType<i8> {
4242
lua: &'lua Lua,
4343
// _type_userdata: &LuaAnyUserData<'lua>,
4444
offset: isize,
45-
data_handle: &Ref<dyn NativeDataHandle>,
45+
data_handle: &Ref<dyn NativeData>,
4646
) -> LuaResult<LuaValue<'lua>> {
4747
let value = unsafe { (*data_handle.get_pointer(offset).cast::<i8>()).into_lua(lua)? };
4848
Ok(value)

‎crates/lune-std-ffi/src/c/types/isize.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use mlua::prelude::*;
55
use num::cast::AsPrimitive;
66

77
use super::super::c_type::CType;
8-
use crate::ffi::{NativeConvert, NativeDataHandle, NativeSignedness};
8+
use crate::ffi::{NativeConvert, NativeData, NativeSignedness};
99

1010
impl NativeSignedness for CType<isize> {
1111
fn get_signedness(&self) -> bool {
@@ -19,7 +19,7 @@ impl NativeConvert for CType<isize> {
1919
_lua: &'lua Lua,
2020
// _type_userdata: &LuaAnyUserData<'lua>,
2121
offset: isize,
22-
data_handle: &Ref<dyn NativeDataHandle>,
22+
data_handle: &Ref<dyn NativeData>,
2323
value: LuaValue<'lua>,
2424
) -> LuaResult<()> {
2525
let value: isize = match value {
@@ -46,7 +46,7 @@ impl NativeConvert for CType<isize> {
4646
lua: &'lua Lua,
4747
// _type_userdata: &LuaAnyUserData<'lua>,
4848
offset: isize,
49-
data_handle: &Ref<dyn NativeDataHandle>,
49+
data_handle: &Ref<dyn NativeData>,
5050
) -> LuaResult<LuaValue<'lua>> {
5151
let value = unsafe { (*data_handle.get_pointer(offset).cast::<isize>()).into_lua(lua)? };
5252
Ok(value)

0 commit comments

Comments
 (0)