clippy: tighten clippy lints + "--fix"

Tighten the clippy lints + automatically fixes.
Some of the fixes also needed manual steps.

Author: phip1611

uefi-raw/src/lib.rs

@@ -14,6 +14,8 @@
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![deny(
     clippy::all,
+    clippy::cargo,
+    clippy::nursery,
     clippy::missing_const_for_fn,
     clippy::must_use_candidate,
     clippy::ptr_as_ptr,

uefi-test-runner/Cargo.toml

@@ -16,7 +16,7 @@ qemu-exit = "3.0.0"
 
 [features]
 # Enable the debug support protocol test.
-debug_support = []
+debug_support_protocol = []
 
 # Enable the multiprocessor test. This only works if KVM is enabled.
 multi_processor = []

uefi-test-runner/src/proto/debug.rs

@@ -69,7 +69,7 @@ fn test_debug_port() {
 }
 
 fn test_debug_support() {
-    if cfg!(not(feature = "debug_support")) {
+    if cfg!(not(feature = "debug_support_protocol")) {
         return;
     }
 

uefi/src/boot.rs

@@ -238,7 +238,7 @@ pub fn allocate_pool(memory_type: MemoryType, size: usize) -> Result<NonNull<u8>
     let ptr = unsafe { (bt.allocate_pool)(memory_type, size, &mut buffer) }
         .to_result_with_val(|| buffer)?;
 
-    NonNull::new(ptr).ok_or(Status::OUT_OF_RESOURCES.into())
+    NonNull::new(ptr).ok_or_else(|| Status::OUT_OF_RESOURCES.into())
 }
 
 /// Frees memory allocated by [`allocate_pool`].

uefi/src/data_types/strs.rs

@@ -745,7 +745,7 @@ impl PoolString {
     pub unsafe fn new(text: *const Char16) -> crate::Result<Self> {
         NonNull::new(text.cast_mut())
             .map(|p| Self(PoolAllocation::new(p.cast())))
-            .ok_or(Status::OUT_OF_RESOURCES.into())
+            .ok_or_else(|| Status::OUT_OF_RESOURCES.into())
     }
 }
 

uefi/src/fs/file_system/fs.rs

@@ -63,11 +63,13 @@ impl FileSystem {
         let mut src = self
             .open(src_path, UefiFileMode::Read, false)?
             .into_regular_file()
-            .ok_or(Error::Io(IoError {
-                path: src_path.to_path_buf(),
-                context: IoErrorContext::NotAFile,
-                uefi_error: Status::INVALID_PARAMETER.into(),
-            }))?;
+            .ok_or_else(|| {
+                Error::Io(IoError {
+                    path: src_path.to_path_buf(),
+                    context: IoErrorContext::NotAFile,
+                    uefi_error: Status::INVALID_PARAMETER.into(),
+                })
+            })?;
 
         // Get the source file's size in bytes.
         let src_size = {
@@ -91,11 +93,13 @@ impl FileSystem {
         let mut dest = self
             .open(dest_path, UefiFileMode::CreateReadWrite, false)?
             .into_regular_file()
-            .ok_or(Error::Io(IoError {
-                path: dest_path.to_path_buf(),
-                context: IoErrorContext::OpenError,
-                uefi_error: Status::INVALID_PARAMETER.into(),
-            }))?;
+            .ok_or_else(|| {
+                Error::Io(IoError {
+                    path: dest_path.to_path_buf(),
+                    context: IoErrorContext::OpenError,
+                    uefi_error: Status::INVALID_PARAMETER.into(),
+                })
+            })?;
 
         // 1 MiB copy buffer.
         let mut chunk = vec![0; 1024 * 1024];
@@ -198,13 +202,15 @@ impl FileSystem {
         let mut file = self
             .open(path, UefiFileMode::Read, false)?
             .into_regular_file()
-            .ok_or(Error::Io(IoError {
-                path: path.to_path_buf(),
-                context: IoErrorContext::NotAFile,
-                // We do not have a real UEFI error here as we have a logical
-                // problem.
-                uefi_error: Status::INVALID_PARAMETER.into(),
-            }))?;
+            .ok_or_else(|| {
+                Error::Io(IoError {
+                    path: path.to_path_buf(),
+                    context: IoErrorContext::NotAFile,
+                    // We do not have a real UEFI error here as we have a logical
+                    // problem.
+                    uefi_error: Status::INVALID_PARAMETER.into(),
+                })
+            })?;
 
         let info = file.get_boxed_info::<UefiFileInfo>().map_err(|err| {
             Error::Io(IoError {
@@ -237,13 +243,15 @@ impl FileSystem {
         let dir = self
             .open(path, UefiFileMode::Read, false)?
             .into_directory()
-            .ok_or(Error::Io(IoError {
-                path: path.to_path_buf(),
-                context: IoErrorContext::NotADirectory,
-                // We do not have a real UEFI error here as we have a logical
-                // problem.
-                uefi_error: Status::INVALID_PARAMETER.into(),
-            }))?;
+            .ok_or_else(|| {
+                Error::Io(IoError {
+                    path: path.to_path_buf(),
+                    context: IoErrorContext::NotADirectory,
+                    // We do not have a real UEFI error here as we have a logical
+                    // problem.
+                    uefi_error: Status::INVALID_PARAMETER.into(),
+                })
+            })?;
         Ok(UefiDirectoryIter::new(dir))
     }
 

uefi/src/lib.rs

@@ -234,6 +234,8 @@
 #![no_std]
 #![deny(
     clippy::all,
+    clippy::cargo,
+    clippy::nursery,
     clippy::missing_const_for_fn,
     clippy::must_use_candidate,
     clippy::ptr_as_ptr,
@@ -244,6 +246,9 @@
     unsafe_op_in_unsafe_fn,
     unused
 )]
+// There is too many code affected and without an automatic fix, this is too
+// much mechanic work.
+#![allow(clippy::option_if_let_else)]
 
 #[cfg(feature = "alloc")]
 extern crate alloc;

uefi/src/mem/memory_map/impl_.rs

@@ -270,7 +270,7 @@ impl IndexMut<usize> for MemoryMapRefMut<'_> {
 /// [`boot::get_memory_map`]: crate::boot::get_memory_map
 #[derive(Debug)]
 #[allow(clippy::len_without_is_empty)] // this type is never empty
-pub(crate) struct MemoryMapBackingMemory(NonNull<[u8]>);
+pub struct MemoryMapBackingMemory(NonNull<[u8]>);
 
 impl MemoryMapBackingMemory {
     /// Constructs a new [`MemoryMapBackingMemory`].

uefi/src/mem/util.rs

@@ -36,7 +36,7 @@ use {core::alloc::Allocator, core::ptr::NonNull};
 ///
 /// [`Allocator`]: https://doc.rust-lang.org/alloc/alloc/trait.Allocator.html
 /// [`alloc::alloc::Global`]: https://doc.rust-lang.org/alloc/alloc/struct.Global.html
-pub(crate) fn make_boxed<
+pub fn make_boxed<
     'a,
     // The UEFI data structure.
     Data: Align + ?Sized + Debug + 'a,

uefi/src/proto/ata/pass_thru.rs

@@ -107,6 +107,7 @@ pub struct AtaDevice<'a> {
 }
 
 impl AtaDevice<'_> {
+    #[allow(clippy::needless_pass_by_ref_mut)] // cast to mutable ptr
     const fn proto_mut(&mut self) -> *mut AtaPassThruProtocol {
         ptr::from_ref(self.proto).cast_mut()
     }
@@ -156,7 +157,7 @@ impl AtaDevice<'_> {
                 .to_result()?;
             NonNull::new(path_ptr.cast_mut())
                 .map(|p| PoolDevicePathNode(PoolAllocation::new(p.cast())))
-                .ok_or(Status::OUT_OF_RESOURCES.into())
+                .ok_or_else(|| Status::OUT_OF_RESOURCES.into())
         }
     }