mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 04:31:50 +00:00
Rust fixes for v6.10
- Avoid unused import warning in 'rusttest'. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPjU5OPd5QIZ9jqqOGXyLc2htIW0FAmZ3RxsACgkQGXyLc2ht IW2YIw//SnUxKP9WvhfqgKeMequG6KRAvXlKVGvQx+Fqm6TgBEjMWVBskxz+5PS8 DukSA8IW+YYnVrlu8XcygOjcJBtfwKdeHBFLOjvSJNuj+JQ2J7aDdglbumAj1f8S m5RqTEIEXKj+qsEzKDSmcD19vGQK0V7/nK7aMeukBt6v2gbWsmQoEiP32AB/CODs sN4sn6DM5kMZ0IqvvKZUgkPyG7ZWFCqogKJL9wi1/RHApcZWnLyaHqdMC70oBkOS GzWIJfLo4zx64YQBXj1Xd0E2SEZMt+Ri53pK3lH412Fdz+SLM/safsdIRatHxx2c z22ROdzFF/nTP/nkfjCJS/9xABmW8fZ6qIlKsgbYO60a/wz2uzxBSSDZDWvzkVm8 r6NA4JCsgZ/Xew14AK7diGLU/Vx8OHWtaTFrb9//1wnCUxUWV4EDBaBcBeK0EqKL 0EohxvHwVShzLasbcaYrO1pUmJ2ByJx6wpxbKyuAt+Zuo+aiBZx2zsJaIEScQAc4 DDuhVXNkPLwX6a0NLVw06NbUpp0s3hfFTlHAmI76Hm1m5YlWqiwf2K2CZv4GkUHq IPe+NipOkp/Ew68Ju6igrBrPPth4SAqDvjHJup0qhR8XintziID3Bq2SlmpXdrAg blV4rgYkcvGQiCdSp3qNKM9o6Y0Fdr1tJc4iK6L91t+vuRfN/kg= =EAce -----END PGP SIGNATURE----- Merge tag 'rust-fixes-6.10' of https://github.com/Rust-for-Linux/linux Pull rust fix from Miguel Ojeda: - Avoid unused import warning in 'rusttest'. * tag 'rust-fixes-6.10' of https://github.com/Rust-for-Linux/linux: rust: avoid unused import warning in `rusttest`
This commit is contained in:
commit
5f583a3162
@ -4,7 +4,6 @@
|
||||
|
||||
use super::{AllocError, Flags};
|
||||
use alloc::vec::Vec;
|
||||
use core::ptr;
|
||||
|
||||
/// Extensions to [`Vec`].
|
||||
pub trait VecExt<T>: Sized {
|
||||
@ -141,7 +140,11 @@ impl<T> VecExt<T> for Vec<T> {
|
||||
// `krealloc_aligned`. A `Vec<T>`'s `ptr` value is not guaranteed to be NULL and might be
|
||||
// dangling after being created with `Vec::new`. Instead, we can rely on `Vec<T>`'s capacity
|
||||
// to be zero if no memory has been allocated yet.
|
||||
let ptr = if cap == 0 { ptr::null_mut() } else { old_ptr };
|
||||
let ptr = if cap == 0 {
|
||||
core::ptr::null_mut()
|
||||
} else {
|
||||
old_ptr
|
||||
};
|
||||
|
||||
// SAFETY: `ptr` is valid because it's either NULL or comes from a previous call to
|
||||
// `krealloc_aligned`. We also verified that the type is not a ZST.
|
||||
|
Loading…
Reference in New Issue
Block a user