Commit 5ed14747 authored by Filipe Xavier's avatar Filipe Xavier Committed by Miguel Ojeda
Browse files

rust: error: make conversion functions public 

Change visibility to public of functions in error.rs:
from_err_ptr, from_errno, from_result and to_ptr.
Additionally, remove dead_code annotations.

Link: https://github.com/Rust-for-Linux/linux/issues/1105


Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Signed-off-by: default avatarFilipe Xavier <felipe_life@live.com>
Reviewed-by: default avatarBenno Lossin <benno.lossin@proton.me>
Reviewed-by: default avatarGary Guo <gary@garyguo.net>
Link: https://lore.kernel.org/r/DM4PR14MB7276E6948E67B3B23D8EA847E9652@DM4PR14MB7276.namprd14.prod.outlook.com


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

rust/kernel/error.rs

+4 −9
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ impl Error { 
    ///

    /// It is a bug to pass an out-of-range `errno`. `EINVAL` would

    /// be returned in such a case.

    pub(crate) fn from_errno(errno: core::ffi::c_int) -> Error {

    pub fn from_errno(errno: core::ffi::c_int) -> Error {

        if errno < -(bindings::MAX_ERRNO as i32) || errno >= 0 {

            // TODO: Make it a `WARN_ONCE` once available.

            crate::pr_warn!(
@@ -133,8 +133,7 @@ pub(crate) fn to_blk_status(self) -> bindings::blk_status_t { 
    }



    /// Returns the error encoded as a pointer.

    #[expect(dead_code)]

    pub(crate) fn to_ptr<T>(self) -> *mut T {

    pub fn to_ptr<T>(self) -> *mut T {

        #[cfg_attr(target_pointer_width = "32", allow(clippy::useless_conversion))]

        // SAFETY: `self.0` is a valid error due to its invariant.

        unsafe {
@@ -270,9 +269,7 @@ pub fn to_result(err: core::ffi::c_int) -> Result { 
///     from_err_ptr(unsafe { bindings::devm_platform_ioremap_resource(pdev.to_ptr(), index) })

/// }

/// ```

// TODO: Remove `dead_code` marker once an in-kernel client is available.

#[allow(dead_code)]

pub(crate) fn from_err_ptr<T>(ptr: *mut T) -> Result<*mut T> {

pub fn from_err_ptr<T>(ptr: *mut T) -> Result<*mut T> {

    // CAST: Casting a pointer to `*const core::ffi::c_void` is always valid.

    let const_ptr: *const core::ffi::c_void = ptr.cast();

    // SAFETY: The FFI function does not deref the pointer.
@@ -318,9 +315,7 @@ pub(crate) fn from_err_ptr<T>(ptr: *mut T) -> Result<*mut T> { 
///     })

/// }

/// ```

// TODO: Remove `dead_code` marker once an in-kernel client is available.

#[allow(dead_code)]

pub(crate) fn from_result<T, F>(f: F) -> T

pub fn from_result<T, F>(f: F) -> T

where

    T: From<i16>,

    F: FnOnce() -> Result<T>,