Merge pull request #1199 from hermit-os/clippy-mmio

fix(xtask): run clippy on virtio-mmio configurations
hermit-os · May 15, 2024 · 7414622 · 7414622
2 parents aa951c1 + 9a61d3d
commit 7414622
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/arch/riscv64/kernel/devicetree.rs b/src/arch/riscv64/kernel/devicetree.rs
@@ -220,7 +220,7 @@ pub fn init_drivers() {
 						if let Ok(VirtioDriver::Network(drv)) =
 							mmio_virtio::init_device(mmio, irq.try_into().unwrap())
 						{
-							mmio::register_driver(MmioDriver::VirtioNet(
+							register_driver(MmioDriver::VirtioNet(
 								hermit_sync::InterruptSpinMutex::new(drv),
 							))
 						}

diff --git a/src/arch/x86_64/kernel/mmio.rs b/src/arch/x86_64/kernel/mmio.rs
@@ -196,7 +196,7 @@ fn guess_device() -> Result<(&'static mut MmioRegisterLayout, u8), &'static str>
 fn detect_network() -> Result<(&'static mut MmioRegisterLayout, u8), &'static str> {
 	let linux_mmio = env::mmio();
 
-	if linux_mmio.len() > 0 {
+	if !linux_mmio.is_empty() {
 		check_linux_args(linux_mmio)
 	} else {
 		guess_device()

diff --git a/xtask/src/clippy.rs b/xtask/src/clippy.rs
@@ -20,6 +20,10 @@ impl Clippy {
 			cmd!(sh, "cargo clippy --target={triple}")
 				.arg("--no-default-features")
 				.run()?;
+			cmd!(sh, "cargo clippy --target={triple}")
+				.arg("--no-default-features")
+				.arg("--features=fs,tcp")
+				.run()?;
 			cmd!(sh, "cargo clippy --target={triple}")
 				.arg("--no-default-features")
 				.arg("--features=acpi,fsgsbase,pci,smp,vga")