uefi-ref/uefi-rs
1
0
Fork 0
mirror of https://github.com/rust-osdev/uefi-rs synced 2026-08-26 18:26:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2038 from rust-osdev/nightly-clippy

Browse source 
clippy: adjust latest nightly findings
This commit is contained in:
Philipp Schuster 2026-08-23 12:48:54 +00:00 • committed by GitHub
commit 3afc565b35
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uefi-test-runner/src/proto/ata/pass_thru.rs
View file

@ -39,6 +39,7 @@ fn is_testdrive_present() -> bool {
let bfr = result.read_buffer().unwrap(); let bfr = result.read_buffer().unwrap();
// ATA uses wchar16 big endian strings for serial numbers // ATA uses wchar16 big endian strings for serial numbers
let mut serial_bfr = [0u8; 20]; let mut serial_bfr = [0u8; 20];
#[expect(clippy::chunks_exact_to_as_chunks)]
bfr[20..40] bfr[20..40]
.chunks_exact(2) .chunks_exact(2)
.zip(serial_bfr.chunks_exact_mut(2)) .zip(serial_bfr.chunks_exact_mut(2))

24
uefi/src/boot.rs
View file

@ -1984,28 +1984,20 @@ impl LoadImageSource<'_> {
*const u8, /* buffer */ *const u8, /* buffer */
usize, /* buffer length */ usize, /* buffer length */
) { ) {
let boot_policy; let (boot_policy, device_path, source_buffer, source_size) = match self {
let device_path;
let source_buffer;
let source_size;
match self {
LoadImageSource::FromBuffer { buffer, file_path } => { LoadImageSource::FromBuffer { buffer, file_path } => {
// Boot policy is ignored when loading from source buffer. // Boot policy is ignored when loading from source buffer.
boot_policy = BootPolicy::default(); (
BootPolicy::default(),
device_path = file_path.map(|p| p.as_ffi_ptr()).unwrap_or(ptr::null()); file_path.map(|p| p.as_ffi_ptr()).unwrap_or(ptr::null()),
source_buffer = buffer.as_ptr(); buffer.as_ptr(),
source_size = buffer.len(); buffer.len(),
)
} }
LoadImageSource::FromDevicePath { LoadImageSource::FromDevicePath {
device_path: d_path, device_path: d_path,
boot_policy: b_policy, boot_policy: b_policy,
} => { } => (*b_policy, d_path.as_ffi_ptr(), ptr::null(), 0),
boot_policy = *b_policy;
device_path = d_path.as_ffi_ptr();
source_buffer = ptr::null();
source_size = 0;
}
}; };
(boot_policy, device_path, source_buffer, source_size) (boot_policy, device_path, source_buffer, source_size)
} }

3
uefi/src/proto/hii/config_str.rs
View file

@ -143,7 +143,7 @@ impl ConfigurationString {
/// # Returns /// # Returns
/// ///
/// An iterator over bytes. /// An iterator over bytes.
#[must_use] #[must_use = "iterators are lazy and do nothing unless consumed"]
pub fn parse_bytes_from_hex(hex: &str) -> impl DoubleEndedIterator<Item = u8> { pub fn parse_bytes_from_hex(hex: &str) -> impl DoubleEndedIterator<Item = u8> {
hex.as_bytes().chunks(2).map(|chunk| { hex.as_bytes().chunks(2).map(|chunk| {
let chunk = str::from_utf8(chunk).unwrap_or_default(); let chunk = str::from_utf8(chunk).unwrap_or_default();
@ -190,6 +190,7 @@ impl ConfigurationString {
let size_chars = size_bytes / 2; let size_chars = size_bytes / 2;
let mut bfr = AlignedBuffer::from_size_align(size_bytes, 2).ok()?; let mut bfr = AlignedBuffer::from_size_align(size_bytes, 2).ok()?;
bfr.copy_from_iter(Self::parse_bytes_from_hex(data).chain([0, 0])); bfr.copy_from_iter(Self::parse_bytes_from_hex(data).chain([0, 0]));
#[expect(clippy::chunks_exact_to_as_chunks)]
bfr.as_slice_mut() bfr.as_slice_mut()
.chunks_exact_mut(2) .chunks_exact_mut(2)
.for_each(|c| c.swap(0, 1)); .for_each(|c| c.swap(0, 1));