FROMGIT: rust: alloc: add Vec::pop
This introduces a basic method that our custom Vec is missing. I expect that it will be used in many places, but at the time of writing, Rust Binder has six calls to Vec::pop. Signed-off-by: Alice Ryhl <aliceryhl@google.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Benno Lossin <lossin@kernel.org> Link: https://lore.kernel.org/r/20250502-vec-methods-v5-2-06d20ad9366f@google.com Signed-off-by: Danilo Krummrich <dakr@kernel.org> Bug: 414994413 (cherry picked from commit f2b4dd7093438e4884cb01a783212abfbc9cc40b https://github.com/Rust-for-Linux/linux.git alloc-next) Change-Id: I81085d4a5fc7fe9377c3857e8f0adca8aabd8984 Signed-off-by: Alice Ryhl <aliceryhl@google.com>
This commit is contained in:
committed by
Matthew Maurer
parent
ed2019e2c4
commit
75c0948156
@@ -320,6 +320,37 @@ where
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Removes the last element from a vector and returns it, or `None` if it is empty.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// let mut v = KVec::new();
|
||||
/// v.push(1, GFP_KERNEL)?;
|
||||
/// v.push(2, GFP_KERNEL)?;
|
||||
/// assert_eq!(&v, &[1, 2]);
|
||||
///
|
||||
/// assert_eq!(v.pop(), Some(2));
|
||||
/// assert_eq!(v.pop(), Some(1));
|
||||
/// assert_eq!(v.pop(), None);
|
||||
/// # Ok::<(), Error>(())
|
||||
/// ```
|
||||
pub fn pop(&mut self) -> Option<T> {
|
||||
if self.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let removed: *mut T = {
|
||||
// SAFETY: We just checked that the length is at least one.
|
||||
let slice = unsafe { self.dec_len(1) };
|
||||
// SAFETY: The argument to `dec_len` was 1 so this returns a slice of length 1.
|
||||
unsafe { slice.get_unchecked_mut(0) }
|
||||
};
|
||||
|
||||
// SAFETY: The guarantees of `dec_len` allow us to take ownership of this value.
|
||||
Some(unsafe { removed.read() })
|
||||
}
|
||||
|
||||
/// Creates a new [`Vec`] instance with at least the given capacity.
|
||||
///
|
||||
/// # Examples
|
||||
|
||||
Reference in New Issue
Block a user