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 11/12] rust: pin-init: internal: init: add support for attributes on initializer fields
Date: Fri, 09 Jan 2026 13:55:52 +0000	[thread overview]
Message-ID: <DFK3Z9K6SMVA.1XCWR3Y3WK7OI@garyguo.net> (raw)
In-Reply-To: <20260108135127.3153925-12-lossin@kernel.org>

On Thu Jan 8, 2026 at 1:50 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.
>
> Signed-off-by: Benno Lossin <lossin@kernel.org>
> ---
>  rust/pin-init/internal/src/init.rs | 64 +++++++++++++++++++++++-------
>  1 file changed, 50 insertions(+), 14 deletions(-)
>
> diff --git a/rust/pin-init/internal/src/init.rs b/rust/pin-init/internal/src/init.rs
> index e14bacc88f41..c20be37e7fef 100644
> --- a/rust/pin-init/internal/src/init.rs
> +++ b/rust/pin-init/internal/src/init.rs
> @@ -25,7 +25,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)>,
> @@ -42,7 +47,7 @@ enum InitializerField {
>      },
>  }
>  
> -impl InitializerField {
> +impl InitializerKind {
>      fn ident(&self) -> Option<&Ident> {
>          match self {
>              Self::Value { ident, .. } | Self::Init { ident, .. } => Some(ident),
> @@ -224,10 +229,11 @@ 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 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
> @@ -250,21 +256,24 @@ fn init_fields(
>                      }
>                  };
>                  quote! {
> +                    #(#attrs)*
>                      {
>                          #value_prep
>                          // SAFETY: TODO
>                          unsafe { #write(::core::ptr::addr_of_mut!((*#slot).#ident), #value_ident) };
>                      }
> +                    #(#attrs)*
>                      #[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:
> @@ -274,12 +283,14 @@ fn init_fields(
>                              //   for `#ident`.
>                              unsafe { #data.#ident(::core::ptr::addr_of_mut!((*#slot).#ident), #init)? };
>                          }
> +                        #(#attrs)*
>                          // 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
> @@ -291,20 +302,25 @@ fn init_fields(
>                                  )?
>                              };
>                          }
> +                        #(#attrs)*
>                          // 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! {
> +                #(#attrs)*
>                  // Create the drop guard:
>                  //
>                  // We rely on macro hygiene to make it impossible for users to access this local
> @@ -316,13 +332,18 @@ fn init_fields(
>                      )
>                  };
>              });
> +            guards.push(guard);
> +            guard_attrs.push(attrs);

I think guard_attrs should just get the cfg ones, not including lint levels.
Otherwise, `#[expect]` would be broken?

Best,
Gary

>          }
>      }
>      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);
> +        )*
>      }
>  }
>  
> @@ -332,7 +353,10 @@ fn make_field_check(
>      init_kind: InitKind,
>      path: &Path,
>  ) -> TokenStream {
> -    let fields = fields.iter().filter_map(|f| f.ident());
> +    let field_attrs = fields
> +        .iter()
> +        .filter_map(|f| f.kind.ident().map(|_| &f.attrs));
> +    let field_name = fields.iter().filter_map(|f| f.kind.ident());
>      match init_kind {
>          InitKind::Normal => quote! {
>              // We use unreachable code to ensure that all fields have been mentioned exactly once,
> @@ -343,7 +367,8 @@ fn make_field_check(
>              let _ = || unsafe {
>                  ::core::ptr::write(slot, #path {
>                      #(
> -                        #fields: ::core::panic!(),
> +                        #(#field_attrs)*
> +                        #field_name: ::core::panic!(),
>                      )*
>                  })
>              };
> @@ -361,7 +386,8 @@ fn make_field_check(
>                  zeroed = ::core::mem::zeroed();
>                  ::core::ptr::write(slot, #path {
>                      #(
> -                        #fields: ::core::panic!(),
> +                        #(#field_attrs)*
> +                        #field_name: ::core::panic!(),
>                      )*
>                      ..zeroed
>                  })
> @@ -382,7 +408,7 @@ fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
>              let lh = content.lookahead1();
>              if lh.peek(End) || lh.peek(Token![..]) {
>                  break;
> -            } else if lh.peek(Ident) || lh.peek(Token![_]) {
> +            } else if lh.peek(Ident) || lh.peek(Token![_]) || lh.peek(Token![#]) {
>                  fields.push_value(content.parse()?);
>                  let lh = content.lookahead1();
>                  if lh.peek(End) {
> @@ -448,6 +474,16 @@ fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
>  }
>  
>  impl Parse for InitializerField {
> +    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
> +        let attrs = input.call(Attribute::parse_outer)?;
> +        Ok(Self {
> +            attrs,
> +            kind: input.parse()?,
> +        })
> +    }
> +}
> +
> +impl Parse for InitializerKind {
>      fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
>          let lh = input.lookahead1();
>          if lh.peek(Token![_]) {


  reply	other threads:[~2026-01-09 13:55 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-08 13:50 [PATCH 00/13] `syn` rewrite of pin-init Benno Lossin
2026-01-08 13:50 ` [PATCH 01/12] rust: pin-init: remove `try_` versions of the initializer macros Benno Lossin
2026-01-08 13:50 ` [PATCH 02/12] rust: pin-init: allow the crate to refer to itself as `pin-init` in doc tests Benno Lossin
2026-01-08 13:50 ` [PATCH 03/12] rust: pin-init: add `syn` dependency and remove `proc-macro[2]` and `quote` workarounds Benno Lossin
2026-01-08 13:50 ` [PATCH 04/12] rust: pin-init: rewrite `derive(Zeroable)` and `derive(MaybeZeroable)` using `syn` Benno Lossin
2026-01-09 12:02   ` Gary Guo
2026-01-08 13:50 ` [PATCH 05/12] rust: pin-init: rewrite the `#[pinned_drop]` attribute macro " Benno Lossin
2026-01-09 12:12   ` Gary Guo
2026-01-09 15:34     ` Benno Lossin
2026-01-09 16:42       ` Gary Guo
2026-01-08 13:50 ` [PATCH 06/12] rust: pin-init: rewrite `#[pin_data]` " Benno Lossin
2026-01-09  7:45   ` kernel test robot
2026-01-09 12:47   ` Gary Guo
2026-01-09 16:39     ` Benno Lossin
2026-01-09 16:46       ` Gary Guo
2026-01-10 16:41         ` Benno Lossin
2026-01-10 19:18           ` Gary Guo
2026-01-08 13:50 ` [PATCH 07/12] rust: pin-init: add `?Sized` bounds to traits in `#[pin_data]` macro Benno Lossin
2026-01-08 13:50 ` [PATCH 08/12] rust: pin-init: rewrite the initializer macros using `syn` Benno Lossin
2026-01-09  8:44   ` kernel test robot
2026-01-09 13:45   ` Gary Guo
2026-01-09 17:24     ` Benno Lossin
2026-01-10 16:21       ` Benno Lossin
2026-01-10 18:14     ` Benno Lossin
2026-01-10 19:20       ` Gary Guo
2026-01-10 23:18         ` Benno Lossin
2026-01-11  1:10           ` Gary Guo
2026-01-11 10:04             ` Benno Lossin
2026-01-08 13:50 ` [PATCH 09/12] rust: pin-init: add `#[default_error(<type>)]` attribute to initializer macros Benno Lossin
2026-01-09 13:52   ` Gary Guo
2026-01-08 13:50 ` [PATCH 10/12] rust: init: use `#[default_error(err)]` for the " Benno Lossin
2026-01-08 13:50 ` [PATCH 11/12] rust: pin-init: internal: init: add support for attributes on initializer fields Benno Lossin
2026-01-09 13:55   ` Gary Guo [this message]
2026-01-09 18:02     ` Benno Lossin
2026-01-09 21:16       ` Gary Guo
2026-01-08 13:50 ` [PATCH 12/12] rust: pin-init: internal: init: add escape hatch for referencing initialized fields Benno Lossin
2026-01-09  9:44   ` kernel test robot
2026-01-09 13:58   ` Gary Guo
2026-01-09 18:04     ` Benno Lossin
2026-01-08 13:50 ` [PATCH 13/13] 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=DFK3Z9K6SMVA.1XCWR3Y3WK7OI@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®