From 582b2c585f142ada0911ebbb2b39dbeda706922e Mon Sep 17 00:00:00 2001 From: Alex Orlenko Date: Thu, 8 Jul 2021 22:57:54 +0100 Subject: [PATCH] Rename init_gc_metatable_for and get_gc_metatable_for --- src/lua.rs | 20 ++++++++++---------- src/util.rs | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/lua.rs b/src/lua.rs index c64c07a..003a27f 100644 --- a/src/lua.rs +++ b/src/lua.rs @@ -27,8 +27,8 @@ use crate::userdata::{ }; use crate::util::{ self, assert_stack, callback_error, check_stack, get_destructed_userdata_metatable, - get_gc_metatable_for, get_gc_userdata, get_main_state, get_userdata, get_wrapped_error, - init_error_registry, init_gc_metatable_for, init_userdata_metatable, pop_error, protect_lua, + get_gc_metatable, get_gc_userdata, get_main_state, get_userdata, get_wrapped_error, + init_error_registry, init_gc_metatable, init_userdata_metatable, pop_error, protect_lua, push_gc_userdata, push_string, push_table, push_userdata, push_wrapped_error, rawset_field, safe_pcall, safe_xpcall, StackGuard, WrappedError, WrappedPanic, }; @@ -398,14 +398,14 @@ impl Lua { // Create the internal metatables and place them in the registry // to prevent them from being garbage collected. - init_gc_metatable_for::(state, None)?; - init_gc_metatable_for::(state, None)?; + init_gc_metatable::(state, None)?; + init_gc_metatable::(state, None)?; #[cfg(feature = "async")] { - init_gc_metatable_for::(state, None)?; - init_gc_metatable_for::(state, None)?; - init_gc_metatable_for::(state, None)?; - init_gc_metatable_for::>(state, None)?; + init_gc_metatable::(state, None)?; + init_gc_metatable::(state, None)?; + init_gc_metatable::(state, None)?; + init_gc_metatable::>(state, None)?; // Create empty Waker slot push_gc_userdata::>(state, None)?; @@ -2420,7 +2420,7 @@ where Ok(Err(err)) => { let wrapped_error = get_prealloc_err() as *mut WrappedError; ptr::write(wrapped_error, WrappedError(err)); - get_gc_metatable_for::(state); + get_gc_metatable::(state); ffi::lua_setmetatable(state, -2); // Convert to CallbackError and attach traceback @@ -2440,7 +2440,7 @@ where Err(p) => { let wrapped_panic = get_prealloc_err() as *mut WrappedPanic; ptr::write(wrapped_panic, WrappedPanic(Some(p))); - get_gc_metatable_for::(state); + get_gc_metatable::(state); ffi::lua_setmetatable(state, -2); ffi::lua_error(state) } diff --git a/src/util.rs b/src/util.rs index cbcf294..df82e0b 100644 --- a/src/util.rs +++ b/src/util.rs @@ -271,7 +271,7 @@ pub unsafe fn take_userdata(state: *mut ffi::lua_State) -> T { // Internally uses 3 stack spaces, does not call checkstack. pub unsafe fn push_gc_userdata(state: *mut ffi::lua_State, t: T) -> Result<()> { push_userdata(state, t)?; - get_gc_metatable_for::(state); + get_gc_metatable::(state); ffi::lua_setmetatable(state, -2); Ok(()) } @@ -282,7 +282,7 @@ pub unsafe fn get_gc_userdata(state: *mut ffi::lua_State, index: c_int) if ud.is_null() || ffi::lua_getmetatable(state, index) == 0 { return ptr::null_mut(); } - get_gc_metatable_for::(state); + get_gc_metatable::(state); let res = ffi::lua_rawequal(state, -1, -2); ffi::lua_pop(state, 2); if res == 0 { @@ -496,7 +496,7 @@ where let wrapped_error = ud as *mut WrappedError; ptr::write(wrapped_error, WrappedError(err)); - get_gc_metatable_for::(state); + get_gc_metatable::(state); ffi::lua_setmetatable(state, -2); // Convert to CallbackError and attach traceback @@ -516,7 +516,7 @@ where Err(p) => { ffi::lua_settop(state, 1); ptr::write(ud as *mut WrappedPanic, WrappedPanic(Some(p))); - get_gc_metatable_for::(state); + get_gc_metatable::(state); ffi::lua_setmetatable(state, -2); ffi::lua_error(state) } @@ -651,7 +651,7 @@ pub unsafe fn get_wrapped_error(state: *mut ffi::lua_State, index: c_int) -> *co // Initialize the internal (with __gc method) metatable for a type T. // Uses 6 stack spaces and calls checkstack. -pub unsafe fn init_gc_metatable_for( +pub unsafe fn init_gc_metatable( state: *mut ffi::lua_State, customize_fn: Option Result<()>>, ) -> Result<()> { @@ -687,7 +687,7 @@ pub unsafe fn init_gc_metatable_for( Ok(()) } -pub unsafe fn get_gc_metatable_for(state: *mut ffi::lua_State) { +pub unsafe fn get_gc_metatable(state: *mut ffi::lua_State) { let type_id = TypeId::of::(); let ref_addr = { let mt_cache = mlua_expect!(METATABLE_CACHE.lock(), "cannot lock metatable cache"); @@ -773,7 +773,7 @@ pub unsafe fn init_error_registry(state: *mut ffi::lua_State) -> Result<()> { }) } - init_gc_metatable_for::( + init_gc_metatable::( state, Some(|state| { ffi::lua_pushcfunction(state, error_tostring); @@ -781,7 +781,7 @@ pub unsafe fn init_error_registry(state: *mut ffi::lua_State) -> Result<()> { }), )?; - init_gc_metatable_for::( + init_gc_metatable::( state, Some(|state| { ffi::lua_pushcfunction(state, error_tostring); @@ -846,7 +846,7 @@ pub unsafe fn init_error_registry(state: *mut ffi::lua_State) -> Result<()> { })?; // Create error print buffer - init_gc_metatable_for::(state, None)?; + init_gc_metatable::(state, None)?; push_gc_userdata(state, String::new())?; protect_lua(state, 1, 0, |state| { let err_buf_key = &ERROR_PRINT_BUFFER_KEY as *const u8 as *const c_void;