fmt

Author: ZR233

modules/axdriver/src/dyn_drivers/blk/virtio.rs

@@ -52,8 +52,7 @@ fn probe(info: FdtInfo<'_>, plat_dev: PlatformDevice) -> Result<(), OnProbeError
 
     let dev = Device::try_new(transport).map_err(|e| {
         OnProbeError::other(format!(
-            "failed to initialize Virtio Block device at [PA:{:?},): {:?}",
-            mmio_base, e
+            "failed to initialize Virtio Block device at [PA:{mmio_base:?},): {e:?}"
         ))
     })?;
 

modules/axdriver/src/dyn_drivers/mod.rs

@@ -1,6 +1,6 @@
 use core::{error::Error, ops::Deref, ptr::NonNull};
 
-use alloc::{boxed::Box, format};
+use alloc::{boxed::Box, format, string::ToString};
 use axerrno::{AxError, AxResult};
 use axhal::mem::{MemoryAddr, PhysAddr, VirtAddr, phys_to_virt};
 use lazyinit::LazyInit;
@@ -41,15 +41,14 @@ fn iomap(addr: PhysAddr, size: usize) -> Result<NonNull<u8>, Box<dyn Error>> {
     let size = end - start;
     let iomap = *IO_MAP_FUNC
         .get()
-        .ok_or_else(|| format!("IO map function not initialized"))?;
+        .ok_or_else(|| "IO map function not initialized".to_string())?;
 
     let virt = match iomap(start, size) {
         Ok(val) => val,
         Err(AxError::AlreadyExists) => phys_to_virt(start),
         Err(e) => {
             return Err(format!(
-                "Failed to map MMIO region: {:?} (addr: {:?}, size: {:#x})",
-                e, start, size
+                "Failed to map MMIO region: {e:?} (addr: {start:?}, size: {size:#x})"
             )
             .into());
         }