github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

rust: pin-init: internal: pin_data: rename '__pin lifetime to '__this

Browse Source 
"pin" is a very overloaded word in pin-init. For the generated projection
structs, the lifetime refer to that of the whole struct, so rename the
lifetime used in expansion from `'__pin` to `'__this` instead.

The `__pin_phantom_data` field is renamed to `__this` for the same reason
and for clarity purpose, capture a `PhantomData` of the mutable reference
to the struct.

Acked-by: Benno Lossin <lossin@kernel.org>
Link: https://patch.msgid.link/20261006-dev-selfref-dep-v1-7-da716f740d6d@garyguo.net
Signed-off-by: Gary Guo <gary@garyguo.net>
This commit is contained in:
Gary Guo 2026-10-06 17:29:37 +02:00
parent 93bfdb5306
commit ec87b59383
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rust/pin-init/internal/src/pin_data.rs
View File

@ -325,11 +325,11 @@ fn generate_projections(
is_tuple_struct: bool,
fields: &[FieldInfo<'_>],
) -> TokenStream {
let pin_lt_generics: Generics = parse_quote!(<'__pin>);
let generics_with_pin_lt = CombinedGenerics(vec![&pin_lt_generics, generics]);
let this_lt_generics: Generics = parse_quote!(<'__this>);
let generics_with_this_lt = CombinedGenerics(vec![&this_lt_generics, generics]);
let (impl_generics, ty_generics, whr) = generics.split_for_impl();
let (_, ty_generics_with_pin_lt, _) = generics_with_pin_lt.split_for_impl();
let (_, ty_generics_with_this_lt, _) = generics_with_this_lt.split_for_impl();
let this = format_ident!("this");
@ -348,7 +348,7 @@ fn generate_projections(
if field.pinned {
(
quote!(
#vis #name ::core::pin::Pin<&'__pin mut #ty>,
#vis #name ::core::pin::Pin<&'__this mut #ty>,
),
quote!(
// SAFETY: this field is structurally pinned.
@ -358,7 +358,7 @@ fn generate_projections(
} else {
(
quote!(
#vis #name &'__pin mut #ty,
#vis #name &'__this mut #ty,
),
quote!(
#name &mut #this.#member,
@ -379,9 +379,9 @@ fn generate_projections(
let (projection_def, projection_init) = if is_tuple_struct {
(
quote! {
#vis struct __Projection #generics_with_pin_lt (
#vis struct __Projection #generics_with_this_lt (
#(#fields_decl)*
::core::marker::PhantomData<&'__pin mut ()>,
::core::marker::PhantomData<&'__this mut #ident #ty_generics>,
) #whr;
},
quote! {
@ -394,17 +394,17 @@ fn generate_projections(
} else {
(
quote! {
#vis struct __Projection #generics_with_pin_lt
#vis struct __Projection #generics_with_this_lt
#whr
{
#(#fields_decl)*
___pin_phantom_data: ::core::marker::PhantomData<&'__pin mut ()>,
__this: ::core::marker::PhantomData<&'__this mut #ident #ty_generics>,
}
},
quote! {
__Projection {
#(#fields_proj)*
___pin_phantom_data: ::core::marker::PhantomData,
__this: ::core::marker::PhantomData,
}
},
)
@ -428,9 +428,9 @@ impl #impl_generics #ident #ty_generics
/// These fields are **not** structurally pinned:
#(#[doc = #not_structurally_pinned_fields_docs])*
#[inline]
#vis fn project<'__pin>(
self: ::core::pin::Pin<&'__pin mut Self>,
) -> __Projection #ty_generics_with_pin_lt {
#vis fn project<'__this>(
self: ::core::pin::Pin<&'__this mut Self>,
) -> __Projection #ty_generics_with_this_lt {
// SAFETY: we only give access to `&mut` for fields not structurally pinned.
let #this = unsafe { ::core::pin::Pin::get_unchecked_mut(self) };
#projection_init