mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Gary Guo" <gary@garyguo.net>
To: "Benno Lossin" <lossin@kernel.org>, "Gary Guo" <gary@garyguo.net>,
	"Miguel Ojeda" <ojeda@kernel.org>,
	"Boqun Feng" <boqun.feng@gmail.com>,
	"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
	"Andreas Hindborg" <a.hindborg@kernel.org>,
	"Alice Ryhl" <aliceryhl@google.com>,
	"Trevor Gross" <tmgross@umich.edu>,
	"Danilo Krummrich" <dakr@kernel.org>
Cc: <rust-for-linux@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3 12/15] rust: pin-init: internal: init: add support for attributes on initializer fields
Date: Wed, 14 Jan 2026 18:57:47 +0000	[thread overview]
Message-ID: <DFOJJ5PX0G82.UA7L6LIYZ8IA@garyguo.net> (raw)
In-Reply-To: <20260114181934.1782470-13-lossin@kernel.org>

On Wed Jan 14, 2026 at 6:18 PM GMT, Benno Lossin wrote:
> Initializer fields ought to support the same attributes that are allowed
> in struct initializers on fields. For example, `cfg` or lint levels such
> as `expect`, `allow` etc. Add parsing support for these attributes using
> syn to initializer fields and adjust the macro expansion accordingly.
>
> Tested-by: Andreas Hindborg <a.hindborg@kernel.org>
> Signed-off-by: Benno Lossin <lossin@kernel.org>
> ---
> Changes in v3: none
> Changes in v2:
> * only attach cfg attributes to non-user controlled code for fields
> ---
>  rust/pin-init/internal/src/init.rs | 69 ++++++++++++++++++++++++------
>  1 file changed, 55 insertions(+), 14 deletions(-)
>
> diff --git a/rust/pin-init/internal/src/init.rs b/rust/pin-init/internal/src/init.rs
> index 5a66016bdf33..0eb21ed9c8bc 100644
> --- a/rust/pin-init/internal/src/init.rs
> +++ b/rust/pin-init/internal/src/init.rs
> @@ -29,7 +29,12 @@ struct This {
>      _in_token: Token![in],
>  }
>  
> -enum InitializerField {
> +struct InitializerField {
> +    attrs: Vec<Attribute>,
> +    kind: InitializerKind,
> +}
> +
> +enum InitializerKind {
>      Value {
>          ident: Ident,
>          value: Option<(Token![:], Expr)>,
> @@ -46,7 +51,7 @@ enum InitializerField {
>      },
>  }
>  
> -impl InitializerField {
> +impl InitializerKind {
>      fn ident(&self) -> Option<&Ident> {
>          match self {
>              Self::Value { ident, .. } | Self::Init { ident, .. } => Some(ident),
> @@ -227,10 +232,16 @@ fn init_fields(
>      slot: &Ident,
>  ) -> TokenStream {
>      let mut guards = vec![];
> +    let mut guard_attrs = vec![];
>      let mut res = TokenStream::new();
> -    for field in fields {
> -        let init = match field {
> -            InitializerField::Value { ident, value } => {
> +    for InitializerField { attrs, kind } in fields {
> +        let cfgs = {
> +            let mut cfgs = attrs.clone();
> +            cfgs.retain(|attr| attr.path().is_ident("cfg") || attr.path().is_ident("cfg_attr"));

cfg_attr should not be kept, as they are non-cfg attributes after expanded.

Best,
Gary

> +            cfgs
> +        };
> +        let init = match kind {
> +            InitializerKind::Value { ident, value } => {
>                  let mut value_ident = ident.clone();
>                  let value_prep = value.as_ref().map(|value| &value.1).map(|value| {
>                      // Setting the span of `value_ident` to `value`'s span improves error messages
> @@ -253,21 +264,24 @@ fn init_fields(
>                      }
>                  };
>                  quote! {
> +                    #(#attrs)*
>                      {
>                          #value_prep
>                          // SAFETY: TODO
>                          unsafe { #write(::core::ptr::addr_of_mut!((*#slot).#ident), #value_ident) };
>                      }
> +                    #(#cfgs)*
>                      #[allow(unused_variables)]
>                      let #ident = #accessor;
>                  }
>              }
> -            InitializerField::Init { ident, value, .. } => {
> +            InitializerKind::Init { ident, value, .. } => {
>                  // Again span for better diagnostics
>                  let init = format_ident!("init", span = value.span());
>                  if pinned {
>                      let project_ident = format_ident!("__project_{ident}");
>                      quote! {
> +                        #(#attrs)*
>                          {
>                              let #init = #value;
>                              // SAFETY:
> @@ -277,12 +291,14 @@ fn init_fields(
>                              //   for `#ident`.
>                              unsafe { #data.#ident(::core::ptr::addr_of_mut!((*#slot).#ident), #init)? };
>                          }
> +                        #(#cfgs)*
>                          // SAFETY: TODO
>                          #[allow(unused_variables)]
>                          let #ident = unsafe { #data.#project_ident(&mut (*#slot).#ident) };
>                      }
>                  } else {
>                      quote! {
> +                        #(#attrs)*
>                          {
>                              let #init = #value;
>                              // SAFETY: `slot` is valid, because we are inside of an initializer
> @@ -294,20 +310,25 @@ fn init_fields(
>                                  )?
>                              };
>                          }
> +                        #(#cfgs)*
>                          // SAFETY: TODO
>                          #[allow(unused_variables)]
>                          let #ident = unsafe { &mut (*#slot).#ident };
>                      }
>                  }
>              }
> -            InitializerField::Code { block: value, .. } => quote!(#[allow(unused_braces)] #value),
> +            InitializerKind::Code { block: value, .. } => quote! {
> +                #(#attrs)*
> +                #[allow(unused_braces)]
> +                #value
> +            },
>          };
>          res.extend(init);
> -        if let Some(ident) = field.ident() {
> +        if let Some(ident) = kind.ident() {
>              // `mixed_site` ensures that the guard is not accessible to the user-controlled code.
>              let guard = format_ident!("__{ident}_guard", span = Span::mixed_site());
> -            guards.push(guard.clone());
>              res.extend(quote! {
> +                #(#cfgs)*
>                  // Create the drop guard:
>                  //
>                  // We rely on macro hygiene to make it impossible for users to access this local
> @@ -319,13 +340,18 @@ fn init_fields(
>                      )
>                  };
>              });
> +            guards.push(guard);
> +            guard_attrs.push(cfgs);
>          }
>      }
>      quote! {
>          #res
>          // If execution reaches this point, all fields have been initialized. Therefore we can now
>          // dismiss the guards by forgetting them.
> -        #(::core::mem::forget(#guards);)*
> +        #(
> +            #(#guard_attrs)*
> +            ::core::mem::forget(#guards);
> +        )*
>      }
>  }

  reply	other threads:[~2026-01-14 18:57 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-14 18:18 [PATCH v3 00/15] `syn` rewrite of pin-init Benno Lossin
2026-01-14 18:18 ` [PATCH v3 01/15] rust: pin-init: remove `try_` versions of the initializer macros Benno Lossin
2026-01-14 18:18 ` [PATCH v3 02/15] rust: pin-init: allow the crate to refer to itself as `pin-init` in doc tests Benno Lossin
2026-01-14 18:18 ` [PATCH v3 03/15] rust: pin-init: add `syn` dependency and remove `proc-macro[2]` and `quote` workarounds Benno Lossin
2026-01-14 18:18 ` [PATCH v3 04/15] rust: pin-init: internal: add utility API for syn error handling Benno Lossin
2026-01-14 18:26   ` Gary Guo
2026-01-14 18:18 ` [PATCH v3 05/15] rust: pin-init: rewrite `derive(Zeroable)` and `derive(MaybeZeroable)` using `syn` Benno Lossin
2026-01-14 18:29   ` Gary Guo
2026-01-14 18:18 ` [PATCH v3 06/15] rust: pin-init: rewrite the `#[pinned_drop]` attribute macro " Benno Lossin
2026-01-14 18:34   ` Gary Guo
2026-01-14 18:18 ` [PATCH v3 07/15] rust: pin-init: rewrite `#[pin_data]` " Benno Lossin
2026-01-14 18:47   ` Gary Guo
2026-01-14 18:18 ` [PATCH v3 08/15] rust: pin-init: add `?Sized` bounds to traits in `#[pin_data]` macro Benno Lossin
2026-01-14 18:47   ` Gary Guo
2026-01-14 18:18 ` [PATCH v3 09/15] rust: pin-init: rewrite the initializer macros using `syn` Benno Lossin
2026-01-14 18:51   ` Gary Guo
2026-01-15 21:45   ` Tamir Duberstein
2026-01-15 22:43     ` Benno Lossin
2026-01-16  0:19       ` Tamir Duberstein
2026-01-16  9:28         ` Benno Lossin
2026-01-16 15:39           ` Tamir Duberstein
2026-01-16 16:37             ` Benno Lossin
2026-01-14 18:18 ` [PATCH v3 10/15] rust: pin-init: add `#[default_error(<type>)]` attribute to initializer macros Benno Lossin
2026-01-14 18:53   ` Gary Guo
2026-01-14 18:18 ` [PATCH v3 11/15] rust: init: use `#[default_error(err)]` for the " Benno Lossin
2026-01-14 18:18 ` [PATCH v3 12/15] rust: pin-init: internal: init: add support for attributes on initializer fields Benno Lossin
2026-01-14 18:57   ` Gary Guo [this message]
2026-01-14 18:18 ` [PATCH v3 13/15] rust: pin-init: internal: init: add escape hatch for referencing initialized fields Benno Lossin
2026-01-14 18:58   ` Gary Guo
2026-01-14 18:18 ` [PATCH v3 14/15] rust: pin-init: internal: init: simplify Zeroable safety check Benno Lossin
2026-01-14 18:58   ` Gary Guo
2026-01-14 18:18 ` [PATCH v3 15/15] MAINTAINERS: add Gary Guo to pin-init Benno Lossin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DFOJJ5PX0G82.UA7L6LIYZ8IA@garyguo.net \
    --to=gary@garyguo.net \
    --cc=a.hindborg@kernel.org \
    --cc=aliceryhl@google.com \
    --cc=bjorn3_gh@protonmail.com \
    --cc=boqun.feng@gmail.com \
    --cc=dakr@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lossin@kernel.org \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.kernel.org \
    --cc=tmgross@umich.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®