modeco80
/
gmod-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more macro hygiene

This commit is contained in:
William Venner 2021-10-06 18:22:55 +01:00
parent 9d9d3953ff
commit 2b94d70a38
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gmod/src/hax.rs
View File

@ -2,7 +2,7 @@
/// Common pattern for detouring. /// Common pattern for detouring.
macro_rules! find_gmod_signature { macro_rules! find_gmod_signature {
(($library:ident, $library_path:ident), @EXPORT = $export:literal) => { (($library:ident, $library_path:ident), @EXPORT = $export:literal) => {
$library.get(concat!($export, '\0').as_bytes()).ok().map(|func: ::gmod::libloading::Symbol<'_, _>| *func) $library.get(concat!($export, '\0').as_bytes()).ok().map(|func: $crate::libloading::Symbol<'_, _>| *func)
}; };
(($library:ident, $library_path:ident), @SIG = $sig:literal) => { (($library:ident, $library_path:ident), @SIG = $sig:literal) => {

2
gmod/src/lua/mod.rs
View File

@ -41,6 +41,6 @@ pub enum LuaError {
#[macro_export] #[macro_export]
macro_rules! lua_string { macro_rules! lua_string {
( $str:literal ) => { ( $str:literal ) => {
::gmod::cstr::cstr!($str).as_ptr() $crate::cstr::cstr!($str).as_ptr()
}; };
} }

16
gmod/src/msgc.rs
View File

@ -61,21 +61,21 @@ lazy_static::lazy_static! {
} }
#[macro_export] #[macro_export]
macro_rules! colormsg { macro_rules! colormsg {
($($($arg:expr)+),+) => { ($($arg:tt),+) => {
$(::gmod::msgc::colormsg!(@print $($arg)+));+ $($crate::colormsg!(@print $arg));+
}; };
(@print [$r:literal, $g:literal, $b:literal] $fmt:literal % ($($arg:tt),+)) => { (@print [$r:literal, $g:literal, $b:literal] $fmt:literal % ($($arg:tt),+)) => {
::gmod::msgc::ConColorMsg( $crate::msgc::ConColorMsg(
&::gmod::msgc::Color::new($r, $g, $b), &$crate::msgc::Color::new($r, $g, $b),
::gmod::msgc::printf_escape(format!(concat!($fmt, '\0'), $($arg),+)).as_ptr() as *const _, $crate::msgc::printf_escape(format!(concat!($fmt, '\0'), $($arg),+)).as_ptr() as *const _,
) )
}; };
(@print [$r:literal, $g:literal, $b:literal] $str:literal) => { (@print [$r:literal, $g:literal, $b:literal] $str:literal) => {
::gmod::msgc::ConColorMsg( $crate::msgc::ConColorMsg(
&::gmod::msgc::Color::new($r, $g, $b), &$crate::msgc::Color::new($r, $g, $b),
::gmod::msgc::printf_escape(concat!($str, '\0')).as_ptr() as *const _, $crate::msgc::printf_escape(concat!($str, '\0')).as_ptr() as *const _,
) )
}; };
} }