| Message ID | 20240816001216.26575-21-dakr@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Generic `Allocator` support for Rust | expand |
On 16.08.24 02:11, Danilo Krummrich wrote: > Additional to `testlib` also check for `test` in `Error::name`. This is > required by a subsequent patch that (indirectly) uses `Error` in test > cases. > > Reviewed-by: Alice Ryhl <aliceryhl@google.com> > Signed-off-by: Danilo Krummrich <dakr@kernel.org> Reviewed-by: Benno Lossin <benno.lossin@proton.me> --- Cheers, Benno > --- > rust/kernel/error.rs | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs > index 2d012cc3881a..7adf889b9526 100644 > --- a/rust/kernel/error.rs > +++ b/rust/kernel/error.rs > @@ -140,7 +140,7 @@ pub(crate) fn to_ptr<T>(self) -> *mut T { > } > > /// Returns a string representing the error, if one exists. > - #[cfg(not(testlib))] > + #[cfg(not(any(test, testlib)))] > pub fn name(&self) -> Option<&'static CStr> { > // SAFETY: Just an FFI call, there are no extra safety requirements. > let ptr = unsafe { bindings::errname(-self.0) }; > @@ -157,7 +157,7 @@ pub fn name(&self) -> Option<&'static CStr> { > /// When `testlib` is configured, this always returns `None` to avoid the dependency on a > /// kernel function so that tests that use this (e.g., by calling [`Result::unwrap`]) can still > /// run in userspace. > - #[cfg(testlib)] > + #[cfg(any(test, testlib))] > pub fn name(&self) -> Option<&'static CStr> { > None > } > -- > 2.46.0 >
diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 2d012cc3881a..7adf889b9526 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -140,7 +140,7 @@ pub(crate) fn to_ptr<T>(self) -> *mut T { } /// Returns a string representing the error, if one exists. - #[cfg(not(testlib))] + #[cfg(not(any(test, testlib)))] pub fn name(&self) -> Option<&'static CStr> { // SAFETY: Just an FFI call, there are no extra safety requirements. let ptr = unsafe { bindings::errname(-self.0) }; @@ -157,7 +157,7 @@ pub fn name(&self) -> Option<&'static CStr> { /// When `testlib` is configured, this always returns `None` to avoid the dependency on a /// kernel function so that tests that use this (e.g., by calling [`Result::unwrap`]) can still /// run in userspace. - #[cfg(testlib)] + #[cfg(any(test, testlib))] pub fn name(&self) -> Option<&'static CStr> { None }