From: Alice Ryhl <aliceryhl@google.com>
To: Danilo Krummrich <dakr@kernel.org>
Cc: Matthew Maurer <mmaurer@google.com>,
rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
Alice Ryhl <aliceryhl@google.com>,
Benno Lossin <benno.lossin@proton.me>
Subject: [PATCH v2 4/7] rust: alloc: add Vec::drain_all
Date: Fri, 21 Mar 2025 12:09:59 +0000 [thread overview]
Message-ID: <20250321-vec-methods-v2-4-6d9c8a4634cb@google.com> (raw)
In-Reply-To: <20250321-vec-methods-v2-0-6d9c8a4634cb@google.com>
This is like the stdlib method drain, except that it's hard-coded to use
the entire vector's range. Rust Binder uses it in the range allocator to
take ownership of everything in a vector in a case where reusing the
vector is desirable.
Implementing `DrainAll` in terms of `slice::IterMut` lets us reuse some
nice optimizations in core for the case where T is a ZST.
Reviewed-by: Benno Lossin <benno.lossin@proton.me>
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
---
rust/kernel/alloc/kvec.rs | 57 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/rust/kernel/alloc/kvec.rs b/rust/kernel/alloc/kvec.rs
index c9de619466eed1590fda039a291207100729a96a..d16360c3156b9bb4fc57cddcfd076adb70abd3c9 100644
--- a/rust/kernel/alloc/kvec.rs
+++ b/rust/kernel/alloc/kvec.rs
@@ -562,6 +562,30 @@ pub fn truncate(&mut self, len: usize) {
// len, therefore we have exclusive access to [`new_len`, `old_len`)
unsafe { ptr::drop_in_place(ptr) };
}
+
+ /// Takes ownership of all items in this vector without consuming the allocation.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// let mut v = kernel::kvec![0, 1, 2, 3]?;
+ ///
+ /// for (i, j) in v.drain_all().enumerate() {
+ /// assert_eq!(i, j);
+ /// }
+ ///
+ /// assert!(v.capacity() >= 4);
+ /// ```
+ pub fn drain_all(&mut self) -> DrainAll<'_, T> {
+ let len = self.len();
+ // SAFETY: The first 0 elements are valid.
+ self.set_len(0);
+ // INVARIANT: The first `len` elements of the spare capacity are valid values, and as we
+ // just set the length to zero, we may transfer ownership to the `DrainAll` object.
+ DrainAll {
+ elements: self.spare_capacity_mut()[..len].iter_mut(),
+ }
+ }
}
impl<T: Clone, A: Allocator> Vec<T, A> {
@@ -1047,3 +1071,36 @@ fn into_iter(self) -> Self::IntoIter {
}
}
}
+
+/// An iterator that owns all items in a vector, but does not own its allocation.
+///
+/// # Invariants
+///
+/// Every `&mut MaybeUninit<T>` returned by the iterator contains a valid `T` owned by this
+/// `DrainAll`.
+pub struct DrainAll<'vec, T> {
+ elements: slice::IterMut<'vec, MaybeUninit<T>>,
+}
+
+impl<'vec, T> Iterator for DrainAll<'vec, T> {
+ type Item = T;
+
+ fn next(&mut self) -> Option<T> {
+ let elem = self.elements.next()?;
+ // SAFETY: By the type invariants, we may take ownership of the value in this
+ // `MaybeUninit<T>`.
+ Some(unsafe { elem.assume_init_read() })
+ }
+
+ fn size_hint(&self) -> (usize, Option<usize>) {
+ self.elements.size_hint()
+ }
+}
+
+impl<'vec, T> Drop for DrainAll<'vec, T> {
+ fn drop(&mut self) {
+ if core::mem::needs_drop::<T>() {
+ while self.next().is_some() {}
+ }
+ }
+}
--
2.49.0.395.g12beb8f557-goog
next prev parent reply other threads:[~2025-03-21 12:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-21 12:09 [PATCH v2 0/7] Additional methods for Vec Alice Ryhl
2025-03-21 12:09 ` [PATCH v2 1/7] rust: alloc: add Vec::clear Alice Ryhl
2025-03-21 12:09 ` [PATCH v2 2/7] rust: alloc: add Vec::pop Alice Ryhl
2025-03-21 12:09 ` [PATCH v2 3/7] rust: alloc: add Vec::push_within_capacity Alice Ryhl
2025-03-21 12:09 ` Alice Ryhl [this message]
2025-03-21 12:10 ` [PATCH v2 5/7] rust: alloc: add Vec::retain Alice Ryhl
2025-03-21 12:10 ` [PATCH v2 6/7] rust: alloc: add Vec::remove Alice Ryhl
2025-03-21 12:10 ` [PATCH v2 7/7] rust: alloc: add Vec::insert_within_capacity Alice Ryhl
2025-03-21 12:25 ` [PATCH v2 0/7] Additional methods for Vec Danilo Krummrich
2025-03-21 13:10 ` Benno Lossin
2025-03-21 22:10 ` Danilo Krummrich
2025-03-21 12:28 ` Alice Ryhl
2025-03-21 15:47 ` Tamir Duberstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250321-vec-methods-v2-4-6d9c8a4634cb@google.com \
--to=aliceryhl@google.com \
--cc=benno.lossin@proton.me \
--cc=dakr@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mmaurer@google.com \
--cc=rust-for-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.