fix clippy

Author: lgfa29

bin/propolis-server/src/lib/initializer.rs

@@ -915,13 +915,12 @@ impl MachineInitializer<'_> {
         //
         // NOTE: SoftNpu squats on com4.
         let uart = LpcUart::new(
-            chipset.irq_pin(ibmpc::IRQ_COM4).unwrap(),
-            ibmpc::PORT_COM4,
-            ibmpc::IRQ_COM4,
             "COM4",
+            ibmpc::IRQ_COM4,
+            chipset.irq_pin(ibmpc::IRQ_COM4).unwrap(),
         );
         uart.set_autodiscard(true);
-        uart.attach(&self.machine.bus_pio);
+        uart.attach(&self.machine.bus_pio, ibmpc::PORT_COM4);
         self.devices
             .insert(SpecKey::Name("softnpu-uart".to_string()), uart.clone());
 

lib/propolis/src/firmware/acpi/dsdt.rs

@@ -450,8 +450,7 @@ struct PciRootBridgePrt {}
 
 impl Aml for PciRootBridgePrt {
     fn to_aml_bytes(&self, sink: &mut dyn AmlSink) {
-        let sources =
-            vec!["^LPC_.LNKA", "^LPC_.LNKB", "^LPC_.LNKC", "^LPC_.LNKD"];
+        let sources = ["^LPC_.LNKA", "^LPC_.LNKB", "^LPC_.LNKC", "^LPC_.LNKD"];
         let sources_len: u8 = sources.len() as u8;
 
         let mut ptr_entries = Vec::new();
@@ -1115,7 +1114,7 @@ impl Aml for Byte {
 }
 
 #[cfg(test)]
-mod tests {
+mod test {
     use super::*;
 
     struct MockDsdtGenerator {

lib/propolis/src/firmware/acpi/fadt.rs

@@ -89,18 +89,18 @@ impl Aml for Fadt {
 
         fadt.sci_int = (SCI_IRQ as u16).into();
         fadt.smi_cmd = 0xb2.into();
-        fadt.acpi_enable = 0xf1.into();
-        fadt.acpi_disable = 0xf0.into();
+        fadt.acpi_enable = 0xf1;
+        fadt.acpi_disable = 0xf0;
 
         fadt.pm1a_evt_blk = PM1A_EVT_BLK_ADDR.into();
         fadt.pm1a_cnt_blk = PM1A_CNT_BLK_ADDR.into();
         fadt.pm_tmr_blk = PM_TMR_BLK_ADDR.into();
         fadt.gpe0_blk = GPE0_BLK_ADDR.into();
 
-        fadt.pm1_evt_len = PM1A_EVT_BLK_LEN.into();
-        fadt.pm1_cnt_len = PM1A_CNT_BLK_LEN.into();
-        fadt.pm_tmr_len = PM_TMR_BLK_LEN.into();
-        fadt.gpe0_blk_len = GPE0_BLK_LEN.into();
+        fadt.pm1_evt_len = PM1A_EVT_BLK_LEN;
+        fadt.pm1_cnt_len = PM1A_CNT_BLK_LEN;
+        fadt.pm_tmr_len = PM_TMR_BLK_LEN;
+        fadt.gpe0_blk_len = GPE0_BLK_LEN;
 
         fadt.p_lvl2_lat = 101.into();
         fadt.p_lvl3_lat = 1001.into();

lib/propolis/src/hw/uart/lpc.rs

@@ -229,6 +229,7 @@ impl Aml for LpcUart {
             None => return, // Device is not attached to any port.
         };
 
+        #[allow(clippy::wildcard_in_or_patterns)]
         let uid: u32 = match self.name {
             "COM1" => 1,
             "COM2" => 2,