Merge pull request #1968 from rust-osdev/allow-expect

phip1611 · web-flow · commit c889cb72bb33 · 2026-06-14T15:10:38.000Z
treewide: allow() -&gt; expect() + remove unneeded allow()
diff --git a/uefi-raw/src/enums.rs b/uefi-raw/src/enums.rs
@@ -35,7 +35,7 @@
 /// # use uefi_raw::newtype_enum;
 /// newtype_enum! {
 /// #[derive(Default)]
-/// pub enum UnixBool: i32 => #[allow(missing_docs)] {
+/// pub enum UnixBool: i32 => #[expect(missing_docs)] {
 ///     FALSE          =  0,
 ///     TRUE           =  1,
 ///     /// Nobody expects the Unix inquisition!
@@ -59,7 +59,6 @@ macro_rules! newtype_enum {
         $visibility struct $type(pub $base_integer);
 
         $(#[$impl_attrs])*
-        #[allow(unused)]
         impl $type {
             $(
                 $(#[$variant_attrs])*
diff --git a/uefi-raw/src/lib.rs b/uefi-raw/src/lib.rs
@@ -96,7 +96,7 @@ impl From<bool> for Boolean {
 }
 
 impl From<Boolean> for bool {
-    #[allow(clippy::match_like_matches_macro)]
+    #[expect(clippy::match_like_matches_macro)]
     fn from(value: Boolean) -> Self {
         // We handle it as in C: Any bit-pattern != 0 equals true
         match value.0 {
diff --git a/uefi-raw/src/protocol/console/serial.rs b/uefi-raw/src/protocol/console/serial.rs
@@ -117,7 +117,6 @@ impl SerialIoProtocol {
 /// Serial I/O protocol (revision 1.1).
 #[derive(Debug)]
 #[repr(C)]
-#[allow(non_camel_case_types)]
 pub struct SerialIoProtocol_1_1 {
     pub base_protocol: SerialIoProtocol,
     pub device_type_guid: *const Guid,
diff --git a/uefi-raw/src/protocol/network/tcp4.rs b/uefi-raw/src/protocol/network/tcp4.rs
@@ -23,7 +23,6 @@ pub struct Tcp4Protocol {
     /// this instance into user-supplied structs. This function can
     /// also be used to retrieve the operational setting of underlying
     /// drivers such as IPv4, MNP, or SNP.
-    #[allow(clippy::type_complexity)]
     pub get_mode_data: unsafe extern "efiapi" fn(
         this: *mut Self,
         connection_state: *mut Tcp4ConnectionState,
diff --git a/uefi-raw/src/table/revision.rs b/uefi-raw/src/table/revision.rs
@@ -38,7 +38,7 @@ pub struct Revision(pub u32);
 
 // Allow missing docs, there's nothing useful to document about these
 // constants.
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 impl Revision {
     pub const EFI_1_02: Self = Self::new(1, 2);
     pub const EFI_1_10: Self = Self::new(1, 10);
diff --git a/uefi-test-runner/src/boot/memory.rs b/uefi-test-runner/src/boot/memory.rs
@@ -107,7 +107,7 @@ mod global {
     }
 
     /// Simple test to ensure our custom allocator works with correct alignment.
-    #[allow(dead_code)] // Ignore warning due to field not being read.
+    #[expect(dead_code)] // Ignore warning due to field not being read.
     pub fn alloc_alignment() {
         {
             info!("Allocating a structure with alignment of 0x100 using the global allocator");
diff --git a/uefi-test-runner/src/proto/driver.rs b/uefi-test-runner/src/proto/driver.rs
@@ -5,7 +5,7 @@ use uefi::prelude::*;
 use uefi::proto::driver::{ComponentName, ComponentName2, LanguageError, LanguageIter};
 use uefi::{CStr16, Result};
 
-#[allow(deprecated)]
+#[expect(deprecated)]
 use uefi::proto::driver::ComponentName1;
 
 /// Generic interface for testing `ComponentName1`, `ComponentName2`, and
@@ -22,7 +22,7 @@ trait ComponentNameInterface: Sized {
     ) -> Result<&CStr16>;
 }
 
-#[allow(deprecated)]
+#[expect(deprecated)]
 impl ComponentNameInterface for ScopedProtocol<ComponentName1> {
     fn open(handle: Handle) -> Result<Self> {
         boot::open_protocol_exclusive::<ComponentName1>(handle)
@@ -140,7 +140,7 @@ fn test_component_name<C: ComponentNameInterface>(english: &str) {
 pub fn test() {
     info!("Running component name test");
 
-    #[allow(deprecated)]
+    #[expect(deprecated)]
     test_component_name::<ScopedProtocol<ComponentName1>>("eng");
     test_component_name::<ScopedProtocol<ComponentName2>>("en");
     test_component_name::<ComponentName>("en");
diff --git a/uefi/src/data_types/strs.rs b/uefi/src/data_types/strs.rs
@@ -1105,7 +1105,6 @@ mod tests {
 
     // Code generation helper for the compare tests of our CStrX types against "str" and "String"
     // from the standard library.
-    #[allow(non_snake_case)]
     macro_rules! test_compare_cstrX {
         ($input:ident) => {
             assert!($input.eq_str_until_nul(&"test"));
diff --git a/uefi/src/helpers/mod.rs b/uefi/src/helpers/mod.rs
@@ -44,7 +44,6 @@ mod println;
 /// # Panics
 ///
 /// This function may panic if called more than once.
-#[allow(clippy::missing_const_for_fn)]
 pub fn init() -> Result<()> {
     // Set up logging.
     #[cfg(feature = "logger")]
@@ -55,7 +54,6 @@ pub fn init() -> Result<()> {
     Ok(())
 }
 
-#[allow(clippy::missing_const_for_fn)]
 pub(crate) fn exit() {
     #[cfg(feature = "logger")]
     logger::disable();
diff --git a/uefi/src/mem/memory_map/impl_.rs b/uefi/src/mem/memory_map/impl_.rs
@@ -269,7 +269,6 @@ 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]>);
 
 impl MemoryMapBackingMemory {
diff --git a/uefi/src/proto/ata/pass_thru.rs b/uefi/src/proto/ata/pass_thru.rs
@@ -182,7 +182,7 @@ impl AtaDevice<'_> {
     /// - [`Status::UNSUPPORTED`] The host adapter does not support the command described by the ATA command.
     ///   The command was not sent, and no additional status information is available.
     /// - [`Status::TIMEOUT`] A timeout occurred while waiting for the ATA command to execute. Refer to `Asb` for additional status details.
-    #[allow(clippy::result_large_err)]
+    #[expect(clippy::result_large_err)]
     pub fn execute_command<'req>(
         &mut self,
         mut req: AtaRequest<'req>,
diff --git a/uefi/src/proto/console/gop.rs b/uefi/src/proto/console/gop.rs
@@ -455,7 +455,7 @@ impl ExactSizeIterator for ModeIter<'_> {}
 /// Format of pixel data used for blitting.
 ///
 /// This is a BGR 24-bit format with an 8-bit padding, to keep each pixel 32-bit in size.
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 #[derive(Debug, Copy, Clone)]
 #[repr(C)]
 pub struct BltPixel {
diff --git a/uefi/src/proto/console/text/input.rs b/uefi/src/proto/console/text/input.rs
@@ -118,7 +118,7 @@ newtype_enum! {
 /// Codes 0x8000 -> 0xFFFF are reserved for future OEM extensibility, therefore
 /// this C enum is _not_ safe to model as a Rust enum (where the compiler must
 /// know about all variants at compile time).
-pub enum ScanCode: u16 => #[allow(missing_docs)] {
+pub enum ScanCode: u16 => #[expect(missing_docs)] {
     /// Null scan code, indicates that the Unicode character should be used.
     NULL        = 0x00,
     /// Move cursor up 1 row.
diff --git a/uefi/src/proto/console/text/output.rs b/uefi/src/proto/console/text/output.rs
@@ -280,7 +280,7 @@ impl Iterator for OutputModeIter<'_> {
 ///
 /// All colors can be used as foreground colors.
 /// The first 8 colors can also be used as background colors.
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 #[derive(Debug, Copy, Clone)]
 pub enum Color {
     Black = 0,
diff --git a/uefi/src/proto/debug/context.rs b/uefi/src/proto/debug/context.rs
@@ -6,7 +6,7 @@
 /// Universal EFI_SYSTEM_CONTEXT definition
 /// This is passed to debug callbacks
 #[repr(C)]
-#[allow(missing_debug_implementations)]
+#[expect(missing_debug_implementations)]
 pub union SystemContext {
     ebc: *mut SystemContextEBC,
     riscv_32: *mut SystemContextRiscV32,
diff --git a/uefi/src/proto/driver/component_name.rs b/uefi/src/proto/driver/component_name.rs
@@ -194,7 +194,6 @@ impl ComponentName {
     ///
     /// [ISO 639-2]: https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes
     /// [RFC 4646]: https://www.rfc-editor.org/rfc/rfc4646
-    #[allow(clippy::missing_const_for_fn)] // false-positive since Rust 1.86
     pub fn supported_languages(&self) -> core::result::Result<LanguageIter<'_>, LanguageError> {
         match self {
             Self::V1(cn1) => cn1.supported_languages(),
diff --git a/uefi/src/proto/media/file/info.rs b/uefi/src/proto/media/file/info.rs
@@ -180,7 +180,7 @@ impl FileInfo {
     /// The buffer must be correctly aligned. You can query the required
     /// alignment using the `alignment()` method of the `Align` trait that this
     /// struct implements.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     pub fn new<'buf>(
         storage: &'buf mut [u8],
         file_size: u64,
diff --git a/uefi/src/proto/media/load_file.rs b/uefi/src/proto/media/load_file.rs
@@ -66,7 +66,7 @@ impl LoadFile {
     ///
     /// [`BootPolicy`]: uefi::proto::BootPolicy
     #[cfg(feature = "alloc")]
-    #[allow(clippy::extra_unused_lifetimes)] // false positive, it is used
+    #[expect(clippy::extra_unused_lifetimes)] // false positive, it is used
     pub fn load_file<'a>(
         &mut self,
         file_path: &DevicePath,
@@ -131,7 +131,7 @@ impl LoadFile2 {
     ///   read the current directory entry. BufferSize has been updated with the
     ///   size needed to complete the request.
     #[cfg(feature = "alloc")]
-    #[allow(clippy::extra_unused_lifetimes)] // false positive, it is used
+    #[expect(clippy::extra_unused_lifetimes)] // false positive, it is used
     pub fn load_file<'a>(&mut self, file_path: &DevicePath) -> Result<Box<[u8]>> {
         let fetch_data_fn = |buf: &'a mut [u8]| {
             let mut size = buf.len();
diff --git a/uefi/src/proto/media/partition.rs b/uefi/src/proto/media/partition.rs
@@ -226,7 +226,7 @@ newtype_enum! {
 /// Protocol for accessing partition information.
 ///
 /// [`Protocol`]: uefi::proto::Protocol
-#[allow(missing_debug_implementations)]
+#[expect(missing_debug_implementations)]
 #[repr(C)]
 #[repr(packed)]
 #[unsafe_protocol("8cf2f62c-bc9b-4821-808d-ec9ec421a1a0")]
diff --git a/uefi/src/proto/network/pxe.rs b/uefi/src/proto/network/pxe.rs
@@ -380,7 +380,7 @@ impl BaseCode {
     }
 
     /// Writes a UDP packet to the network interface.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     pub fn udp_write(
         &mut self,
         op_flags: UdpOpFlags,
@@ -443,7 +443,7 @@ impl BaseCode {
     ///   the provided buffer.
     /// - `header`: Optional header of the data inside `buffer`.
     /// - `buffer`: Buffer for the UDP packet's content.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     pub fn udp_read(
         &mut self,
         op_flags: UdpOpFlags,
@@ -555,7 +555,7 @@ impl BaseCode {
     }
 
     /// Updates the contents of the cached DHCP and Discover packets.
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     pub fn set_packets(
         &mut self,
         new_dhcp_discover_valid: Option<bool>,
@@ -1321,7 +1321,6 @@ pub struct ArpEntry {
 ///
 /// Corresponds to the `EFI_PXE_BASE_CODE_ROUTE_ENTRY` type in the C API.
 #[repr(C)]
-#[allow(missing_docs)]
 #[derive(Debug)]
 pub struct RouteEntry {
     /// IP address.
@@ -1336,7 +1335,7 @@ pub struct RouteEntry {
 ///
 /// Corresponds to the `EFI_PXE_BASE_CODE_ICMP_ERROR` type in the C API.
 #[repr(C)]
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 #[derive(Debug)]
 pub struct IcmpError {
     pub ty: u8,
@@ -1357,7 +1356,7 @@ impl core::error::Error for IcmpError {}
 /// Corresponds to the anonymous union inside
 /// `EFI_PXE_BASE_CODE_ICMP_ERROR` in the C API.
 #[repr(C)]
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 pub union IcmpErrorUnion {
     pub reserved: u32,
     pub mtu: u32,
@@ -1375,7 +1374,7 @@ impl Debug for IcmpErrorUnion {
 /// `EFI_PXE_BASE_CODE_ICMP_ERROR` in the C API.
 #[repr(C)]
 #[derive(Clone, Copy, Debug)]
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 pub struct IcmpErrorEcho {
     pub identifier: u16,
     pub sequence: u16,
@@ -1385,7 +1384,7 @@ pub struct IcmpErrorEcho {
 ///
 /// Corresponds to the `EFI_PXE_BASE_CODE_TFTP_ERROR` type in the C API.
 #[repr(C)]
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 #[derive(Debug)]
 pub struct TftpError {
     pub error_code: u8,
@@ -1401,7 +1400,7 @@ impl Display for TftpError {
 impl core::error::Error for TftpError {}
 
 /// Returned by [`BaseCode::tftp_read_dir`].
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 #[derive(Debug)]
 pub struct TftpFileInfo<'a> {
     pub filename: &'a CStr8,
@@ -1415,7 +1414,7 @@ pub struct TftpFileInfo<'a> {
 }
 
 /// Returned by [`BaseCode::mtftp_read_dir`].
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 #[derive(Debug)]
 pub struct MtftpFileInfo<'a> {
     pub filename: &'a CStr8,
diff --git a/uefi/src/proto/pci/enumeration.rs b/uefi/src/proto/pci/enumeration.rs
@@ -15,14 +15,14 @@ use crate::proto::device_path::{self, DevicePath, DevicePathUtilitiesError, Pool
 use super::PciIoAddress;
 use super::root_bridge::PciRootBridgeIo;
 
-#[allow(unused)]
+#[expect(unused)]
 #[derive(Clone, Copy, Debug)]
 struct PciRegister0 {
     vendor_id: u16,
     device_id: u16,
 }
 
-#[allow(unused)]
+#[expect(unused)]
 #[derive(Clone, Copy, Debug)]
 struct PciRegister2 {
     revision_id: u8,
@@ -31,7 +31,7 @@ struct PciRegister2 {
     class: u8,
 }
 
-#[allow(unused)]
+#[expect(unused)]
 #[derive(Clone, Copy, Debug)]
 struct PciRegister3 {
     cache_line_size: u8,
@@ -40,7 +40,7 @@ struct PciRegister3 {
     bist: u8,
 }
 
-#[allow(unused)]
+#[expect(unused)]
 #[derive(Clone, Copy, Debug)]
 struct PciHeader1Register6 {
     primary_bus: u8,
diff --git a/uefi/src/proto/pci/mod.rs b/uefi/src/proto/pci/mod.rs
@@ -134,7 +134,6 @@ impl PciIoUnit for u16 {}
 impl PciIoUnit for u32 {}
 impl PciIoUnit for u64 {}
 
-#[allow(dead_code)]
 enum PciIoMode {
     Normal,
     Fifo,
@@ -169,7 +168,7 @@ mod tests {
     use super::PciIoAddress;
 
     #[test]
-    #[allow(clippy::unusual_byte_groupings)]
+    #[expect(clippy::unusual_byte_groupings)]
     fn test_pci_ioaddr_raw_conversion() {
         assert_eq!(size_of::<u64>(), size_of::<PciIoAddress>());
         let srcaddr = PciIoAddress {
diff --git a/uefi/src/proto/tcg/v2.rs b/uefi/src/proto/tcg/v2.rs
@@ -243,11 +243,14 @@ fn u32_le_from_bytes_at_offset(bytes: &[u8], offset: usize) -> Option<u32> {
 ///
 /// Layout compatible with the C type `TCG_EfiSpecIDEventStruct`.
 #[derive(Clone, Debug)]
-#[allow(unused)] // We don't current access most of the fields.
+#[cfg_attr(not(test), expect(unused))] // needed for some fields
 struct EventLogHeader<'a> {
     platform_class: u32,
-    // major, minor, errata
-    spec_version: (u8, u8, u8),
+    spec_version: (
+        u8, /* major */
+        u8, /* minor */
+        u8, /* errata */
+    ),
     uintn_size: u8,
     algorithm_digest_sizes: AlgorithmDigestSizes<'a>,
     vendor_info: &'a [u8],
diff --git a/uefi/src/result/error.rs b/uefi/src/result/error.rs
@@ -36,7 +36,6 @@ impl<Data: Debug> Error<Data> {
     }
 
     /// Split this error into its inner status and error data
-    #[allow(clippy::missing_const_for_fn)]
     pub fn split(self) -> (Status, Data) {
         (self.status, self.data)
     }
diff --git a/uefi/src/runtime/time/mod.rs b/uefi/src/runtime/time/mod.rs
@@ -47,7 +47,7 @@ pub struct TimeParams {
 
 /// Error returned by [`Time`] methods. A bool value of `true` means
 /// the specified field is outside its valid range.
-#[allow(missing_docs)]
+#[expect(missing_docs)]
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub struct TimeError {
     pub year: bool,
diff --git a/uefi/src/system.rs b/uefi/src/system.rs
@@ -169,8 +169,8 @@ where
 mod tests {
     use super::*;
 
-    #[allow(dead_code)]
-    #[allow(clippy::assertions_on_constants)]
+    #[expect(dead_code)]
+    #[expect(clippy::assertions_on_constants)]
     fn with_config_table_compile_test() {
         assert!(false, "compile test only");
 
diff --git a/xtask/src/device_path/field.rs b/xtask/src/device_path/field.rs
diff --git a/xtask/src/disk.rs b/xtask/src/disk.rs
diff --git a/xtask/src/pipe.rs b/xtask/src/pipe.rs

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ impl From<bool> for Boolean {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`impl From<Boolean> for bool {`
`99`		`- #[allow(clippy::match_like_matches_macro)]`
	`99`	`+ #[expect(clippy::match_like_matches_macro)]`
`100`	`100`	`fn from(value: Boolean) -> Self {`
`101`	`101`	`// We handle it as in C: Any bit-pattern != 0 equals true`
`102`	`102`	`match value.0 {`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ mod global {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/// Simple test to ensure our custom allocator works with correct alignment.`
`110`		`- #[allow(dead_code)] // Ignore warning due to field not being read.`
	`110`	`+ #[expect(dead_code)] // Ignore warning due to field not being read.`
`111`	`111`	`pub fn alloc_alignment() {`
`112`	`112`	`{`
`113`	`113`	`info!("Allocating a structure with alignment of 0x100 using the global allocator");`