admin/mlua-rs-mlua
1
0
Fork 0
mirror of https://github.com/mlua-rs/mlua synced 2026-06-08 16:05:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove stack_guard function and instead just use StackGuard directly

Browse Source
This commit is contained in:
kyren
2018-03-12 13:13:44 -04:00
parent 7b2f7a2932
commit ee23f199f0
8 changed files with 526 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.rs
+14 -14
View File
@@ -2,7 +2,7 @@ use std::{slice, str};
use ffi;
use error::{Error, Result};
use util::{check_stack, stack_guard};
use util::{check_stack, StackGuard};
use types::LuaRef;
/// Handle to an internal Lua string.
@@ -69,21 +69,21 @@ impl<'lua> String<'lua> {
pub fn as_bytes_with_nul(&self) -> &[u8] {
let lua = self.0.lua;
unsafe {
stack_guard(lua.state, || {
check_stack(lua.state, 1);
lua.push_ref(&self.0);
rlua_assert!(
ffi::lua_type(lua.state, -1) == ffi::LUA_TSTRING,
"string ref is not string type"
);
let _sg = StackGuard::new(lua.state);
check_stack(lua.state, 1);
let mut size = 0;
// This will not trigger a 'm' error, because the reference is guaranteed to be of
// string type
let data = ffi::lua_tolstring(lua.state, -1, &mut size);
lua.push_ref(&self.0);
rlua_assert!(
ffi::lua_type(lua.state, -1) == ffi::LUA_TSTRING,
"string ref is not string type"
);
slice::from_raw_parts(data as *const u8, size + 1)
})
let mut size = 0;
// This will not trigger a 'm' error, because the reference is guaranteed to be of
// string type
let data = ffi::lua_tolstring(lua.state, -1, &mut size);
slice::from_raw_parts(data as *const u8, size + 1)
}
}
}