Merge pull request #792 from mkroening/inline-fmt

Inline format strings variables

Author: mkroening

src/arch/aarch64/mm/paging.rs

@@ -152,8 +152,7 @@ impl PageTableEntry {
 		assert_eq!(
 			physical_address % BasePageSize::SIZE,
 			0,
-			"Physical address is not on a 4 KiB page boundary (physical_address = {:p})",
-			physical_address
+			"Physical address is not on a 4 KiB page boundary (physical_address = {physical_address:p})"
 		);
 
 		let mut flags_to_set = flags;
@@ -256,8 +255,7 @@ impl<S: PageSize> Page<S> {
 	fn including_address(virtual_address: VirtAddr) -> Self {
 		assert!(
 			Self::is_valid_address(virtual_address),
-			"Virtual address {:p} is invalid",
-			virtual_address
+			"Virtual address {virtual_address:p} is invalid"
 		);
 
 		Self {

src/arch/aarch64/mm/physicalmem.rs

@@ -67,9 +67,7 @@ pub fn allocate_aligned(size: usize, alignment: usize) -> Result<PhysAddr, Alloc
 	assert_eq!(
 		size % alignment,
 		0,
-		"Size {:#X} is not a multiple of the given alignment {:#X}",
-		size,
-		alignment
+		"Size {size:#X} is not a multiple of the given alignment {alignment:#X}"
 	);
 	assert_eq!(
 		alignment % BasePageSize::SIZE as usize,
@@ -93,8 +91,7 @@ pub fn allocate_aligned(size: usize, alignment: usize) -> Result<PhysAddr, Alloc
 pub fn deallocate(physical_address: PhysAddr, size: usize) {
 	assert!(
 		physical_address >= PhysAddr(mm::kernel_end_address().as_u64()),
-		"Physical address {:p} is not >= KERNEL_END_ADDRESS",
-		physical_address
+		"Physical address {physical_address:p} is not >= KERNEL_END_ADDRESS"
 	);
 	assert!(size > 0);
 	assert_eq!(

src/arch/aarch64/mm/virtualmem.rs

@@ -57,9 +57,7 @@ pub fn allocate_aligned(size: usize, alignment: usize) -> Result<VirtAddr, Alloc
 	assert_eq!(
 		size % alignment,
 		0,
-		"Size {:#X} is not a multiple of the given alignment {:#X}",
-		size,
-		alignment
+		"Size {size:#X} is not a multiple of the given alignment {alignment:#X}"
 	);
 	assert_eq!(
 		alignment % BasePageSize::SIZE as usize,
@@ -81,13 +79,11 @@ pub fn allocate_aligned(size: usize, alignment: usize) -> Result<VirtAddr, Alloc
 pub fn deallocate(virtual_address: VirtAddr, size: usize) {
 	assert!(
 		virtual_address >= mm::kernel_end_address() || virtual_address < mm::kernel_start_address(),
-		"Virtual address {:p} belongs to the kernel",
-		virtual_address
+		"Virtual address {virtual_address:p} belongs to the kernel"
 	);
 	assert!(
 		virtual_address < KERNEL_VIRTUAL_MEMORY_END,
-		"Virtual address {:p} is not < KERNEL_VIRTUAL_MEMORY_END",
-		virtual_address
+		"Virtual address {virtual_address:p} is not < KERNEL_VIRTUAL_MEMORY_END"
 	);
 	assert_eq!(
 		virtual_address % BasePageSize::SIZE,

src/drivers/pci.rs

@@ -397,7 +397,7 @@ impl<T: ConfigRegionAccess> fmt::Display for PciDevice<T> {
 			// If the devices uses an IRQ, output this one as well.
 			let (_, irq) = endpoint.interrupt(&self.access);
 			if irq != 0 && irq != u8::MAX {
-				write!(f, ", IRQ {}", irq)?;
+				write!(f, ", IRQ {irq}")?;
 			}
 
 			let mut slot: u8 = 0;
@@ -409,18 +409,18 @@ impl<T: ConfigRegionAccess> fmt::Display for PciDevice<T> {
 							size,
 							prefetchable,
 						} => {
-							write!(f, ", BAR{} Memory64 {{ address: {:#X}, size: {:#X}, prefetchable: {} }}", slot, address, size, prefetchable)?;
+							write!(f, ", BAR{slot} Memory64 {{ address: {address:#X}, size: {size:#X}, prefetchable: {prefetchable} }}")?;
 							slot += 1;
 						}
 						Bar::Memory32 {
 							address,
 							size,
 							prefetchable,
 						} => {
-							write!(f, ", BAR{} Memory32 {{ address: {:#X}, size: {:#X}, prefetchable: {} }}", slot, address, size, prefetchable)?;
+							write!(f, ", BAR{slot} Memory32 {{ address: {address:#X}, size: {size:#X}, prefetchable: {prefetchable} }}")?;
 						}
 						Bar::Io { port } => {
-							write!(f, ", BAR{} IO {{ port: {:#X} }}", slot, port)?;
+							write!(f, ", BAR{slot} IO {{ port: {port:#X} }}")?;
 						}
 					}
 				}

src/lib.rs

@@ -4,6 +4,7 @@
 
 #![warn(rust_2018_idioms)]
 #![warn(unsafe_op_in_unsafe_fn)]
+#![warn(clippy::uninlined_format_args)]
 #![warn(clippy::transmute_ptr_to_ptr)]
 #![allow(clippy::missing_safety_doc)]
 #![cfg_attr(target_arch = "aarch64", allow(incomplete_features))]