Merge pull request #1911 from hermit-os/comma-parens

style: remove commas before trailing parens

Author: mkroening

src/arch/aarch64/kernel/interrupts.rs

@@ -303,7 +303,7 @@ pub(crate) fn init() {
 	let layout = PageLayout::from_size_align(gicd_size.try_into().unwrap(), 0x10000).unwrap();
 	let page_range = KERNEL_FREE_LIST.lock().allocate(layout).unwrap();
 	let gicd_address = VirtAddr::from(page_range.start());
-	debug!("Mapping GIC Distributor interface to virtual address {gicd_address:p}",);
+	debug!("Mapping GIC Distributor interface to virtual address {gicd_address:p}");
 
 	let mut flags = PageTableEntryFlags::empty();
 	flags.device().writable().execute_disable();
@@ -317,7 +317,7 @@ pub(crate) fn init() {
 	let layout = PageLayout::from_size_align(gicr_size.try_into().unwrap(), 0x10000).unwrap();
 	let page_range = KERNEL_FREE_LIST.lock().allocate(layout).unwrap();
 	let gicr_address = VirtAddr::from(page_range.start());
-	debug!("Mapping generic interrupt controller to virtual address {gicr_address:p}",);
+	debug!("Mapping generic interrupt controller to virtual address {gicr_address:p}");
 	paging::map::<BasePageSize>(
 		gicr_address,
 		gicr_start,

src/arch/aarch64/kernel/processor.rs

@@ -223,7 +223,7 @@ pub fn seed_entropy() -> Option<[u8; 32]> {
 /// The halt function stops the processor until the next interrupt arrives
 pub fn halt() {
 	unsafe {
-		asm!("wfi", options(nostack, nomem),);
+		asm!("wfi", options(nostack, nomem));
 	}
 }
 

src/arch/aarch64/kernel/start.rs

@@ -247,7 +247,7 @@ unsafe extern "C" fn pre_init(boot_info: Option<&'static RawBootInfo>, cpu_id: u
 		);
 
 		// Memory barrier
-		asm!("dsb sy", options(nostack),);
+		asm!("dsb sy", options(nostack));
 	}
 
 	if cpu_id == 0 {

src/arch/aarch64/kernel/systemtime.rs

@@ -69,7 +69,7 @@ pub fn init() {
 				let page_range = KERNEL_FREE_LIST.lock().allocate(layout).unwrap();
 				let pl031_address = VirtAddr::from(page_range.start());
 				PL031_ADDRESS.set(pl031_address).unwrap();
-				debug!("Mapping RTC to virtual address {pl031_address:p}",);
+				debug!("Mapping RTC to virtual address {pl031_address:p}");
 
 				let mut flags = PageTableEntryFlags::empty();
 				flags.device().writable().execute_disable();

src/arch/aarch64/mod.rs

@@ -7,6 +7,6 @@ pub mod mm;
 pub(crate) fn memory_barrier() {
 	use core::arch::asm;
 	unsafe {
-		asm!("dmb ish", options(nostack, nomem, preserves_flags),);
+		asm!("dmb ish", options(nostack, nomem, preserves_flags));
 	}
 }

src/arch/x86_64/kernel/apic.rs

@@ -321,7 +321,7 @@ fn init_ioapic_address(phys_addr: PhysAddr) {
 		let page_range = KERNEL_FREE_LIST.lock().allocate(layout).unwrap();
 		let ioapic_address = VirtAddr::from(page_range.start());
 		IOAPIC_ADDRESS.set(ioapic_address).unwrap();
-		debug!("Mapping IOAPIC at {phys_addr:p} to virtual address {ioapic_address:p}",);
+		debug!("Mapping IOAPIC at {phys_addr:p} to virtual address {ioapic_address:p}");
 
 		let mut flags = PageTableEntryFlags::empty();
 		flags.device().writable().execute_disable();

src/arch/x86_64/mod.rs

@@ -29,6 +29,6 @@ pub(crate) fn swapgs(_stack_frame: &ExceptionStackFrame) {}
 pub(crate) fn memory_barrier() {
 	use core::arch::asm;
 	unsafe {
-		asm!("mfence", options(nostack, nomem, preserves_flags),);
+		asm!("mfence", options(nostack, nomem, preserves_flags));
 	}
 }

src/drivers/net/gem.rs

@@ -719,7 +719,7 @@ pub fn init_device(
 			// Get the supported Speed and Duplex
 			// TODO - Next Page does not seem to be emulated by QEMU
 
-			//info!("PHY auto-negotiation completed:\n Speed: {}\nDuplex", ,);
+			//info!("PHY auto-negotiation completed:\n Speed: {}\nDuplex");
 			debug!("PHY auto-negotiation completed: Partner Ability {partner_ability:x}");
 		}
 	}

src/fs/uhyve.rs

@@ -91,7 +91,7 @@ impl Drop for UhyveFileHandleInner {
 		uhyve_hypercall(Hypercall::FileClose(&mut close_params));
 		if close_params.ret != 0 {
 			let ret = close_params.ret; // circumvent packed field access
-			panic!("Can't close fd {} - return value {ret}", self.0,);
+			panic!("Can't close fd {} - return value {ret}", self.0);
 		}
 	}
 }

src/init_cell.rs

@@ -1,5 +1,5 @@
 #![cfg_attr(
-	not(any(feature = "vsock", feature = "fuse", feature = "console",)),
+	not(any(feature = "vsock", feature = "fuse", feature = "console")),
 	expect(dead_code)
 )]