Commit 1a22e175 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-rust-next-2025-11-21' of... 

Merge tag 'drm-rust-next-2025-11-21' of https://gitlab.freedesktop.org/drm/rust/kernel

 into drm-next

Core Changes:

- Fix warning in documentation builds on older rustc versions.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alice Ryhl <aliceryhl@google.com>
Link: https://patch.msgid.link/aSA5pshsJ7TeJIbu@google.com
parents 578d6aab 57dc2ea0

rust/kernel/slice.rs

+4 −4
Original line number Diff line number Diff line
@@ -16,22 +16,22 @@ 
///

/// This trait can be removed once the MSRV passes 1.80.

///

/// [`as_flattened`]: slice::as_flattened

/// [`as_flattened_mut`]: slice::as_flattened_mut

/// [`as_flattened`]: https://doc.rust-lang.org/std/primitive.slice.html#method.as_flattened

/// [`as_flattened_mut`]: https://doc.rust-lang.org/std/primitive.slice.html#method.as_flattened_mut

#[cfg(not(CONFIG_RUSTC_HAS_SLICE_AS_FLATTENED))]

pub trait AsFlattened<T> {

    /// Takes a `&[[T; N]]` and flattens it to a `&[T]`.

    ///

    /// This is an portable layer on top of [`as_flattened`]; see its documentation for details.

    ///

    /// [`as_flattened`]: slice::as_flattened

    /// [`as_flattened`]: https://doc.rust-lang.org/std/primitive.slice.html#method.as_flattened

    fn as_flattened(&self) -> &[T];



    /// Takes a `&mut [[T; N]]` and flattens it to a `&mut [T]`.

    ///

    /// This is an portable layer on top of [`as_flattened_mut`]; see its documentation for details.

    ///

    /// [`as_flattened_mut`]: slice::as_flattened_mut

    /// [`as_flattened_mut`]: https://doc.rust-lang.org/std/primitive.slice.html#method.as_flattened_mut

    fn as_flattened_mut(&mut self) -> &mut [T];

}