Skip to content

Commit a126eca

Browse files
committed
rust: avoid unused import warning in rusttest
When compiling for the `rusttest` target, the `core::ptr` import is unused since its only use happens in the `reserve()` method which is not compiled in that target: warning: unused import: `core::ptr` --> rust/kernel/alloc/vec_ext.rs:7:5 | 7 | use core::ptr; | ^^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default Thus clean it. Fixes: 97ab3e8 ("rust: alloc: fix dangling pointer in VecExt<T>::reserve()") Reviewed-by: Alice Ryhl <aliceryhl@google.com> Reviewed-by: Danilo Krummrich <dakr@redhat.com> Link: https://lore.kernel.org/r/20240519210735.587323-1-ojeda@kernel.org Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
1 parent 83a7eef commit a126eca

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

rust/kernel/alloc/vec_ext.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
55
use super::{AllocError, Flags};
66
use alloc::vec::Vec;
7-
use core::ptr;
87

98
/// Extensions to [`Vec`].
109
pub trait VecExt<T>: Sized {
@@ -141,7 +140,11 @@ impl<T> VecExt<T> for Vec<T> {
141140
// `krealloc_aligned`. A `Vec<T>`'s `ptr` value is not guaranteed to be NULL and might be
142141
// dangling after being created with `Vec::new`. Instead, we can rely on `Vec<T>`'s capacity
143142
// to be zero if no memory has been allocated yet.
144-
let ptr = if cap == 0 { ptr::null_mut() } else { old_ptr };
143+
let ptr = if cap == 0 {
144+
core::ptr::null_mut()
145+
} else {
146+
old_ptr
147+
};
145148

146149
// SAFETY: `ptr` is valid because it's either NULL or comes from a previous call to
147150
// `krealloc_aligned`. We also verified that the type is not a ZST.

0 commit comments

Comments
 (0)