Fix clippy warnings

Signed-off-by: Ethin Probst <ethindp@protonmail.com>

acpi/src/fadt.rs

@@ -167,7 +167,7 @@ impl Fadt {
     pub fn pm1a_event_block(&self) -> Result<GenericAddress, AcpiError> {
         if let Some(raw) = unsafe { self.x_pm1a_event_block.access(self.header().revision) } {
             if raw.address != 0x0 {
-                return Ok(GenericAddress::from_raw(raw)?);
+                return GenericAddress::from_raw(raw);
             }
         }
 
@@ -203,7 +203,7 @@ impl Fadt {
     pub fn pm1a_control_block(&self) -> Result<GenericAddress, AcpiError> {
         if let Some(raw) = unsafe { self.x_pm1a_control_block.access(self.header().revision) } {
             if raw.address != 0x0 {
-                return Ok(GenericAddress::from_raw(raw)?);
+                return GenericAddress::from_raw(raw);
             }
         }
 
@@ -507,3 +507,4 @@ impl ArmBootArchFlags {
         self.0.get_bit(1)
     }
 }
+

acpi/src/lib.rs

@@ -116,7 +116,7 @@ where
     /// Create an `AcpiTables` if you have the physical address of the RSDP.
     pub unsafe fn from_rsdp(handler: H, rsdp_address: usize) -> Result<AcpiTables<H>, AcpiError> {
         let rsdp_mapping = unsafe { handler.map_physical_region::<Rsdp>(rsdp_address, mem::size_of::<Rsdp>()) };
-        rsdp_mapping.validate().map_err(|err| AcpiError::Rsdp(err))?;
+        rsdp_mapping.validate().map_err(AcpiError::Rsdp)?;
 
         Self::from_validated_rsdp(handler, rsdp_mapping)
     }
@@ -125,8 +125,7 @@ where
     /// work on UEFI platforms. See [Rsdp::search_for_rsdp_bios](rsdp_search::Rsdp::search_for_rsdp_bios) for
     /// details.
     pub unsafe fn search_for_rsdp_bios(handler: H) -> Result<AcpiTables<H>, AcpiError> {
-        let rsdp_mapping =
-            unsafe { Rsdp::search_for_on_bios(handler.clone()) }.map_err(|err| AcpiError::Rsdp(err))?;
+        let rsdp_mapping = unsafe { Rsdp::search_for_on_bios(handler.clone()) }.map_err(AcpiError::Rsdp)?;
         Self::from_validated_rsdp(handler, rsdp_mapping)
     }
 
@@ -176,7 +175,7 @@ where
                 ((mapping.virtual_start().as_ptr() as usize) + mem::size_of::<SdtHeader>()) as *const u32;
 
             for i in 0..num_tables {
-                result.process_sdt(unsafe { *tables_base.offset(i as isize) as usize })?;
+                result.process_sdt(unsafe { *tables_base.add(i) as usize })?;
             }
         } else {
             /*
@@ -189,7 +188,7 @@ where
                 ((mapping.virtual_start().as_ptr() as usize) + mem::size_of::<SdtHeader>()) as *const u64;
 
             for i in 0..num_tables {
-                result.process_sdt(unsafe { *tables_base.offset(i as isize) as usize })?;
+                result.process_sdt(unsafe { *tables_base.add(i) as usize })?;
             }
         }
 
@@ -215,7 +214,7 @@ where
 
         match header.signature {
             Signature::FADT => {
-                use fadt::Fadt;
+                use crate::fadt::Fadt;
 
                 /*
                  * For whatever reason, they chose to put the DSDT inside the FADT, instead of just listing it

acpi/src/madt.rs

@@ -125,7 +125,7 @@ impl Madt {
 
         for entry in self.entries() {
             match entry {
-                MadtEntry::LocalApic(ref entry) => {
+                MadtEntry::LocalApic(entry) => {
                     /*
                      * The first processor is the BSP. Subsequent ones are APs. If we haven't found
                      * the BSP yet, this must be it.
@@ -153,7 +153,7 @@ impl Madt {
                     }
                 }
 
-                MadtEntry::IoApic(ref entry) => {
+                MadtEntry::IoApic(entry) => {
                     io_apics.push(IoApic {
                         id: entry.io_apic_id,
                         address: entry.io_apic_address,
@@ -161,7 +161,7 @@ impl Madt {
                     });
                 }
 
-                MadtEntry::InterruptSourceOverride(ref entry) => {
+                MadtEntry::InterruptSourceOverride(entry) => {
                     if entry.bus != 0 {
                         return Err(AcpiError::InvalidMadt(MadtError::InterruptOverrideEntryHasInvalidBus));
                     }
@@ -176,7 +176,7 @@ impl Madt {
                     });
                 }
 
-                MadtEntry::NmiSource(ref entry) => {
+                MadtEntry::NmiSource(entry) => {
                     let (polarity, trigger_mode) = parse_mps_inti_flags(entry.flags)?;
 
                     nmi_sources.push(NmiSource {
@@ -186,7 +186,7 @@ impl Madt {
                     });
                 }
 
-                MadtEntry::LocalApicNmi(ref entry) => local_apic_nmi_lines.push(NmiLine {
+                MadtEntry::LocalApicNmi(entry) => local_apic_nmi_lines.push(NmiLine {
                     processor: if entry.processor_id == 0xff {
                         NmiProcessor::All
                     } else {
@@ -199,7 +199,7 @@ impl Madt {
                     },
                 }),
 
-                MadtEntry::LocalApicAddressOverride(ref entry) => {
+                MadtEntry::LocalApicAddressOverride(entry) => {
                     local_apic_address = entry.local_apic_address;
                 }
 
@@ -224,7 +224,7 @@ impl Madt {
 
     pub fn entries(&self) -> MadtEntryIter {
         MadtEntryIter {
-            pointer: unsafe { (self as *const Madt as *const u8).offset(mem::size_of::<Madt>() as isize) },
+            pointer: unsafe { (self as *const Madt as *const u8).add(mem::size_of::<Madt>()) },
             remaining_length: self.header.length - mem::size_of::<Madt>() as u32,
             _phantom: PhantomData,
         }

acpi/src/mcfg.rs

@@ -22,7 +22,7 @@ impl PciConfigRegions {
                 .get_sdt::<Mcfg>(crate::sdt::Signature::MCFG)?
                 .ok_or(AcpiError::TableMissing(crate::sdt::Signature::MCFG))?
         };
-        Ok(PciConfigRegions { regions: mcfg.entries().iter().map(|&entry| entry).collect() })
+        Ok(PciConfigRegions { regions: mcfg.entries().iter().copied().collect() })
     }
 
     /// Get the physical address of the start of the configuration space for a given PCIe device
@@ -67,8 +67,7 @@ impl Mcfg {
         let num_entries = length / mem::size_of::<McfgEntry>();
 
         unsafe {
-            let pointer =
-                (self as *const Mcfg as *const u8).offset(mem::size_of::<Mcfg>() as isize) as *const McfgEntry;
+            let pointer = (self as *const Mcfg as *const u8).add(mem::size_of::<Mcfg>()) as *const McfgEntry;
             slice::from_raw_parts(pointer, num_entries)
         }
     }

acpi/src/platform/mod.rs

@@ -1,7 +1,14 @@
 pub mod address;
 pub mod interrupt;
 
-use crate::{fadt::Fadt, madt::Madt, AcpiError, AcpiHandler, AcpiTables, PowerProfile};
+use crate::{
+    fadt::Fadt,
+    madt::Madt,
+    AcpiError,
+    AcpiHandler,
+    AcpiTables,
+    PowerProfile,
+};
 use address::GenericAddress;
 use alloc::vec::Vec;
 use interrupt::InterruptModel;
@@ -51,7 +58,10 @@ pub struct PmTimer {
 impl PmTimer {
     pub fn new(fadt: &Fadt) -> Result<Option<PmTimer>, AcpiError> {
         match fadt.pm_timer_block()? {
-            Some(base) => Ok(Some(PmTimer { base, supports_32bit: { fadt.flags }.pm_timer_is_32_bit() })),
+            Some(base) => Ok(Some(PmTimer {
+                base,
+                supports_32bit: {fadt.flags}.pm_timer_is_32_bit(),
+            })),
             None => Ok(None),
         }
     }

acpi/src/sdt.rs

@@ -26,74 +26,74 @@ impl<T: Copy, const MIN_REVISION: u8> ExtendedField<T, MIN_REVISION> {
 /// The ACPI Spec (Version 6.4) defines the following SDT signatures:
 ///
 /// * APIC - Multiple APIC Description Table (MADT)
-/// *BERT - Boot Error Record Table
-/// *BGRT - Boot Graphics Resource Table
-/// *CPEP - Corrected Platform Error Polling Table
-/// *DSDT - Differentiated System Description Table (DSDT)
-/// *ECDT - Embedded Controller Boot Resources Table
-/// *EINJ - Error Injection Table
-/// *ERST - Error Record Serialization Table
-/// *FACP - Fixed ACPI Description Table (FADT)
-/// *FACS - Firmware ACPI Control Structure
-/// *FPDT - Firmware Performance Data Table
-/// *GTDT - Generic Timer Description Table
-/// *HEST - Hardware Error Source Table
-/// *MSCT - Maximum System Characteristics Table
-/// *MPST - Memory Power StateTable
-/// *NFIT - NVDIMM Firmware Interface Table
-/// *OEMx - OEM Specific Information Tables
-/// *PCCT - Platform Communications Channel Table
-/// *PHAT - Platform Health Assessment Table
-/// *PMTT - Platform Memory Topology Table
-/// *PSDT - Persistent System Description Table
-/// *RASF - ACPI RAS Feature Table
-/// *RSDT - Root System Description Table
-/// *SBST - Smart Battery Specification Table
-/// *SDEV - Secure DEVices Table
-/// *SLIT - System Locality Distance Information Table
-/// *SRAT - System Resource Affinity Table
-/// *SSDT - Secondary System Description Table
-/// *XSDT - Extended System Description Table
+/// * BERT - Boot Error Record Table
+/// * BGRT - Boot Graphics Resource Table
+/// * CPEP - Corrected Platform Error Polling Table
+/// * DSDT - Differentiated System Description Table (DSDT)
+/// * ECDT - Embedded Controller Boot Resources Table
+/// * EINJ - Error Injection Table
+/// * ERST - Error Record Serialization Table
+/// * FACP - Fixed ACPI Description Table (FADT)
+/// * FACS - Firmware ACPI Control Structure
+/// * FPDT - Firmware Performance Data Table
+/// * GTDT - Generic Timer Description Table
+/// * HEST - Hardware Error Source Table
+/// * MSCT - Maximum System Characteristics Table
+/// * MPST - Memory Power StateTable
+/// * NFIT - NVDIMM Firmware Interface Table
+/// * OEMx - OEM Specific Information Tables
+/// * PCCT - Platform Communications Channel Table
+/// * PHAT - Platform Health Assessment Table
+/// * PMTT - Platform Memory Topology Table
+/// * PSDT - Persistent System Description Table
+/// * RASF - ACPI RAS Feature Table
+/// * RSDT - Root System Description Table
+/// * SBST - Smart Battery Specification Table
+/// * SDEV - Secure DEVices Table
+/// * SLIT - System Locality Distance Information Table
+/// * SRAT - System Resource Affinity Table
+/// * SSDT - Secondary System Description Table
+/// * XSDT - Extended System Description Table
 ///
 /// Acpi reserves the following signatures and the specifications for them can be found [here](https://uefi.org/acpi):
 ///
-/// *AEST - ARM Error Source Table
-/// *BDAT - BIOS Data ACPI Table
-/// *CDIT - Component Distance Information Table
-/// *CEDT - CXL Early Discovery Table
-/// *CRAT - Component Resource Attribute Table
-/// *CSRT - Core System Resource Table
-/// *DBGP - Debug Port Table
-/// *DBG2 - Debug Port Table 2 (note: ACPI 6.4 defines this as "DBPG2" but this is incorrect)
-/// *DMAR - DMA Remapping Table
-/// *DRTM -Dynamic Root of Trust for Measurement Table
-/// *ETDT - Event Timer Description Table (obsolete, superseeded by HPET)
-/// *HPET - IA-PC High Precision Event Timer Table
-/// *IBFT - iSCSI Boot Firmware Table
-/// *IORT - I/O Remapping Table
-/// *IVRS - I/O Virtualization Reporting Structure
-/// *LPIT - Low Power Idle Table
-/// *MCFG - PCI Express Memory-mapped Configuration Space base address description table
-/// *MCHI - Management Controller Host Interface table
-/// *MPAM - ARM Memory Partitioning And Monitoring table
-/// *MSDM - Microsoft Data Management Table
-/// *PRMT - Platform Runtime Mechanism Table
-/// *RGRT - Regulatory Graphics Resource Table
-/// *SDEI - Software Delegated Exceptions Interface table
-/// *SLIC - Microsoft Software Licensing table
-/// *SPCR - Microsoft Serial Port Console Redirection table
-/// *SPMI - Server Platform Management Interface table
-/// *STAO - _STA Override table
-/// *SVKL - Storage Volume Key Data table (Intel TDX only)
-/// *TCPA - Trusted Computing Platform Alliance Capabilities Table
-/// *TPM2 - Trusted Platform Module 2 Table
-/// *UEFI - Unified Extensible Firmware Interface Specification table
-/// *WAET - Windows ACPI Emulated Devices Table
-/// *WDAT - Watch Dog Action Table
-/// *WDRT - Watchdog Resource Table
-/// *WPBT - Windows Platform Binary Table
-/// *WSMT - Windows Security Mitigations Table
-/// *XENV - Xen Project
+/// * AEST - ARM Error Source Table
+/// * BDAT - BIOS Data ACPI Table
+/// * CDIT - Component Distance Information Table
+/// * CEDT - CXL Early Discovery Table
+/// * CRAT - Component Resource Attribute Table
+/// * CSRT - Core System Resource Table
+/// * DBGP - Debug Port Table
+/// * DBG2 - Debug Port Table 2 (note: ACPI 6.4 defines this as "DBPG2" but this is incorrect)
+/// * DMAR - DMA Remapping Table
+/// * DRTM -Dynamic Root of Trust for Measurement Table
+/// * ETDT - Event Timer Description Table (obsolete, superseeded by HPET)
+/// * HPET - IA-PC High Precision Event Timer Table
+/// * IBFT - iSCSI Boot Firmware Table
+/// * IORT - I/O Remapping Table
+/// * IVRS - I/O Virtualization Reporting Structure
+/// * LPIT - Low Power Idle Table
+/// * MCFG - PCI Express Memory-mapped Configuration Space base address description table
+/// * MCHI - Management Controller Host Interface table
+/// * MPAM - ARM Memory Partitioning And Monitoring table
+/// * MSDM - Microsoft Data Management Table
+/// * PRMT - Platform Runtime Mechanism Table
+/// * RGRT - Regulatory Graphics Resource Table
+/// * SDEI - Software Delegated Exceptions Interface table
+/// * SLIC - Microsoft Software Licensing table
+/// * SPCR - Microsoft Serial Port Console Redirection table
+/// * SPMI - Server Platform Management Interface table
+/// * STAO - _STA Override table
+/// * SVKL - Storage Volume Key Data table (Intel TDX only)
+/// * TCPA - Trusted Computing Platform Alliance Capabilities Table
+/// * TPM2 - Trusted Platform Module 2 Table
+/// * UEFI - Unified Extensible Firmware Interface Specification table
+/// * WAET - Windows ACPI Emulated Devices Table
+/// * WDAT - Watch Dog Action Table
+/// * WDRT - Watchdog Resource Table
+/// * WPBT - Windows Platform Binary Table
+/// * WSMT - Windows Security Mitigations Table
+/// * XENV - Xen Project
 #[derive(Clone, Copy)]
 #[repr(C, packed)]
 pub struct SdtHeader {
@@ -144,12 +144,12 @@ impl SdtHeader {
         Ok(())
     }
 
-    pub fn oem_id<'a>(&'a self) -> &'a str {
+    pub fn oem_id(&self) -> &str {
         // Safe to unwrap because checked in `validate`
         str::from_utf8(&self.oem_id).unwrap()
     }
 
-    pub fn oem_table_id<'a>(&'a self) -> &'a str {
+    pub fn oem_table_id(&self) -> &str {
         // Safe to unwrap because checked in `validate`
         str::from_utf8(&self.oem_table_id).unwrap()
     }
@@ -251,5 +251,5 @@ where
 {
     let mapping =
         unsafe { handler.map_physical_region::<SdtHeader>(physical_address, mem::size_of::<SdtHeader>()) };
-    (*mapping).clone()
+    *mapping
 }

rsdp/src/lib.rs

@@ -88,10 +88,10 @@ impl Rsdp {
 
                 for address in area.clone().step_by(16) {
                     let ptr_in_mapping =
-                        unsafe { mapping.virtual_start().as_ptr().offset((address - area.start) as isize) };
+                        unsafe { mapping.virtual_start().as_ptr().add(address - area.start) };
                     let signature = unsafe { *(ptr_in_mapping as *const [u8; 8]) };
 
-                    if signature == *RSDP_SIGNATURE {
+                    if signature == RSDP_SIGNATURE {
                         match unsafe { *(ptr_in_mapping as *const Rsdp) }.validate() {
                             Ok(()) => {
                                 rsdp_address = Some(address);
@@ -123,7 +123,7 @@ impl Rsdp {
         const RSDP_V1_LENGTH: usize = 20;
 
         // Check the signature
-        if &self.signature != RSDP_SIGNATURE {
+        if self.signature != RSDP_SIGNATURE {
             return Err(RsdpError::IncorrectSignature);
         }
 
@@ -213,4 +213,4 @@ const RSDP_BIOS_AREA_START: usize = 0xe0000;
 /// The end of the main BIOS area below 1mb in which to search for the RSDP (Root System Description Pointer)
 const RSDP_BIOS_AREA_END: usize = 0xfffff;
 /// The RSDP (Root System Description Pointer)'s signature, "RSD PTR " (note trailing space)
-const RSDP_SIGNATURE: &'static [u8; 8] = b"RSD PTR ";
+const RSDP_SIGNATURE: [u8; 8] = *b"RSD PTR ";

rustfmt.toml

@@ -1,7 +1,7 @@
 unstable_features = true
 edition = "2018"
 
-merge_imports = true
+imports_granularity='Crate'
 imports_layout = "HorizontalVertical"
 use_field_init_shorthand = true
 use_try_shorthand = true