Skip to content

Commit 272cfdb

Browse files
khvzakkhvzak
committed
Change Lua library name constants from &str to *const c_char.
It makes easier to pass them to Lua API functions.
1 parent 8e244a2 commit 272cfdb

File tree

8 files changed

+63
-80
lines changed

8 files changed

+63
-80
lines changed

‎mlua-sys/src/lua51/lualib.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
//! Contains definitions from `lualib.h`.
22
3-
use std::os::raw::c_int;
3+
use std::os::raw::{c_char, c_int};
44

55
use super::lua::lua_State;
66

7-
pub const LUA_COLIBNAME: &str = "coroutine";
8-
pub const LUA_TABLIBNAME: &str = "table";
9-
pub const LUA_IOLIBNAME: &str = "io";
10-
pub const LUA_OSLIBNAME: &str = "os";
11-
pub const LUA_STRLIBNAME: &str = "string";
12-
pub const LUA_MATHLIBNAME: &str = "math";
13-
pub const LUA_DBLIBNAME: &str = "debug";
14-
pub const LUA_LOADLIBNAME: &str = "package";
7+
pub const LUA_COLIBNAME: *const c_char = cstr!("coroutine");
8+
pub const LUA_TABLIBNAME: *const c_char = cstr!("table");
9+
pub const LUA_IOLIBNAME: *const c_char = cstr!("io");
10+
pub const LUA_OSLIBNAME: *const c_char = cstr!("os");
11+
pub const LUA_STRLIBNAME: *const c_char = cstr!("string");
12+
pub const LUA_MATHLIBNAME: *const c_char = cstr!("math");
13+
pub const LUA_DBLIBNAME: *const c_char = cstr!("debug");
14+
pub const LUA_LOADLIBNAME: *const c_char = cstr!("package");
1515

1616
#[cfg(feature = "luajit")]
17-
pub const LUA_BITLIBNAME: &str = "bit";
17+
pub const LUA_BITLIBNAME: *const c_char = cstr!("bit");
1818
#[cfg(feature = "luajit")]
19-
pub const LUA_JITLIBNAME: &str = "jit";
19+
pub const LUA_JITLIBNAME: *const c_char = cstr!("jit");
2020
#[cfg(feature = "luajit")]
21-
pub const LUA_FFILIBNAME: &str = "ffi";
21+
pub const LUA_FFILIBNAME: *const c_char = cstr!("ffi");
2222

2323
#[cfg_attr(all(windows, raw_dylib), link(name = "lua51", kind = "raw-dylib"))]
2424
extern "C-unwind" {

‎mlua-sys/src/lua52/lualib.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
//! Contains definitions from `lualib.h`.
22
3-
use std::os::raw::c_int;
3+
use std::os::raw::{c_char, c_int};
44

55
use super::lua::lua_State;
66

7-
pub const LUA_COLIBNAME: &str = "coroutine";
8-
pub const LUA_TABLIBNAME: &str = "table";
9-
pub const LUA_IOLIBNAME: &str = "io";
10-
pub const LUA_OSLIBNAME: &str = "os";
11-
pub const LUA_STRLIBNAME: &str = "string";
12-
pub const LUA_BITLIBNAME: &str = "bit32";
13-
pub const LUA_MATHLIBNAME: &str = "math";
14-
pub const LUA_DBLIBNAME: &str = "debug";
15-
pub const LUA_LOADLIBNAME: &str = "package";
7+
pub const LUA_COLIBNAME: *const c_char = cstr!("coroutine");
8+
pub const LUA_TABLIBNAME: *const c_char = cstr!("table");
9+
pub const LUA_IOLIBNAME: *const c_char = cstr!("io");
10+
pub const LUA_OSLIBNAME: *const c_char = cstr!("os");
11+
pub const LUA_STRLIBNAME: *const c_char = cstr!("string");
12+
pub const LUA_BITLIBNAME: *const c_char = cstr!("bit32");
13+
pub const LUA_MATHLIBNAME: *const c_char = cstr!("math");
14+
pub const LUA_DBLIBNAME: *const c_char = cstr!("debug");
15+
pub const LUA_LOADLIBNAME: *const c_char = cstr!("package");
1616

1717
#[cfg_attr(all(windows, raw_dylib), link(name = "lua52", kind = "raw-dylib"))]
1818
extern "C-unwind" {

‎mlua-sys/src/lua53/lauxlib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ use super::lua::{self, lua_CFunction, lua_Integer, lua_Number, lua_State};
99
pub const LUA_ERRFILE: c_int = lua::LUA_ERRERR + 1;
1010

1111
// Key, in the registry, for table of loaded modules
12-
pub const LUA_LOADED_TABLE: &str = "_LOADED";
12+
pub const LUA_LOADED_TABLE: *const c_char = cstr!("_LOADED");
1313

1414
// Key, in the registry, for table of preloaded loaders
15-
pub const LUA_PRELOAD_TABLE: &str = "_PRELOAD";
15+
pub const LUA_PRELOAD_TABLE: *const c_char = cstr!("_PRELOAD");
1616

1717
#[repr(C)]
1818
pub struct luaL_Reg {

‎mlua-sys/src/lua53/lualib.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
//! Contains definitions from `lualib.h`.
22
3-
use std::os::raw::c_int;
3+
use std::os::raw::{c_char, c_int};
44

55
use super::lua::lua_State;
66

7-
pub const LUA_COLIBNAME: &str = "coroutine";
8-
pub const LUA_TABLIBNAME: &str = "table";
9-
pub const LUA_IOLIBNAME: &str = "io";
10-
pub const LUA_OSLIBNAME: &str = "os";
11-
pub const LUA_STRLIBNAME: &str = "string";
12-
pub const LUA_UTF8LIBNAME: &str = "utf8";
13-
pub const LUA_BITLIBNAME: &str = "bit32";
14-
pub const LUA_MATHLIBNAME: &str = "math";
15-
pub const LUA_DBLIBNAME: &str = "debug";
16-
pub const LUA_LOADLIBNAME: &str = "package";
7+
pub const LUA_COLIBNAME: *const c_char = cstr!("coroutine");
8+
pub const LUA_TABLIBNAME: *const c_char = cstr!("table");
9+
pub const LUA_IOLIBNAME: *const c_char = cstr!("io");
10+
pub const LUA_OSLIBNAME: *const c_char = cstr!("os");
11+
pub const LUA_STRLIBNAME: *const c_char = cstr!("string");
12+
pub const LUA_UTF8LIBNAME: *const c_char = cstr!("utf8");
13+
pub const LUA_BITLIBNAME: *const c_char = cstr!("bit32");
14+
pub const LUA_MATHLIBNAME: *const c_char = cstr!("math");
15+
pub const LUA_DBLIBNAME: *const c_char = cstr!("debug");
16+
pub const LUA_LOADLIBNAME: *const c_char = cstr!("package");
1717

1818
#[cfg_attr(all(windows, raw_dylib), link(name = "lua53", kind = "raw-dylib"))]
1919
extern "C-unwind" {

‎mlua-sys/src/lua54/lauxlib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ use super::lua::{self, lua_CFunction, lua_Integer, lua_Number, lua_State};
99
pub const LUA_ERRFILE: c_int = lua::LUA_ERRERR + 1;
1010

1111
// Key, in the registry, for table of loaded modules
12-
pub const LUA_LOADED_TABLE: &str = "_LOADED";
12+
pub const LUA_LOADED_TABLE: *const c_char = cstr!("_LOADED");
1313

1414
// Key, in the registry, for table of preloaded loaders
15-
pub const LUA_PRELOAD_TABLE: &str = "_PRELOAD";
15+
pub const LUA_PRELOAD_TABLE: *const c_char = cstr!("_PRELOAD");
1616

1717
#[repr(C)]
1818
pub struct luaL_Reg {

‎mlua-sys/src/lua54/lualib.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
//! Contains definitions from `lualib.h`.
22
3-
use std::os::raw::c_int;
3+
use std::os::raw::{c_char, c_int};
44

55
use super::lua::lua_State;
66

7-
pub const LUA_COLIBNAME: &str = "coroutine";
8-
pub const LUA_TABLIBNAME: &str = "table";
9-
pub const LUA_IOLIBNAME: &str = "io";
10-
pub const LUA_OSLIBNAME: &str = "os";
11-
pub const LUA_STRLIBNAME: &str = "string";
12-
pub const LUA_UTF8LIBNAME: &str = "utf8";
13-
pub const LUA_MATHLIBNAME: &str = "math";
14-
pub const LUA_DBLIBNAME: &str = "debug";
15-
pub const LUA_LOADLIBNAME: &str = "package";
7+
pub const LUA_COLIBNAME: *const c_char = cstr!("coroutine");
8+
pub const LUA_TABLIBNAME: *const c_char = cstr!("table");
9+
pub const LUA_IOLIBNAME: *const c_char = cstr!("io");
10+
pub const LUA_OSLIBNAME: *const c_char = cstr!("os");
11+
pub const LUA_STRLIBNAME: *const c_char = cstr!("string");
12+
pub const LUA_UTF8LIBNAME: *const c_char = cstr!("utf8");
13+
pub const LUA_MATHLIBNAME: *const c_char = cstr!("math");
14+
pub const LUA_DBLIBNAME: *const c_char = cstr!("debug");
15+
pub const LUA_LOADLIBNAME: *const c_char = cstr!("package");
1616

1717
#[cfg_attr(all(windows, raw_dylib), link(name = "lua54", kind = "raw-dylib"))]
1818
extern "C-unwind" {

‎mlua-sys/src/luau/lualib.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
//! Contains definitions from `lualib.h`.
22
3-
use std::os::raw::c_int;
3+
use std::os::raw::{c_char, c_int};
44

55
use super::lua::lua_State;
66

7-
pub const LUA_COLIBNAME: &str = "coroutine";
8-
pub const LUA_TABLIBNAME: &str = "table";
9-
pub const LUA_OSLIBNAME: &str = "os";
10-
pub const LUA_STRLIBNAME: &str = "string";
11-
pub const LUA_BITLIBNAME: &str = "bit32";
12-
pub const LUA_BUFFERLIBNAME: &str = "buffer";
13-
pub const LUA_UTF8LIBNAME: &str = "utf8";
14-
pub const LUA_MATHLIBNAME: &str = "math";
15-
pub const LUA_DBLIBNAME: &str = "debug";
16-
pub const LUA_VECLIBNAME: &str = "vector";
7+
pub const LUA_COLIBNAME: *const c_char = cstr!("coroutine");
8+
pub const LUA_TABLIBNAME: *const c_char = cstr!("table");
9+
pub const LUA_OSLIBNAME: *const c_char = cstr!("os");
10+
pub const LUA_STRLIBNAME: *const c_char = cstr!("string");
11+
pub const LUA_BITLIBNAME: *const c_char = cstr!("bit32");
12+
pub const LUA_BUFFERLIBNAME: *const c_char = cstr!("buffer");
13+
pub const LUA_UTF8LIBNAME: *const c_char = cstr!("utf8");
14+
pub const LUA_MATHLIBNAME: *const c_char = cstr!("math");
15+
pub const LUA_DBLIBNAME: *const c_char = cstr!("debug");
16+
pub const LUA_VECLIBNAME: *const c_char = cstr!("vector");
1717

1818
extern "C-unwind" {
1919
pub fn luaopen_base(L: *mut lua_State) -> c_int;

‎src/state/raw.rs‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::any::TypeId;
22
use std::cell::{Cell, UnsafeCell};
3-
use std::ffi::{CStr, CString};
3+
use std::ffi::CStr;
44
use std::mem;
55
use std::os::raw::{c_char, c_int, c_void};
66
use std::panic::resume_unwind;
@@ -1285,16 +1285,14 @@ impl RawLua {
12851285

12861286
// Uses 3 stack spaces
12871287
unsafe fn load_std_libs(state: *mut ffi::lua_State, libs: StdLib) -> Result<()> {
1288-
#[inline(always)]
1289-
pub unsafe fn requiref(
1288+
unsafe fn requiref(
12901289
state: *mut ffi::lua_State,
1291-
modname: &str,
1290+
modname: *const c_char,
12921291
openf: ffi::lua_CFunction,
12931292
glb: c_int,
12941293
) -> Result<()> {
1295-
let modname = mlua_expect!(CString::new(modname), "modname contains nil byte");
1296-
protect_lua!(state, 0, 1, |state| {
1297-
ffi::luaL_requiref(state, modname.as_ptr() as *const c_char, openf, glb)
1294+
protect_lua!(state, 0, 0, |state| {
1295+
ffi::luaL_requiref(state, modname, openf, glb)
12981296
})
12991297
}
13001298

@@ -1325,81 +1323,68 @@ unsafe fn load_std_libs(state: *mut ffi::lua_State, libs: StdLib) -> Result<()>
13251323
{
13261324
if libs.contains(StdLib::COROUTINE) {
13271325
requiref(state, ffi::LUA_COLIBNAME, ffi::luaopen_coroutine, 1)?;
1328-
ffi::lua_pop(state, 1);
13291326
}
13301327
}
13311328

13321329
if libs.contains(StdLib::TABLE) {
13331330
requiref(state, ffi::LUA_TABLIBNAME, ffi::luaopen_table, 1)?;
1334-
ffi::lua_pop(state, 1);
13351331
}
13361332

13371333
#[cfg(not(feature = "luau"))]
13381334
if libs.contains(StdLib::IO) {
13391335
requiref(state, ffi::LUA_IOLIBNAME, ffi::luaopen_io, 1)?;
1340-
ffi::lua_pop(state, 1);
13411336
}
13421337

13431338
if libs.contains(StdLib::OS) {
13441339
requiref(state, ffi::LUA_OSLIBNAME, ffi::luaopen_os, 1)?;
1345-
ffi::lua_pop(state, 1);
13461340
}
13471341

13481342
if libs.contains(StdLib::STRING) {
13491343
requiref(state, ffi::LUA_STRLIBNAME, ffi::luaopen_string, 1)?;
1350-
ffi::lua_pop(state, 1);
13511344
}
13521345

13531346
#[cfg(any(feature = "lua54", feature = "lua53", feature = "luau"))]
13541347
{
13551348
if libs.contains(StdLib::UTF8) {
13561349
requiref(state, ffi::LUA_UTF8LIBNAME, ffi::luaopen_utf8, 1)?;
1357-
ffi::lua_pop(state, 1);
13581350
}
13591351
}
13601352

13611353
#[cfg(any(feature = "lua52", feature = "luau"))]
13621354
{
13631355
if libs.contains(StdLib::BIT) {
13641356
requiref(state, ffi::LUA_BITLIBNAME, ffi::luaopen_bit32, 1)?;
1365-
ffi::lua_pop(state, 1);
13661357
}
13671358
}
13681359

13691360
#[cfg(feature = "luajit")]
13701361
{
13711362
if libs.contains(StdLib::BIT) {
13721363
requiref(state, ffi::LUA_BITLIBNAME, ffi::luaopen_bit, 1)?;
1373-
ffi::lua_pop(state, 1);
13741364
}
13751365
}
13761366

13771367
#[cfg(feature = "luau")]
13781368
if libs.contains(StdLib::BUFFER) {
13791369
requiref(state, ffi::LUA_BUFFERLIBNAME, ffi::luaopen_buffer, 1)?;
1380-
ffi::lua_pop(state, 1);
13811370
}
13821371

13831372
#[cfg(feature = "luau")]
13841373
if libs.contains(StdLib::VECTOR) {
13851374
requiref(state, ffi::LUA_VECLIBNAME, ffi::luaopen_vector, 1)?;
1386-
ffi::lua_pop(state, 1);
13871375
}
13881376

13891377
if libs.contains(StdLib::MATH) {
13901378
requiref(state, ffi::LUA_MATHLIBNAME, ffi::luaopen_math, 1)?;
1391-
ffi::lua_pop(state, 1);
13921379
}
13931380

13941381
if libs.contains(StdLib::DEBUG) {
13951382
requiref(state, ffi::LUA_DBLIBNAME, ffi::luaopen_debug, 1)?;
1396-
ffi::lua_pop(state, 1);
13971383
}
13981384

13991385
#[cfg(not(feature = "luau"))]
14001386
if libs.contains(StdLib::PACKAGE) {
14011387
requiref(state, ffi::LUA_LOADLIBNAME, ffi::luaopen_package, 1)?;
1402-
ffi::lua_pop(state, 1);
14031388
}
14041389
#[cfg(feature = "luau")]
14051390
if libs.contains(StdLib::PACKAGE) {
@@ -1410,13 +1395,11 @@ unsafe fn load_std_libs(state: *mut ffi::lua_State, libs: StdLib) -> Result<()>
14101395
#[cfg(feature = "luajit")]
14111396
if libs.contains(StdLib::JIT) {
14121397
requiref(state, ffi::LUA_JITLIBNAME, ffi::luaopen_jit, 1)?;
1413-
ffi::lua_pop(state, 1);
14141398
}
14151399

14161400
#[cfg(feature = "luajit")]
14171401
if libs.contains(StdLib::FFI) {
14181402
requiref(state, ffi::LUA_FFILIBNAME, ffi::luaopen_ffi, 1)?;
1419-
ffi::lua_pop(state, 1);
14201403
}
14211404

14221405
Ok(())

0 commit comments

Comments
 (0)