rust: macros: Fix macro referencing core and kernel crates
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 rust: macros: Fix macro referencing core and kernel crates
To prevent issues where user-defined modules named core or kernel could be picked up instead of the standard ones, update macros to use absolute paths, ::core::... and ::kernel::..., for core and kernel references.
Suggested-by y86-dev <[email protected]>
Signed-off-by Igor Korotin <[email protected]>
--- rust/ffi.rs | 2 +- rust/kernel/device.rs | 2 +- rust/kernel/device_id.rs | 4 ++-- rust/kernel/kunit.rs | 8 ++++---- rust/kernel/static_assert.rs | 4 ++-- rust/kernel/str.rs | 4 ++-- rust/macros/lib.rs | 6 +++--- scripts/rustdoc_test_gen.rs | 8 ++++++-- 8 files changed, 21 insertions(+), 17 deletions(-)
rust/ffi.rs +1 -1
@@ -17,7 +17,7 @@ macro_rules! alias {// Check size compatibility with `core`. const _: () =assert! ( - core::mem::size_of ::<$name>() == core::mem::size_of ::<core::ffi::$name>() + ::core::mem::size_of ::<$name>() == ::core::mem::size_of ::<::core::ffi::$name>() ); )*} }
rust/kernel/device.rs +1 -1
@@ -214,7 +214,7 @@ unsafe impl Sync for Device {}macro_rules! dev_printk { ($method:ident, $dev:expr, $($f:tt)*) => { { - ($dev).$method(core::format_args!($($f)*)); + ($dev).$method(::core::format_args!($($f)*)); } } }
rust/kernel/device_id.rs +2 -2
@@ -159,7 +159,7 @@ macro_rules! module_device_table { "_", line!(),"_" ,stringify! ($table_name)) ] - static $module_table_name: [core::mem::MaybeUninit<u8>; $table_name.raw_ids().size()] = -unsafe { core::mem::transmute_copy ($table_name.raw_ids ()) }; + static $module_table_name: [::core::mem::MaybeUninit<u8>; $table_name.raw_ids().size()] = +unsafe { ::core::mem::transmute_copy ($table_name.raw_ids ()) }; }; }
rust/kernel/kunit.rs +4 -4
@@ -59,7 +59,7 @@ macro_rules! kunit_assert { }static FILE : &'static $crate::str::CStr = $crate::c_str!($file); -static LINE :i32 = core::line!()as i32 - $diff; +static LINE :i32 = ::core::line!()as i32 - $diff;static CONDITION : &'static $crate::str::CStr = $crate::c_str!(stringify! ($condition));// SAFETY: FFI call without safety requirements.
@@ -130,11 +130,11 @@ unsafe impl Sync for UnaryAssert {}unsafe { $crate::bindings::__kunit_do_failed_assertion ( kunit_test, - core::ptr::addr_of!(LOCATION .0 ), + ::core::ptr::addr_of!(LOCATION .0 ), $crate::bindings::kunit_assert_type_KUNIT_ASSERTION, - core::ptr::addr_of!(ASSERTION .0 .assert), + ::core::ptr::addr_of!(ASSERTION .0 .assert),Some ($crate::bindings::kunit_unary_assert_format), - core::ptr::null (), + ::core::ptr::null (), ); }
rust/kernel/static_assert.rs +2 -2
@@ -16,7 +16,7 @@/// /// ``` /// static_assert!(42 > 24); -/// static_assert!(core::mem::size_of::<u8>() == 1); +/// static_assert!(::core::mem::size_of::<u8>() == 1); /// /// const X: &[u8] = b"bar"; /// static_assert!(X[1] == b'a');
@@ -29,6 +29,6 @@#[macro_export] macro_rules! static_assert { ($condition:expr) => { -const _: () = core::assert!($condition); +const _: () = ::core::assert!($condition); }; }
rust/kernel/str.rs +2 -2
@@ -595,7 +595,7 @@ fn deref(&self) -> &str {macro_rules! format { ($($f:tt)*) => ({ - &*String ::from_fmt (kernel::fmt!($($f)*)) + &*String ::from_fmt (::kernel::fmt!($($f)*)) }) }
@@ -944,5 +944,5 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {/// A convenience alias for [`core::format_args`]. #[macro_export] macro_rules! fmt { - ($($f:tt)*) => ( core::format_args!($($f)*) ) + ($($f:tt)*) => ( ::core::format_args!($($f)*) ) }
rust/macros/lib.rs +3 -3
@@ -283,7 +283,7 @@ pub fn concat_idents(ts: TokenStream) -> TokenStream {/// # const binder_driver_return_protocol_BR_FAILED_REPLY: u32 = 14; /// macro_rules! pub_no_prefix { /// ($prefix:ident, $($newname:ident),+) => { -/// kernel::macros::paste! { +/// ::kernel::macros::paste! { /// $(pub(crate) const $newname: u32 = [<$prefix $newname>];)+ /// } /// };
@@ -340,7 +340,7 @@ pub fn concat_idents(ts: TokenStream) -> TokenStream {/// # const binder_driver_return_protocol_BR_FAILED_REPLY: u32 = 14; /// macro_rules! pub_no_prefix { /// ($prefix:ident, $($newname:ident),+) => { -/// kernel::macros::paste! { +/// ::kernel::macros::paste! { /// $(pub(crate) const fn [<$newname:lower:span>]() -> u32 { [<$prefix $newname:span>] })+ /// } /// };
@@ -375,7 +375,7 @@ pub fn concat_idents(ts: TokenStream) -> TokenStream {/// ``` /// macro_rules! create_numbered_fn { /// ($name:literal, $val:literal) => { -/// kernel::macros::paste! { +/// ::kernel::macros::paste! { /// fn [<some_ $name _fn $val>]() -> u32 { $val } /// } /// };
scripts/rustdoc_test_gen.rs +6 -2
@@ -172,7 +172,9 @@ pub extern "C" fn {kunit_name}(__kunit_test: *mut kernel::bindings::kunit) {{#[allow(unused)] macro_rules! assert {{ ($cond:expr $(,)?) => {{{{ - kernel::kunit_assert!("{kunit_name}", "{real_path}", __DOCTEST_ANCHOR - {line}, $cond); + ::kernel::kunit_assert!( + "{kunit_name}", "{real_path}", __DOCTEST_ANCHOR - {line}, $cond + ); }}}} }}
@@ -180,7 +182,9 @@ macro_rules! assert {{#[allow(unused)] macro_rules! assert_eq {{ ($left:expr, $right:expr $(,)?) => {{{{ - kernel::kunit_assert_eq!("{kunit_name}", "{real_path}", __DOCTEST_ANCHOR - {line}, $left, $right); + ::kernel::kunit_assert_eq!( + "{kunit_name}", "{real_path}", __DOCTEST_ANCHOR - {line}, $left, $right + ); }}}} }}
Signature · 1 line
2.43.0