sieni
/
linux
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rust: init: use `#[default_error(err)]` for the initializer macros 

Initializer macros should use this attribute instead of manually parsing
the macro's input. This is because the syntax is now parsed using `syn`,
which permits more complex constructs to be parsed. In addition, this
ensures that the kernel's initializer marcos will have the exact same
syntax as the ones from pin-init.

Reviewed-by: Gary Guo <gary@garyguo.net>
Signed-off-by: Benno Lossin <lossin@kernel.org>
This commit is contained in:
Benno Lossin 2026-01-16 11:54:26 +01:00
parent aeabc92eb2
commit d083a6214c
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rust/kernel/init.rs
View File

@ -219,20 +219,12 @@ pub trait InPlaceInit<T>: Sized {
/// [`Error`]: crate::error::Error /// [`Error`]: crate::error::Error
#[macro_export] #[macro_export]
macro_rules! try_init { macro_rules! try_init {
($(&$this:ident in)? $t:ident $(::<$($generics:ty),* $(,)?>)? { ($($args:tt)*) => {
$($fields:tt)* ::pin_init::init!(
}) => { #[default_error($crate::error::Error)]
::pin_init::init!($(&$this in)? $t $(::<$($generics),*>)? { $($args)*
$($fields)* )
}? $crate::error::Error) }
};
($(&$this:ident in)? $t:ident $(::<$($generics:ty),* $(,)?>)? {
$($fields:tt)*
}? $err:ty) => {
::pin_init::init!($(&$this in)? $t $(::<$($generics),*>)? {
$($fields)*
}? $err)
};
} }
/// Construct an in-place, fallible pinned initializer for `struct`s. /// Construct an in-place, fallible pinned initializer for `struct`s.
@ -279,18 +271,10 @@ macro_rules! try_init {
/// [`Error`]: crate::error::Error /// [`Error`]: crate::error::Error
#[macro_export] #[macro_export]
macro_rules! try_pin_init { macro_rules! try_pin_init {
($(&$this:ident in)? $t:ident $(::<$($generics:ty),* $(,)?>)? { ($($args:tt)*) => {
$($fields:tt)* ::pin_init::pin_init!(
}) => { #[default_error($crate::error::Error)]
::pin_init::pin_init!($(&$this in)? $t $(::<$($generics),*>)? { $($args)*
$($fields)* )
}? $crate::error::Error) }
};
($(&$this:ident in)? $t:ident $(::<$($generics:ty),* $(,)?>)? {
$($fields:tt)*
}? $err:ty) => {
::pin_init::pin_init!($(&$this in)? $t $(::<$($generics),*>)? {
$($fields)*
}? $err)
};
} }