Re: [PATCH 3/5] rust: list: use consistent type parameter names
From: Boqun Feng
Date: Mon Mar 24 2025 - 17:42:25 EST
On Mon, Mar 24, 2025 at 05:33:45PM -0400, Tamir Duberstein wrote:
> Refer to the type parameters of `impl_has_list_links{,_self_ptr}!` by
> the same name used in `impl_list_item!`.
>
> Signed-off-by: Tamir Duberstein <tamird@xxxxxxxxx>
> ---
> rust/kernel/list/impl_list_item_mod.rs | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/rust/kernel/list/impl_list_item_mod.rs b/rust/kernel/list/impl_list_item_mod.rs
> index 5ed66fdce953..9d2102138c48 100644
> --- a/rust/kernel/list/impl_list_item_mod.rs
> +++ b/rust/kernel/list/impl_list_item_mod.rs
> @@ -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:ident),*>)?
> 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)*})?
While you're at it, can you also change this to be
($(impl$(<$($generics:tt)*>)?
?
I don't know why we chose <> for impl_has_list_links, but {} for
impl_has_list_links_self_ptr ;-)
Regards,
Boqun
> 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]
>
> --
> 2.48.1
>