mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-01 00:58:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rust: alloc: refactor Vec::truncate using dec_len

Browse source 
Use `checked_sub` to satisfy the safety requirements of `dec_len` and
replace nearly the whole body of `truncate` with a call to `dec_len`.

Reviewed-by: Andrew Ballance <andrewjballance@gmail.com>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
Link: https://lore.kernel.org/r/20250416-vec-set-len-v4-3-112b222604cd@gmail.com
[ Remove #[expect(unused)] from dec_len(). - Danilo ]
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
This commit is contained in:
Tamir Duberstein 2025-04-16 13:15:42 -04:00 committed by Danilo Krummrich
parent dbb0b840a0
commit 1b04b466c8
1 changed files with 8 additions and 17 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

23
rust/kernel/alloc/kvec.rs
View file

@ -209,7 +209,6 @@ pub unsafe fn set_len(&mut self, new_len: usize) {
/// # Safety
///
/// - `count` must be less than or equal to `self.len`.
#[expect(unused)]
unsafe fn dec_len(&mut self, count: usize) -> &mut [T] {
debug_assert!(count <= self.len());
// INVARIANT: We relinquish ownership of the elements within the range `[self.len - count,
@ -489,24 +488,16 @@ pub fn reserve(&mut self, additional: usize, flags: Flags) -> Result<(), AllocEr
/// # Ok::<(), Error>(())
/// ```
pub fn truncate(&mut self, len: usize) {
if len >= self.len() {
return;
}
if let Some(count) = self.len().checked_sub(len) {
// SAFETY: `count` is `self.len() - len` so it is guaranteed to be less than or
// equal to `self.len()`.
let ptr: *mut [T] = unsafe { self.dec_len(count) };
let drop_range = len..self.len();
// SAFETY: `drop_range` is a subrange of `[0, len)` by the bounds check above.
let ptr: *mut [T] = unsafe { self.get_unchecked_mut(drop_range) };
// SAFETY: By the above bounds check, it is guaranteed that `len < self.capacity()`.
unsafe { self.set_len(len) };
// SAFETY:
// - the dropped values are valid `T`s by the type invariant
// - we are allowed to invalidate [`new_len`, `old_len`) because we just changed the
// len, therefore we have exclusive access to [`new_len`, `old_len`)
// SAFETY: the contract of `dec_len` guarantees that the elements in `ptr` are
// valid elements whose ownership has been transferred to the caller.
unsafe { ptr::drop_in_place(ptr) };
}
}
}
impl<T: Clone, A: Allocator> Vec<T, A> {