Merge pull request #2180 from hermit-os/format-args

fix: tag all format-like macros with `#[clippy::format_args]`

Author: mkroening

hermit-macro/src/lib.rs

@@ -2,6 +2,7 @@ use proc_macro::TokenStream;
 use quote::ToTokens;
 use syn::parse_macro_input;
 
+#[clippy::format_args]
 macro_rules! bail {
     ($span:expr, $($tt:tt)*) => {
         return Err(syn::Error::new_spanned($span, format!($($tt)*)))

src/arch/aarch64/kernel/processor.rs

@@ -331,9 +331,10 @@ pub fn print_information() {
 	let fdt = env::fdt().unwrap();
 	let cpu0 = fdt.cpus().next().unwrap();
 	let cpu0_compatible = cpu0.property("compatible").unwrap().as_str().unwrap();
+	let cpu_freq = &*CPU_FREQUENCY;
 
 	infoheader!(" CPU INFORMATION ");
-	infoentry!("Processor compatibility", cpu0_compatible);
-	infoentry!("Counter frequency", *CPU_FREQUENCY);
+	infoentry!("Processor compatibility", "{cpu0_compatible}");
+	infoentry!("Counter frequency", "{cpu_freq}");
 	infofooter!();
 }

src/arch/x86_64/kernel/apic.rs

@@ -995,14 +995,13 @@ fn local_apic_write(x2apic_msr: u32, value: u64) {
 
 pub fn print_information() {
 	infoheader!(" MULTIPROCESSOR INFORMATION ");
-	infoentry!(
-		"APIC in use",
-		if processor::supports_x2apic() {
-			"x2APIC"
-		} else {
-			"xAPIC"
-		}
-	);
-	infoentry!("Initialized CPUs", arch::get_processor_count());
+	let apic = if processor::supports_x2apic() {
+		"x2APIC"
+	} else {
+		"xAPIC"
+	};
+	infoentry!("APIC in use", "{apic}");
+	let processor_count = arch::get_processor_count();
+	infoentry!("Initialized CPUs", "{processor_count}");
 	infofooter!();
 }

src/arch/x86_64/kernel/processor.rs

@@ -944,23 +944,24 @@ pub fn print_information() {
 	let feature_printer = CpuFeaturePrinter::new(&cpuid);
 
 	if let Some(brand_string) = cpuid.get_processor_brand_string() {
-		infoentry!("Model", brand_string.as_str());
+		let brand_string = brand_string.as_str();
+		infoentry!("Model", "{brand_string}");
 	}
 
-	infoentry!("Frequency", *CPU_FREQUENCY);
-	infoentry!("SpeedStep Technology", FEATURES.cpu_speedstep);
-
-	infoentry!("Features", feature_printer);
-	infoentry!(
-		"Physical Address Width",
-		"{} bits",
-		get_physical_address_bits()
-	);
-	infoentry!("Linear Address Width", "{} bits", get_linear_address_bits());
-	infoentry!(
-		"Supports 1GiB Pages",
-		if supports_1gib_pages() { "Yes" } else { "No" }
-	);
+	let cpu_freq = &*CPU_FREQUENCY;
+	let speedstep = &FEATURES.cpu_speedstep;
+	infoentry!("Frequency", "{cpu_freq}");
+	infoentry!("SpeedStep Technology", "{speedstep}");
+
+	infoentry!("Features", "{feature_printer}");
+
+	let phys_addr_bits = get_physical_address_bits();
+	let virt_addr_bits = get_linear_address_bits();
+	let size_1gib_pages = if supports_1gib_pages() { "Yes" } else { "No" };
+	infoentry!("Physical Address Width", "{phys_addr_bits} bits");
+	infoentry!("Linear Address Width", "{virt_addr_bits} bits");
+	infoentry!("Supports 1GiB Pages", "{size_1gib_pages}");
+
 	infofooter!();
 }
 

src/logging.rs

@@ -147,8 +147,8 @@ macro_rules! infoheader {
 }
 
 #[cfg_attr(target_arch = "riscv64", allow(unused))]
+#[clippy::format_args]
 macro_rules! infoentry {
-	($str:expr, $rhs:expr) => (infoentry!($str, "{}", $rhs));
 	($str:expr, $($arg:tt)+) => (::log::info!("{:25}{}", concat!($str, ":"), format_args!($($arg)+)));
 }
 

src/macros.rs

@@ -5,6 +5,7 @@
 /// [`std::print`]: https://doc.rust-lang.org/stable/std/macro.print.html
 #[cfg(target_os = "none")]
 #[macro_export]
+#[clippy::format_args]
 macro_rules! print {
     ($($arg:tt)*) => {{
         $crate::console::_print(::core::format_args!($($arg)*));
@@ -18,18 +19,20 @@ macro_rules! print {
 /// [`std::println`]: https://doc.rust-lang.org/stable/std/macro.println.html
 #[cfg(target_os = "none")]
 #[macro_export]
+#[clippy::format_args]
 macro_rules! println {
     () => {
         $crate::print!("\n")
     };
     ($($arg:tt)*) => {{
-        $crate::console::_print(::core::format_args!("{}\n", format_args!($($arg)*)));
+        $crate::console::_print(::core::format_args!("{}\n", ::core::format_args!($($arg)*)));
     }};
 }
 
 /// Emergency output.
 #[cfg(target_os = "none")]
 #[macro_export]
+#[clippy::format_args]
 macro_rules! panic_println {
     () => {{
         $crate::console::_panic_print(::core::format_args!("\n"));
@@ -41,6 +44,7 @@ macro_rules! panic_println {
 
 #[cfg(not(target_os = "none"))]
 #[macro_export]
+#[clippy::format_args]
 macro_rules! panic_println {
     ($($arg:tt)*) => {
         println!($($arg)*);