Commit e71d7e39 authored by Tamir Duberstein's avatar Tamir Duberstein Committed by Miguel Ojeda
Browse files

rust: list: simplify macro capture 



Avoid manually capturing generics; use `ty` to capture the whole type
instead.

Reviewed-by: default avatarChristian Schrefl <chrisi.schrefl@gmail.com>
Tested-by: default avatarAlice Ryhl <aliceryhl@google.com>
Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Signed-off-by: default avatarTamir Duberstein <tamird@gmail.com>
Link: https://lore.kernel.org/r/20250709-list-no-offset-v4-1-a429e75840a9@gmail.com


Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent b0c7d8c9

rust/kernel/list/impl_list_item_mod.rs

+5 −11
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ unsafe fn raw_get_list_links(ptr: *mut Self) -> *mut ListLinks<ID> { 
macro_rules! impl_has_list_links {

    ($(impl$(<$($implarg:ident),*>)?

       HasListLinks$(<$id:tt>)?

       for $self:ident $(<$($selfarg:ty),*>)?

       for $self:ty

       { self$(.$field:ident)* }

    )*) => {$(

        // SAFETY: The implementation of `raw_get_list_links` only compiles if the field has the
@@ -51,9 +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 $(<$($selfarg),*>)?

        {

        unsafe impl$(<$($implarg),*>)? $crate::list::HasListLinks$(<$id>)? for $self {

            const OFFSET: usize = ::core::mem::offset_of!(Self, $($field).*) as usize;



            #[inline]
@@ -85,18 +83,14 @@ pub unsafe trait HasSelfPtr<T: ?Sized, const ID: u64 = 0> 
macro_rules! impl_has_list_links_self_ptr {

    ($(impl$({$($implarg:tt)*})?

       HasSelfPtr<$item_type:ty $(, $id:tt)?>

       for $self:ident $(<$($selfarg:ty),*>)?

       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 $(<$($selfarg),*>)?

        {}

        unsafe impl$(<$($implarg)*>)? $crate::list::HasSelfPtr<$item_type $(, $id)?> for $self {}



        unsafe impl$(<$($implarg)*>)? $crate::list::HasListLinks$(<$id>)? for

            $self $(<$($selfarg),*>)?

        {

        unsafe impl$(<$($implarg)*>)? $crate::list::HasListLinks$(<$id>)? for $self {

            const OFFSET: usize = ::core::mem::offset_of!(Self, $field) as usize;



            #[inline]