Skip to content

Commit d2980f6

Browse files
authored
Merge pull request #2020 from hermit-os/mmio-console-clippy
fix(virtio-console/mmio): clippy
2 parents ce6f328 + 7c48527 commit d2980f6

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/drivers/console/mmio.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ impl VirtioConsoleDriver {
5858
irq: InterruptLine,
5959
) -> Result<VirtioConsoleDriver, VirtioError> {
6060
let mut drv = VirtioConsoleDriver::new(dev_id, registers, irq)?;
61-
drv.init_dev()
62-
.map_err(|error_code| VirtioError::ConsoleDriver(error_code))?;
61+
drv.init_dev().map_err(VirtioError::ConsoleDriver)?;
6362
Ok(drv)
6463
}
6564
}

src/drivers/virtio/transport/mmio.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ pub(crate) fn init_device(
407407
info!("Virtio console driver initialized.");
408408

409409
crate::arch::interrupts::add_irq_name(irq_no, "virtio");
410-
info!("Virtio interrupt handler at line {}", irq_no);
410+
info!("Virtio interrupt handler at line {irq_no}");
411411

412412
Ok(VirtioDriver::Console(Box::new(virt_console_drv)))
413413
}
@@ -422,7 +422,7 @@ pub(crate) fn init_device(
422422
info!("Virtio sock driver initialized.");
423423

424424
crate::arch::interrupts::add_irq_name(irq_no, "virtio");
425-
info!("Virtio interrupt handler at line {}", irq_no);
425+
info!("Virtio interrupt handler at line {irq_no}");
426426

427427
Ok(VirtioDriver::Vsock(virt_vsock_drv))
428428
}

0 commit comments

Comments
 (0)