| Message ID | 20250526162429.1114862-1-y.j3ms.n@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | rust: kunit: use crate-level mapping for `c_void` | expand |
On Mon May 26, 2025 at 6:24 PM CEST, Jesung Yang wrote: > Use `kernel::ffi::c_void` instead of `core::ffi::c_void` for consistency > and to centralize abstraction. > > Since `kernel::ffi::c_void` is a transparent wrapper around > `core::ffi::c_void`, both are functionally equivalent. However, using > `kernel::ffi::c_void` improves consistency across the kernel's Rust code > and provides a unified reference point in case the definition ever needs > to change, even if such a change is unlikely. > > Signed-off-by: Jesung Yang <y.j3ms.n@gmail.com> > --- > rust/kernel/kunit.rs | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs > index 81833a687b75..bd6fc712dd79 100644 > --- a/rust/kernel/kunit.rs > +++ b/rust/kernel/kunit.rs > @@ -6,7 +6,8 @@ > //! > //! Reference: <https://docs.kernel.org/dev-tools/kunit/index.html> > > -use core::{ffi::c_void, fmt}; > +use core::fmt; > +use kernel::ffi::c_void; We don't need to explicitly import it, as `c_void` is present in the prelude since 3d5bef5d47c3 ("rust: add C FFI types to the prelude"). With the import removed: Reviewed-by: Benno Lossin <lossin@kernel.org> --- Cheers, Benno
On Tue May 27, 2025 at 3:51 PM CEST, Miguel Ojeda wrote: > On Tue, May 27, 2025 at 2:06 PM Benno Lossin <lossin@kernel.org> wrote: >> >> We don't need to explicitly import it, as `c_void` is present in the >> prelude since 3d5bef5d47c3 ("rust: add C FFI types to the prelude"). > > Hmm... But the prelude isn't there yet in this patch, no? i.e. our > prelude is (so far) not a "real prelude" that gets injected > automatically. So I guess you mean importing the prelude instead. Ah right it's only auto-imported in the doctests. Forgot that, would be nice if it could be :) > (It is imported in the KUnit series anyway, so it will llikely be > there either way) Oh yeah, it's in rust-next already :) --- Cheers, Benno
diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 81833a687b75..bd6fc712dd79 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -6,7 +6,8 @@ //! //! Reference: <https://docs.kernel.org/dev-tools/kunit/index.html> -use core::{ffi::c_void, fmt}; +use core::fmt; +use kernel::ffi::c_void; /// Prints a KUnit error-level message. ///
Use `kernel::ffi::c_void` instead of `core::ffi::c_void` for consistency and to centralize abstraction. Since `kernel::ffi::c_void` is a transparent wrapper around `core::ffi::c_void`, both are functionally equivalent. However, using `kernel::ffi::c_void` improves consistency across the kernel's Rust code and provides a unified reference point in case the definition ever needs to change, even if such a change is unlikely. Signed-off-by: Jesung Yang <y.j3ms.n@gmail.com> --- rust/kernel/kunit.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)