mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-16 14:30:06 -04:00
rust: list: use consistent type parameter style
Refer to the type parameters of `impl_has_list_links{,_self_ptr}!` by
the same name used in `impl_list_item!`. Capture type parameters of
`impl_list_item!` as `tt` using `{}` to match the style of all other
macros that work with generics.
Reviewed-by: Christian Schrefl <chrisi.schrefl@gmail.com>
Tested-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
Link: https://lore.kernel.org/r/20250709-list-no-offset-v4-2-a429e75840a9@gmail.com
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
committed by
Miguel Ojeda
parent
e71d7e39be
commit
9cec86e4ae
@@ -41,7 +41,7 @@ unsafe fn raw_get_list_links(ptr: *mut Self) -> *mut ListLinks<ID> {
|
||||
/// Implements the [`HasListLinks`] trait for the given type.
|
||||
#[macro_export]
|
||||
macro_rules! impl_has_list_links {
|
||||
($(impl$(<$($implarg:ident),*>)?
|
||||
($(impl$({$($generics:tt)*})?
|
||||
HasListLinks$(<$id:tt>)?
|
||||
for $self:ty
|
||||
{ self$(.$field:ident)* }
|
||||
@@ -51,7 +51,7 @@ macro_rules! impl_has_list_links {
|
||||
//
|
||||
// The behavior of `raw_get_list_links` is not changed since the `addr_of_mut!` macro is
|
||||
// equivalent to the pointer offset operation in the trait definition.
|
||||
unsafe impl$(<$($implarg),*>)? $crate::list::HasListLinks$(<$id>)? for $self {
|
||||
unsafe impl$(<$($generics)*>)? $crate::list::HasListLinks$(<$id>)? for $self {
|
||||
const OFFSET: usize = ::core::mem::offset_of!(Self, $($field).*) as usize;
|
||||
|
||||
#[inline]
|
||||
@@ -81,16 +81,16 @@ pub unsafe trait HasSelfPtr<T: ?Sized, const ID: u64 = 0>
|
||||
/// Implements the [`HasListLinks`] and [`HasSelfPtr`] traits for the given type.
|
||||
#[macro_export]
|
||||
macro_rules! impl_has_list_links_self_ptr {
|
||||
($(impl$({$($implarg:tt)*})?
|
||||
($(impl$({$($generics:tt)*})?
|
||||
HasSelfPtr<$item_type:ty $(, $id:tt)?>
|
||||
for $self:ty
|
||||
{ self.$field:ident }
|
||||
)*) => {$(
|
||||
// SAFETY: The implementation of `raw_get_list_links` only compiles if the field has the
|
||||
// right type.
|
||||
unsafe impl$(<$($implarg)*>)? $crate::list::HasSelfPtr<$item_type $(, $id)?> for $self {}
|
||||
unsafe impl$(<$($generics)*>)? $crate::list::HasSelfPtr<$item_type $(, $id)?> for $self {}
|
||||
|
||||
unsafe impl$(<$($implarg)*>)? $crate::list::HasListLinks$(<$id>)? for $self {
|
||||
unsafe impl$(<$($generics)*>)? $crate::list::HasListLinks$(<$id>)? for $self {
|
||||
const OFFSET: usize = ::core::mem::offset_of!(Self, $field) as usize;
|
||||
|
||||
#[inline]
|
||||
|
||||
Reference in New Issue
Block a user