From 925a2816cc8d25aececb51534adcbbe0de1e23b3 Mon Sep 17 00:00:00 2001 From: Alex Orlenko Date: Thu, 6 Jul 2023 00:59:46 +0100 Subject: [PATCH] clippy --- src/lua.rs | 2 +- src/util/mod.rs | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lua.rs b/src/lua.rs index 77d3a91..02c3fbd 100644 --- a/src/lua.rs +++ b/src/lua.rs @@ -448,7 +448,7 @@ impl Lua { /// /// Once called, a returned Lua state is cached in the registry and can be retrieved /// by calling this function again. - #[allow(clippy::missing_safety_doc)] + #[allow(clippy::missing_safety_doc, clippy::arc_with_non_send_sync)] pub unsafe fn init_from_ptr(state: *mut ffi::lua_State) -> Lua { assert!(!state.is_null(), "Lua state is NULL"); if let Some(lua) = Lua::try_from_ptr(state) { diff --git a/src/util/mod.rs b/src/util/mod.rs index 0526190..b497032 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -656,8 +656,6 @@ where Ok(Err(err)) => { ffi::lua_settop(state, 1); - let wrapped_error = ud as *mut WrappedFailure; - // Build `CallbackError` with traceback let traceback = if ffi::lua_checkstack(state, ffi::LUA_TRACEBACK_STACK) != 0 { ffi::luaL_traceback(state, state, ptr::null(), 0); @@ -668,10 +666,8 @@ where "".to_string() }; let cause = Arc::new(err); - ptr::write( - wrapped_error, - WrappedFailure::Error(Error::CallbackError { traceback, cause }), - ); + let wrapped_error = WrappedFailure::Error(Error::CallbackError { traceback, cause }); + ptr::write(ud, wrapped_error); get_gc_metatable::(state); ffi::lua_setmetatable(state, -2); @@ -679,7 +675,7 @@ where } Err(p) => { ffi::lua_settop(state, 1); - ptr::write(ud as *mut WrappedFailure, WrappedFailure::Panic(Some(p))); + ptr::write(ud, WrappedFailure::Panic(Some(p))); get_gc_metatable::(state); ffi::lua_setmetatable(state, -2); ffi::lua_error(state)