From: Benno Lossin <benno.lossin@proton.me>
To: Miguel Ojeda <ojeda@kernel.org>,
Wedson Almeida Filho <wedsonaf@gmail.com>,
Alex Gaynor <alex.gaynor@gmail.com>
Cc: "Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <benno.lossin@proton.me>,
"Alice Ryhl" <aliceryhl@google.com>,
"Andreas Hindborg" <nmi@metaspace.dk>,
rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 02/13] rust: init: make `#[pin_data]` compatible with conditional compilation of fields
Date: Sat, 29 Jul 2023 09:09:23 +0000 [thread overview]
Message-ID: <20230729090838.225225-3-benno.lossin@proton.me> (raw)
In-Reply-To: <20230729090838.225225-1-benno.lossin@proton.me>
This patch allows one to write
```
#[pin_data]
pub struct Foo {
#[cfg(CONFIG_BAR)]
a: Bar,
#[cfg(not(CONFIG_BAR))]
a: Baz,
}
```
Before, this would result in a compile error, because `#[pin_data]`
would generate two functions named `a` for both fields unconditionally.
Signed-off-by: Benno Lossin <benno.lossin@proton.me>
---
rust/kernel/init/macros.rs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rust/kernel/init/macros.rs b/rust/kernel/init/macros.rs
index fbaebd34f218..9182fdf99e7e 100644
--- a/rust/kernel/init/macros.rs
+++ b/rust/kernel/init/macros.rs
@@ -962,6 +962,7 @@ impl<$($impl_generics)*> $pin_data<$($ty_generics)*>
where $($whr)*
{
$(
+ $(#[$($p_attr)*])*
$pvis unsafe fn $p_field<E>(
self,
slot: *mut $p_type,
@@ -971,6 +972,7 @@ impl<$($impl_generics)*> $pin_data<$($ty_generics)*>
}
)*
$(
+ $(#[$($attr)*])*
$fvis unsafe fn $field<E>(
self,
slot: *mut $type,
--
2.41.0
next prev parent reply other threads:[~2023-07-29 9:09 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-29 9:09 [PATCH v3 00/13] Quality of life improvements for pin-init Benno Lossin
2023-07-29 9:09 ` [PATCH v3 01/13] rust: init: consolidate init macros Benno Lossin
2023-07-29 9:09 ` Benno Lossin [this message]
2023-08-01 10:50 ` [PATCH v3 02/13] rust: init: make `#[pin_data]` compatible with conditional compilation of fields Alice Ryhl
2023-08-02 17:47 ` Gary Guo
2023-08-05 17:04 ` Martin Rodriguez Reboredo
2023-07-29 9:09 ` [PATCH v3 03/13] rust: add derive macro for `Zeroable` Benno Lossin
2023-07-31 2:51 ` Boqun Feng
2023-07-29 9:09 ` [PATCH v3 04/13] rust: init: make guards in the init macros hygienic Benno Lossin
2023-08-02 17:52 ` Gary Guo
2023-07-29 9:09 ` [PATCH v3 05/13] rust: init: wrap type checking struct initializers in a closure Benno Lossin
2023-08-02 17:52 ` Gary Guo
2023-07-29 9:09 ` [PATCH v3 06/13] rust: init: make initializer values inaccessible after initializing Benno Lossin
2023-08-02 17:59 ` Gary Guo
2023-07-29 9:09 ` [PATCH v3 07/13] rust: init: add `..Zeroable::zeroed()` syntax for zeroing all missing fields Benno Lossin
2023-08-02 18:05 ` Gary Guo
2023-07-29 9:10 ` [PATCH v3 08/13] rust: init: Add functions to create array initializers Benno Lossin
2023-07-31 3:00 ` Boqun Feng
2023-08-05 17:11 ` Martin Rodriguez Reboredo
2023-08-06 16:07 ` Gary Guo
2023-07-29 9:10 ` [PATCH v3 09/13] rust: init: add support for arbitrary paths in init macros Benno Lossin
2023-08-06 16:07 ` Gary Guo
2023-07-29 9:10 ` [PATCH v3 10/13] rust: init: implement `Zeroable` for `UnsafeCell<T>` and `Opaque<T>` Benno Lossin
2023-08-05 17:12 ` Martin Rodriguez Reboredo
2023-08-06 16:08 ` Gary Guo
2023-07-29 9:10 ` [PATCH v3 11/13] rust: init: make `PinInit<T, E>` a supertrait of `Init<T, E>` Benno Lossin
2023-08-06 16:09 ` Gary Guo
2023-07-29 9:10 ` [PATCH v3 12/13] rust: init: add `{pin_}chain` functions to `{Pin}Init<T, E>` Benno Lossin
2023-08-05 17:15 ` Martin Rodriguez Reboredo
2023-07-29 9:10 ` [PATCH v3 13/13] rust: init: update expanded macro explanation 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=20230729090838.225225-3-benno.lossin@proton.me \
--to=benno.lossin@proton.me \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=nmi@metaspace.dk \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=wedsonaf@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).