Commit 4a28ab46 authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Miguel Ojeda
Browse files

rust: error: check for config `test` in `Error::name` 



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: default avatarAlice Ryhl <aliceryhl@google.com>
Reviewed-by: default avatarBenno Lossin <benno.lossin@proton.me>
Reviewed-by: default avatarGary Guo <gary@garyguo.net>
Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://lore.kernel.org/r/20241004154149.93856-24-dakr@kernel.org


Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 29a48d25

rust/kernel/error.rs

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ pub 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.get()) };
@@ -178,7 +178,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

    }