rustfmt, add more lua macros

* Added all of the lua_is* macros
* Added luaL_dostring
* Added luaL_dofile
* Added luaL_getmetatable
* Added luaL_argcheck
* Bump to edition 2021

Author: vurvdev

Cargo.toml

@@ -1,18 +1,18 @@
 [package]
 name = "rglua"
 description = "Rust bindings to the lua api for gmod binary module creation"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Vurv <vurvdevelops@gmail.com>"]
 keywords = ["glua", "garrysmod", "lua", "gmod"]
 readme = "README.md"
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 # Remember to make your output module a cdylib.
 
 [dependencies]
-libloading = "0.7.0"
-once_cell = "1.7.2"
+libloading = "0.7.2"
+once_cell = "1.8.0"
 
 vtables = { version = "0.1.0", optional = true }
 vtables_derive = { version = "0.1.0", optional = true }

rustfmt.toml

@@ -0,0 +1 @@
+hard_tabs = true

src/globals.rs

@@ -12,7 +12,6 @@ pub mod Lua {
 	pub static NUMTYPES: c_int = 9;
 	pub static NUMTAGS: c_int = NUMTYPES;
 
-
 	// Proper enums to use. Cast these to integers when using them
 	pub enum Type {
 		None = -1,
@@ -24,7 +23,7 @@ pub mod Lua {
 		Table,
 		Function,
 		UserData,
-		Thread
+		Thread,
 	}
 
 	pub enum Status {
@@ -33,7 +32,7 @@ pub mod Lua {
 		ErrRun,
 		ErrSyntax,
 		ErrMem,
-		ErrErr
+		ErrErr,
 	}
 
 	// Garbage collection
@@ -48,7 +47,7 @@ pub mod Lua {
 		SetStepMul,
 		IsRunning,
 		Gen,
-		Inc // 11
+		Inc, // 11
 	}
 
 	// To be used with debug.sethook
@@ -57,14 +56,14 @@ pub mod Lua {
 		Ret,
 		Line,
 		Count,
-		TailCall
+		TailCall,
 	}
 
 	pub enum Mask {
 		Call = (1 << Hook::Call as i32),
 		Ret = (1 << Hook::Ret as i32),
 		Line = (1 << Hook::Line as i32),
-		Count = (1 << Hook::Count as i32)
+		Count = (1 << Hook::Count as i32),
 	}
 }
 
@@ -78,7 +77,7 @@ pub mod Jit {
 		TRACE,
 		WRAPCFUNC = 0x10,
 		MAX,
-		MASK = 0x0ff // LUAJIT_MODE_MASK
+		MASK = 0x0ff, // LUAJIT_MODE_MASK
 	}
 
 	use super::c_int;
@@ -88,4 +87,4 @@ pub mod Jit {
 		pub const ON: c_int = 0x0100;
 		pub const FLUSH: c_int = 0x0200;
 	}
-}
+}

src/helper/mod.rs

@@ -1,43 +1,38 @@
 #![allow(unused)]
 
-#[deprecated(
-	since = "0.2.0",
-	note = "Use cstr instead."
-)]
+#[deprecated(since = "0.2.0", note = "Use cstr instead.")]
 #[macro_export]
 macro_rules! cstring {
-	($rstring:expr) => {
-		{
-			let v = std::ffi::CString::new($rstring);
-			v.expect("Couldn't make CString from rust string").as_ptr()
-		}
-	}
+	($rstring:expr) => {{
+		let v = std::ffi::CString::new($rstring);
+		v.expect("Couldn't make CString from rust string").as_ptr()
+	}};
 }
 
 // Creates *const i8 from a rust string literal by concatting a \0 to the end of it.
 #[macro_export]
 macro_rules! cstr {
 	($rstring:expr) => {
 		concat!($rstring, "\0").as_ptr() as *const i8
-	}
+	};
 }
 
 // Get a rust &str from a const char*
 #[macro_export]
 macro_rules! rstr {
-	($cstring:expr) => {
-		{
-			#[allow(unused_unsafe)]
-			let cstr = unsafe{ std::ffi::CStr::from_ptr($cstring) };
-			cstr.to_str().expect("Couldn't unwrap CString")
-		}
-	}
+	($cstring:expr) => {{
+		#[allow(unused_unsafe)]
+		let cstr = unsafe { std::ffi::CStr::from_ptr($cstring) };
+		cstr.to_str().expect("Couldn't unwrap CString")
+	}};
 }
 
 #[macro_export]
 #[deprecated(since = "0.5.0", note = "Use rstr instead.")]
 macro_rules! rstring {
-	($a:tt) => { rstr!($a) }
+	($a:tt) => {
+		rstr!($a)
+	};
 }
 
 #[allow(unused_macros)]
@@ -51,10 +46,10 @@ macro_rules! printgm {
 		{
 			let printargs = format!( $($x,)* );
 			if let Ok(fmt) = std::ffi::CString::new(printargs) {
-				rglua::lua_shared::lua_getglobal( $state, cstr!("print") );
+				rglua::lua_shared::lua_getglobal( $state, rglua::helper::cstr!("print") );
 				rglua::lua_shared::lua_pushstring( $state, fmt.as_ptr() );
 				rglua::lua_shared::lua_call( $state, 1, 0 );
 			}
 		}
 	};
-}
+}

src/interface.rs

@@ -1,38 +1,37 @@
-
-use std::ffi::{ c_void, CString };
 pub use crate::interfaces::*;
+use std::ffi::{c_void, CString};
 
-pub type CreateInterfaceFn = extern "system" fn(
-	pName: *const i8,
-	pReturnCode: *mut i32
-) -> *mut c_void;
+pub type CreateInterfaceFn =
+	extern "system" fn(pName: *const i8, pReturnCode: *mut i32) -> *mut c_void;
 
 ///  # Safety
 /// This function is unsafe to transmute the internal libloading symbol to a proper createinterface function pointer.
 pub unsafe fn get_interface_handle(file: &str) -> Result<CreateInterfaceFn, libloading::Error> {
 	let lib = libloading::Library::new(file)?;
 	let sym: libloading::Symbol<CreateInterfaceFn> = lib.get(b"CreateInterface\0")?;
 
-	Ok( std::mem::transmute(sym) )
+	Ok(std::mem::transmute(sym))
 }
 
 #[derive(Debug)]
 pub enum InterfaceError {
-	BadCString( std::ffi::NulError ),
+	BadCString(std::ffi::NulError),
 	FactoryNotFound,
 }
 
-pub fn get_from_interface(iface: &str, factory: CreateInterfaceFn) -> Result<*mut (), InterfaceError> {
+pub fn get_from_interface(
+	iface: &str,
+	factory: CreateInterfaceFn,
+) -> Result<*mut (), InterfaceError> {
 	let mut status = 0;
 
-	let iface = CString::new(iface)
-		.map_err(InterfaceError::BadCString)?;
+	let iface = CString::new(iface).map_err(InterfaceError::BadCString)?;
 
-	let result = factory( iface.as_ptr(), &mut status );
+	let result = factory(iface.as_ptr(), &mut status);
 
 	if status == 0 && !result.is_null() {
 		Ok(result as *mut ())
 	} else {
-		Err( InterfaceError::FactoryNotFound )
+		Err(InterfaceError::FactoryNotFound)
 	}
-}
+}

src/interfaces/engine.rs

@@ -8,7 +8,7 @@ use std::os::raw::c_char;
 #[has_vtable]
 #[derive(VTable, Debug)]
 pub struct EngineClient {
-	pub vtable: usize
+	pub vtable: usize,
 }
 
 impl EngineClient {
@@ -38,4 +38,4 @@ impl EngineClient {
 
 	#[virtual_index(113)]
 	pub fn ClientCmd_Unrestricted(&self, command: *const c_char) {}
-}
+}

src/interfaces/lua.rs

@@ -10,4 +10,4 @@ pub struct CLuaShared {}
 impl CLuaShared {
 	#[virtual_index(6)]
 	pub fn GetLuaInterface(&self, realm: u8) -> *mut ILuaInterface {}
-}
+}

src/interfaces/mod.rs

@@ -1,4 +1,3 @@
-
 pub mod structs {
 	use vtables::VTable;
 	use vtables_derive::*;
@@ -20,13 +19,13 @@ pub mod structs {
 		ishltv: bool,
 		customFiles: [u64; 4],
 		filesDownloaded: u8,
-		pad: [i8; 304]
+		pad: [i8; 304],
 	}
 
 	#[has_vtable]
 	#[derive(VTable)]
 	pub struct ILuaInterface {
-		pub vtable: usize
+		pub vtable: usize,
 	}
 
 	impl ILuaInterface {
@@ -48,4 +47,4 @@ mod lua;
 pub use lua::CLuaShared;
 
 mod panel;
-pub use panel::IPanel;
+pub use panel::IPanel;

src/interfaces/panel.rs

@@ -4,7 +4,7 @@ use vtables_derive::*;
 #[has_vtable]
 #[derive(VTable)]
 pub struct IPanel {
-	pub vtable: usize
+	pub vtable: usize,
 }
 
 impl IPanel {
@@ -13,4 +13,4 @@ impl IPanel {
 
 	#[virtual_index(41)]
 	pub fn PaintTraverse(&self, vguiPanel: u32, forceRepaint: bool, allowForce: bool) {}
-}
+}

src/lib.rs

@@ -2,15 +2,15 @@
 #![allow(non_snake_case)]
 #![allow(non_upper_case_globals)]
 
-pub mod types;
 pub mod globals;
 mod helper;
 #[cfg(feature = "interfaces")]
-mod interfaces;
-#[cfg(feature = "interfaces")]
 pub mod interface;
+#[cfg(feature = "interfaces")]
+mod interfaces;
+pub mod types;
 
 #[macro_use]
 pub mod lua_shared;
 
-pub mod prelude;
+pub mod prelude;