summaryrefslogtreecommitdiff
path: root/src/lua.rs
diff options
context:
space:
mode:
authorAlex Orlenko <zxteam@protonmail.com>2019-09-28 01:44:15 +0100
committerAlex Orlenko <zxteam@protonmail.com>2019-09-29 12:56:06 +0100
commit0c230a30370346d9583ac71704da1aa0d6693604 (patch)
tree9db71cd08c1aadb43de86bb59019f4a80dfba638 /src/lua.rs
parentb23ee6a1628d676c36e63ec5e304f97e129a5164 (diff)
downloadmlua-0c230a30370346d9583ac71704da1aa0d6693604.zip
Allow to catch rust panics via pcall
Diffstat (limited to 'src/lua.rs')
-rw-r--r--src/lua.rs20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/lua.rs b/src/lua.rs
index 297aafa..ef5fc81 100644
--- a/src/lua.rs
+++ b/src/lua.rs
@@ -19,8 +19,8 @@ use crate::userdata::{AnyUserData, MetaMethod, UserData, UserDataMethods};
use crate::util::{
assert_stack, callback_error, check_stack, get_userdata, get_wrapped_error,
init_error_registry, init_userdata_metatable, main_state, pop_error, protect_lua,
- protect_lua_closure, push_string, push_userdata, push_wrapped_error, safe_pcall, safe_xpcall,
- userdata_destructor, StackGuard,
+ protect_lua_closure, push_string, push_userdata, push_wrapped_error, userdata_destructor,
+ StackGuard,
};
use crate::value::{FromLua, FromLuaMulti, MultiValue, Nil, ToLua, ToLuaMulti, Value};
@@ -62,22 +62,6 @@ impl Lua {
ffi::lua_rawset(state, ffi::LUA_REGISTRYINDEX);
- // Override pcall and xpcall with versions that cannot be used to catch rust panics.
-
- /*
- ffi::lua_rawgeti(state, ffi::LUA_REGISTRYINDEX, ffi::LUA_RIDX_GLOBALS);
-
- ffi::lua_pushstring(state, cstr!("pcall"));
- ffi::lua_pushcfunction(state, safe_pcall);
- ffi::lua_rawset(state, -3);
-
- ffi::lua_pushstring(state, cstr!("xpcall"));
- ffi::lua_pushcfunction(state, safe_xpcall);
- ffi::lua_rawset(state, -3);
-
- ffi::lua_pop(state, 1);
- */
-
// Create ref stack thread and place it in the registry to prevent it from being garbage
// collected.