Skip to content

Commit 3c40cfe

Browse files
committed
mlua-sys: Use 2024 edition
1 parent e9efb73 commit 3c40cfe

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

mlua-sys/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
name = "mlua-sys"
33
version = "0.9.0"
44
authors = ["Aleksandr Orlenko <zxteam@pm.me>"]
5-
rust-version = "1.71"
6-
edition = "2021"
5+
rust-version = "1.85"
6+
edition = "2024"
77
repository = "https://github.com/mlua-rs/mlua"
88
documentation = "https://docs.rs/mlua-sys"
99
readme = "README.md"

mlua-sys/src/lua51/compat.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,7 @@ unsafe fn compat53_checkmode(
5555
while *st != 0 && *st != c {
5656
st = st.offset(1);
5757
}
58-
if *st == c {
59-
st
60-
} else {
61-
ptr::null()
62-
}
58+
if *st == c { st } else { ptr::null() }
6359
}
6460

6561
if !mode.is_null() && strchr(mode, *modename).is_null() {

mlua-sys/src/lua52/lauxlib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ unsafe extern "C-unwind" {
3232
pub fn luaL_argerror(L: *mut lua_State, arg: c_int, extramsg: *const c_char) -> c_int;
3333
pub fn luaL_checklstring(L: *mut lua_State, arg: c_int, l: *mut usize) -> *const c_char;
3434
pub fn luaL_optlstring(L: *mut lua_State, arg: c_int, def: *const c_char, l: *mut usize)
35-
-> *const c_char;
35+
-> *const c_char;
3636
pub fn luaL_checknumber(L: *mut lua_State, arg: c_int) -> lua_Number;
3737
pub fn luaL_optnumber(L: *mut lua_State, arg: c_int, def: lua_Number) -> lua_Number;
3838
pub fn luaL_checkinteger(L: *mut lua_State, arg: c_int) -> lua_Integer;

mlua-sys/src/lua53/lauxlib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ unsafe extern "C-unwind" {
3131
pub fn luaL_argerror(L: *mut lua_State, arg: c_int, extramsg: *const c_char) -> c_int;
3232
pub fn luaL_checklstring(L: *mut lua_State, arg: c_int, l: *mut usize) -> *const c_char;
3333
pub fn luaL_optlstring(L: *mut lua_State, arg: c_int, def: *const c_char, l: *mut usize)
34-
-> *const c_char;
34+
-> *const c_char;
3535
pub fn luaL_checknumber(L: *mut lua_State, arg: c_int) -> lua_Number;
3636
pub fn luaL_optnumber(L: *mut lua_State, arg: c_int, def: lua_Number) -> lua_Number;
3737
pub fn luaL_checkinteger(L: *mut lua_State, arg: c_int) -> lua_Integer;

mlua-sys/src/lua54/lauxlib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ unsafe extern "C-unwind" {
3030
pub fn luaL_argerror(L: *mut lua_State, arg: c_int, extramsg: *const c_char) -> c_int;
3131
pub fn luaL_checklstring(L: *mut lua_State, arg: c_int, l: *mut usize) -> *const c_char;
3232
pub fn luaL_optlstring(L: *mut lua_State, arg: c_int, def: *const c_char, l: *mut usize)
33-
-> *const c_char;
33+
-> *const c_char;
3434
pub fn luaL_checknumber(L: *mut lua_State, arg: c_int) -> lua_Number;
3535
pub fn luaL_optnumber(L: *mut lua_State, arg: c_int, def: lua_Number) -> lua_Number;
3636
pub fn luaL_checkinteger(L: *mut lua_State, arg: c_int) -> lua_Integer;

mlua-sys/src/lua55/lauxlib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ unsafe extern "C-unwind" {
3030
pub fn luaL_argerror(L: *mut lua_State, arg: c_int, extramsg: *const c_char) -> c_int;
3131
pub fn luaL_checklstring(L: *mut lua_State, arg: c_int, l: *mut usize) -> *const c_char;
3232
pub fn luaL_optlstring(L: *mut lua_State, arg: c_int, def: *const c_char, l: *mut usize)
33-
-> *const c_char;
33+
-> *const c_char;
3434
pub fn luaL_checknumber(L: *mut lua_State, arg: c_int) -> lua_Number;
3535
pub fn luaL_optnumber(L: *mut lua_State, arg: c_int, def: lua_Number) -> lua_Number;
3636
pub fn luaL_checkinteger(L: *mut lua_State, arg: c_int) -> lua_Integer;

mlua-sys/src/luau/lauxlib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use std::os::raw::{c_char, c_float, c_int, c_void};
44
use std::ptr;
55

6-
use super::lua::{self, lua_CFunction, lua_Number, lua_State, lua_Unsigned, LUA_REGISTRYINDEX};
6+
use super::lua::{self, LUA_REGISTRYINDEX, lua_CFunction, lua_Number, lua_State, lua_Unsigned};
77

88
// Key, in the registry, for table of loaded modules
99
pub const LUA_LOADED_TABLE: *const c_char = cstr!("_LOADED");

mlua-sys/src/luau/lua.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,12 @@ unsafe extern "C-unwind" {
155155
pub fn lua_toboolean(L: *mut lua_State, idx: c_int) -> c_int;
156156
pub fn lua_tolstring(L: *mut lua_State, idx: c_int, len: *mut usize) -> *const c_char;
157157
pub fn lua_tostringatom(L: *mut lua_State, idx: c_int, atom: *mut c_int) -> *const c_char;
158-
pub fn lua_tolstringatom(L: *mut lua_State, idx: c_int, len: *mut usize, atom: *mut c_int) -> *const c_char;
158+
pub fn lua_tolstringatom(
159+
L: *mut lua_State,
160+
idx: c_int,
161+
len: *mut usize,
162+
atom: *mut c_int,
163+
) -> *const c_char;
159164
pub fn lua_namecallatom(L: *mut lua_State, atom: *mut c_int) -> *const c_char;
160165
#[link_name = "lua_objlen"]
161166
pub fn lua_objlen_(L: *mut lua_State, idx: c_int) -> c_int;

0 commit comments

Comments
 (0)