lkml.org 
[lkml]   [2023]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH v3 02/13] rust: init: make `#[pin_data]` compatible with conditional compilation of fields
On Sat, 29 Jul 2023 09:09:23 +0000
Benno Lossin <benno.lossin@proton.me> wrote:

> 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>

Reviewed-by: Gary Guo <gary@garyguo.net>

> ---
> 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,

\
 
 \ /
  Last update: 2023-08-02 19:49    [W:0.159 / U:0.372 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site