Merge pull request #1914 from hermit-os/match_same_arms

fix: enable clippy::match_same_arms

Author: mkroening

Cargo.toml

@@ -94,6 +94,7 @@ implicit_clone = "warn"
 inconsistent_struct_constructor = "warn"
 manual_assert = "warn"
 manual_let_else = "warn"
+match_same_arms = "warn"
 match_wildcard_for_single_variants = "warn"
 ptr_as_ptr = "warn"
 ptr_cast_constness = "warn"

src/arch/riscv64/kernel/devicetree.rs

@@ -108,8 +108,9 @@ pub fn init_drivers() {
 
 				// TODO: Determine correct context via devicetree and allow more than one context
 				match PLATFORM_MODEL {
-					Model::Virt => init_plic(plic_region.starting_address as usize, 1),
-					Model::Unknown => init_plic(plic_region.starting_address as usize, 1),
+					Model::Virt | Model::Unknown => {
+						init_plic(plic_region.starting_address as usize, 1);
+					}
 					Model::Fux40 => init_plic(plic_region.starting_address as usize, 2),
 				}
 			}

src/arch/x86_64/kernel/mod.rs

@@ -82,8 +82,8 @@ pub fn is_uhyve_with_pci() -> bool {
 
 pub fn args() -> Option<&'static str> {
 	match env::boot_info().platform_info {
-		PlatformInfo::Multiboot { command_line, .. } => command_line,
-		PlatformInfo::LinuxBootParams { command_line, .. } => command_line,
+		PlatformInfo::Multiboot { command_line, .. }
+		| PlatformInfo::LinuxBootParams { command_line, .. } => command_line,
 		_ => None,
 	}
 }

src/drivers/net/gem.rs

@@ -673,8 +673,7 @@ pub fn init_device(
 			warn! {"No PHY address provided. Trying to find PHY ..."}
 			for i in 0..32 {
 				match phy_read(gem, i, PhyReg::Control) {
-					0xffff => (), //Invalid
-					0x0 => (),    //Invalid
+					0xffff | 0x0 => (), //Invalid
 					_ => {
 						phy_addr = i;
 						warn!("PHY found with address {phy_addr}");