Commit 841f31d2 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Miguel Ojeda
Browse files

rust: num: bounded: rename `try_into_bitint` to `try_into_bounded` 



This is a remnant from when `Bounded` was called `BitInt` which I didn't
rename. Fix this.

Fixes: 01e345e8 ("rust: num: add Bounded integer wrapping type")
Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Link: https://patch.msgid.link/20251124-bounded_fix-v1-1-d8e34e1c727f@nvidia.com


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

rust/kernel/num/bounded.rs

+6 −6
Original line number Diff line number Diff line
@@ -218,11 +218,11 @@ fn fits_within<T: Integer>(value: T, num_bits: u32) -> bool { 
/// use kernel::num::{Bounded, TryIntoBounded};

///

/// // Succeeds because `128` fits into 8 bits.

/// let v: Option<Bounded<u16, 8>> = 128u32.try_into_bitint();

/// let v: Option<Bounded<u16, 8>> = 128u32.try_into_bounded();

/// assert_eq!(v.as_deref().copied(), Some(128));

///

/// // Fails because `128` doesn't fits into 6 bits.

/// let v: Option<Bounded<u16, 6>> = 128u32.try_into_bitint();

/// let v: Option<Bounded<u16, 6>> = 128u32.try_into_bounded();

/// assert_eq!(v, None);

/// ```

#[repr(transparent)]
@@ -498,18 +498,18 @@ fn deref(&self) -> &Self::Target { 
/// use kernel::num::{Bounded, TryIntoBounded};

///

/// // Succeeds because `128` fits into 8 bits.

/// let v: Option<Bounded<u16, 8>> = 128u32.try_into_bitint();

/// let v: Option<Bounded<u16, 8>> = 128u32.try_into_bounded();

/// assert_eq!(v.as_deref().copied(), Some(128));

///

/// // Fails because `128` doesn't fits into 6 bits.

/// let v: Option<Bounded<u16, 6>> = 128u32.try_into_bitint();

/// let v: Option<Bounded<u16, 6>> = 128u32.try_into_bounded();

/// assert_eq!(v, None);

/// ```

pub trait TryIntoBounded<T: Integer, const N: u32> {

    /// Attempts to convert `self` into a [`Bounded`] using `N` bits.

    ///

    /// Returns [`None`] if `self` does not fit into the target type.

    fn try_into_bitint(self) -> Option<Bounded<T, N>>;

    fn try_into_bounded(self) -> Option<Bounded<T, N>>;

}



/// Any integer value can be attempted to be converted into a [`Bounded`] of any size.
@@ -518,7 +518,7 @@ impl<T, U, const N: u32> TryIntoBounded<T, N> for U 
    T: Integer,

    U: TryInto<T>,

{

    fn try_into_bitint(self) -> Option<Bounded<T, N>> {

    fn try_into_bounded(self) -> Option<Bounded<T, N>> {

        self.try_into().ok().and_then(Bounded::try_new)

    }

}