From aaf0a5e44aa035ca72628eb9491a24b7f34aad57 Mon Sep 17 00:00:00 2001 From: Alex Orlenko Date: Fri, 14 Apr 2023 00:36:31 +0100 Subject: [PATCH] Remove usage of crate::ffi (clippy) --- src/chunk.rs | 1 - src/function.rs | 1 - src/hook.rs | 3 ++- src/lib.rs | 1 - src/lua.rs | 1 - src/luau.rs | 1 - src/memory.rs | 1 - src/scope.rs | 1 - src/serde/mod.rs | 1 - src/serde/ser.rs | 1 - src/string.rs | 1 - src/table.rs | 1 - src/thread.rs | 1 - src/types.rs | 1 - src/userdata.rs | 1 - src/userdata_impl.rs | 1 - src/util.rs | 1 - src/value.rs | 1 - 18 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/chunk.rs b/src/chunk.rs index c142db4..1ba3945 100644 --- a/src/chunk.rs +++ b/src/chunk.rs @@ -6,7 +6,6 @@ use std::path::{Path, PathBuf}; use std::string::String as StdString; use crate::error::{Error, Result}; -use crate::ffi; use crate::function::Function; use crate::lua::Lua; use crate::value::{FromLuaMulti, IntoLua, IntoLuaMulti, Value}; diff --git a/src/function.rs b/src/function.rs index 5148873..8e9513d 100644 --- a/src/function.rs +++ b/src/function.rs @@ -5,7 +5,6 @@ use std::ptr; use std::slice; use crate::error::{Error, Result}; -use crate::ffi; use crate::lua::Lua; use crate::memory::MemoryState; use crate::types::{Callback, LuaRef, MaybeSend}; diff --git a/src/hook.rs b/src/hook.rs index de4e366..14871b7 100644 --- a/src/hook.rs +++ b/src/hook.rs @@ -3,7 +3,8 @@ use std::cell::UnsafeCell; use std::ops::{BitOr, BitOrAssign}; use std::os::raw::c_int; -use crate::ffi::{self, lua_Debug}; +use ffi::lua_Debug; + use crate::lua::Lua; use crate::util::ptr_to_cstr_bytes; diff --git a/src/lib.rs b/src/lib.rs index b0180ff..3733aee 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -103,7 +103,6 @@ mod value; pub mod prelude; -pub(crate) use ffi; pub use ffi::{lua_CFunction, lua_State}; pub use crate::chunk::{AsChunk, Chunk, ChunkMode}; diff --git a/src/lua.rs b/src/lua.rs index f5f177d..2ca7281 100644 --- a/src/lua.rs +++ b/src/lua.rs @@ -16,7 +16,6 @@ use rustc_hash::FxHashMap; use crate::chunk::{AsChunk, Chunk, ChunkMode}; use crate::error::{Error, Result}; -use crate::ffi; use crate::function::Function; use crate::hook::Debug; use crate::memory::{MemoryState, ALLOCATOR}; diff --git a/src/luau.rs b/src/luau.rs index 6ddfb5c..bc4b2d0 100644 --- a/src/luau.rs +++ b/src/luau.rs @@ -4,7 +4,6 @@ use std::string::String as StdString; use crate::chunk::ChunkMode; use crate::error::{Error, Result}; -use crate::ffi; use crate::lua::Lua; use crate::table::Table; use crate::util::{check_stack, StackGuard}; diff --git a/src/memory.rs b/src/memory.rs index ce7e1e0..ad30a79 100644 --- a/src/memory.rs +++ b/src/memory.rs @@ -2,7 +2,6 @@ use std::alloc::{self, Layout}; use std::os::raw::c_void; use std::ptr; -use crate::ffi; #[cfg(feature = "luau")] use crate::lua::ExtraData; diff --git a/src/scope.rs b/src/scope.rs index 0f6a55d..616e1dc 100644 --- a/src/scope.rs +++ b/src/scope.rs @@ -8,7 +8,6 @@ use std::os::raw::c_int; use serde::Serialize; use crate::error::{Error, Result}; -use crate::ffi; use crate::function::Function; use crate::lua::Lua; use crate::types::{Callback, CallbackUpvalue, LuaRef, MaybeSend}; diff --git a/src/serde/mod.rs b/src/serde/mod.rs index fefa44b..a4328df 100644 --- a/src/serde/mod.rs +++ b/src/serde/mod.rs @@ -6,7 +6,6 @@ use std::ptr; use serde::{Deserialize, Serialize}; use crate::error::Result; -use crate::ffi; use crate::lua::Lua; use crate::private::Sealed; use crate::table::Table; diff --git a/src/serde/ser.rs b/src/serde/ser.rs index 9f79dad..9d4bbe5 100644 --- a/src/serde/ser.rs +++ b/src/serde/ser.rs @@ -4,7 +4,6 @@ use serde::{ser, Serialize}; use super::LuaSerdeExt; use crate::error::{Error, Result}; -use crate::ffi; use crate::lua::Lua; use crate::string::String; use crate::table::Table; diff --git a/src/string.rs b/src/string.rs index 325362c..9ef56c8 100644 --- a/src/string.rs +++ b/src/string.rs @@ -11,7 +11,6 @@ use { }; use crate::error::{Error, Result}; -use crate::ffi; use crate::types::LuaRef; /// Handle to an internal Lua string. diff --git a/src/table.rs b/src/table.rs index fd24ed9..015172d 100644 --- a/src/table.rs +++ b/src/table.rs @@ -11,7 +11,6 @@ use { }; use crate::error::{Error, Result}; -use crate::ffi; use crate::function::Function; use crate::private::Sealed; use crate::types::{Integer, LuaRef}; diff --git a/src/thread.rs b/src/thread.rs index 174cb97..21271db 100644 --- a/src/thread.rs +++ b/src/thread.rs @@ -2,7 +2,6 @@ use std::cmp; use std::os::raw::c_int; use crate::error::{Error, Result}; -use crate::ffi; #[allow(unused)] use crate::lua::Lua; use crate::types::LuaRef; diff --git a/src/types.rs b/src/types.rs index 8a3e34c..e06529d 100644 --- a/src/types.rs +++ b/src/types.rs @@ -12,7 +12,6 @@ use std::ffi::CStr; use futures_core::future::LocalBoxFuture; use crate::error::Result; -use crate::ffi; #[cfg(not(feature = "luau"))] use crate::hook::Debug; use crate::lua::{ExtraData, Lua}; diff --git a/src/userdata.rs b/src/userdata.rs index e43d52f..44de70d 100644 --- a/src/userdata.rs +++ b/src/userdata.rs @@ -17,7 +17,6 @@ use { }; use crate::error::{Error, Result}; -use crate::ffi; use crate::function::Function; use crate::lua::Lua; use crate::table::{Table, TablePairs}; diff --git a/src/userdata_impl.rs b/src/userdata_impl.rs index 6f4ba5d..d143631 100644 --- a/src/userdata_impl.rs +++ b/src/userdata_impl.rs @@ -5,7 +5,6 @@ use std::string::String as StdString; use std::sync::{Arc, Mutex, RwLock}; use crate::error::{Error, Result}; -use crate::ffi; use crate::lua::Lua; use crate::types::{Callback, MaybeSend}; use crate::userdata::{ diff --git a/src/util.rs b/src/util.rs index b659048..cd0f32e 100644 --- a/src/util.rs +++ b/src/util.rs @@ -11,7 +11,6 @@ use once_cell::sync::Lazy; use rustc_hash::FxHashMap; use crate::error::{Error, Result}; -use crate::ffi; use crate::memory::MemoryState; static METATABLE_CACHE: Lazy> = Lazy::new(|| { diff --git a/src/value.rs b/src/value.rs index dd8a3bc..74834a9 100644 --- a/src/value.rs +++ b/src/value.rs @@ -14,7 +14,6 @@ use { }; use crate::error::{Error, Result}; -use crate::ffi; use crate::function::Function; use crate::lua::Lua; use crate::string::String;