refactor: 优化代码格式，清理冗余和不必要的换行

ZR233 · ZR233 · commit 9114257a00a2 · 2025-12-07T17:51:32.000+08:00
diff --git a/fdt-edit/examples/fdt_debug_demo.rs b/fdt-edit/examples/fdt_debug_demo.rs
@@ -1,9 +1,9 @@
 //! FDT 深度调试演示
-//! 
+//!
 //! 演示如何使用新的深度调试功能来遍历和打印设备树的所有节点
 
-use fdt_edit::Fdt;
 use dtb_file::fdt_rpi_4b;
+use fdt_edit::Fdt;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
diff --git a/fdt-edit/src/fdt.rs b/fdt-edit/src/fdt.rs
@@ -9,7 +9,7 @@ pub use fdt_raw::MemoryReservation;
 use fdt_raw::{FdtError, Phandle, Status};
 
 use crate::{
-    Node, NodeIter, NodeIterMut, NodeMut, NodeRef, NodeKind, ClockType,
+    ClockType, Node, NodeIter, NodeIterMut, NodeKind, NodeMut, NodeRef,
     encode::{FdtData, FdtEncoder},
 };
 
@@ -492,7 +492,11 @@ impl core::fmt::Display for Fdt {
 
         // 输出内存保留块
         for reservation in &self.memory_reservations {
-            writeln!(f, "/memreserve/ 0x{:x} 0x{:x};", reservation.address, reservation.size)?;
+            writeln!(
+                f,
+                "/memreserve/ 0x{:x} 0x{:x};",
+                reservation.address, reservation.size
+            )?;
         }
 
         // 输出根节点
@@ -522,7 +526,11 @@ impl Fdt {
     fn fmt_debug_deep(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         writeln!(f, "Fdt {{")?;
         writeln!(f, "    boot_cpuid_phys: 0x{:x},", self.boot_cpuid_phys)?;
-        writeln!(f, "    memory_reservations_count: {},", self.memory_reservations.len())?;
+        writeln!(
+            f,
+            "    memory_reservations_count: {},",
+            self.memory_reservations.len()
+        )?;
         writeln!(f, "    phandle_cache_size: {},", self.phandle_cache.len())?;
         writeln!(f, "    nodes:")?;
 
@@ -534,7 +542,13 @@ impl Fdt {
         writeln!(f, "}}")
     }
 
-    fn fmt_node_debug(&self, f: &mut core::fmt::Formatter<'_>, node: &NodeRef, indent: usize, index: usize) -> core::fmt::Result {
+    fn fmt_node_debug(
+        &self,
+        f: &mut core::fmt::Formatter<'_>,
+        node: &NodeRef,
+        indent: usize,
+        index: usize,
+    ) -> core::fmt::Result {
         // 打印缩进
         for _ in 0..indent {
             write!(f, "    ")?;
@@ -580,8 +594,7 @@ impl Fdt {
                 if !regions.is_empty() {
                     write!(f, " ({} regions", regions.len())?;
                     for (i, region) in regions.iter().take(2).enumerate() {
-                        write!(f, ", [{}]: 0x{:x}+0x{:x}",
-                               i, region.address, region.size)?;
+                        write!(f, ", [{}]: 0x{:x}+0x{:x}", i, region.address, region.size)?;
                     }
                     if regions.len() > 2 {
                         write!(f, ", ...")?;
diff --git a/fdt-edit/src/node/clock.rs b/fdt-edit/src/node/clock.rs
@@ -1,6 +1,9 @@
 use core::ops::Deref;
 
-use alloc::{string::{String, ToString}, vec::Vec};
+use alloc::{
+    string::{String, ToString},
+    vec::Vec,
+};
 use fdt_raw::Phandle;
 
 use crate::node::gerneric::NodeRefGen;
@@ -201,12 +204,7 @@ impl<'a> NodeRefClock<'a> {
             // 从 clock-names 获取对应的名称
             let name = clock_names.get(index).cloned();
 
-            clocks.push(ClockRef::with_name(
-                name,
-                phandle,
-                clock_cells,
-                specifier,
-            ));
+            clocks.push(ClockRef::with_name(name, phandle, clock_cells, specifier));
             index += 1;
         }
 
@@ -220,4 +218,4 @@ impl<'a> Deref for NodeRefClock<'a> {
     fn deref(&self) -> &Self::Target {
         &self.node
     }
-}
+}
diff --git a/fdt-edit/src/node/interrupt_controller.rs b/fdt-edit/src/node/interrupt_controller.rs
@@ -61,4 +61,4 @@ fn is_interrupt_controller_node(node: &NodeRefGen) -> bool {
 
     // 或者有 interrupt-controller 属性
     node.find_property("interrupt-controller").is_some()
-}
+}
diff --git a/fdt-edit/src/node/iter.rs b/fdt-edit/src/node/iter.rs
@@ -7,7 +7,7 @@ use core::{
 use alloc::vec::Vec;
 
 use crate::{
-    Context, Node, NodeRefPci, NodeRefClock, NodeRefInterruptController, NodeRefMemory, NodeKind,
+    Context, Node, NodeKind, NodeRefClock, NodeRefInterruptController, NodeRefMemory, NodeRefPci,
     node::gerneric::{NodeMutGen, NodeRefGen},
 };
 
diff --git a/fdt-edit/src/node/memory.rs b/fdt-edit/src/node/memory.rs
@@ -1,6 +1,9 @@
 use core::ops::Deref;
 
-use alloc::{string::{String, ToString}, vec::Vec};
+use alloc::{
+    string::{String, ToString},
+    vec::Vec,
+};
 use fdt_raw::MemoryRegion;
 
 use crate::node::gerneric::NodeRefGen;
@@ -65,10 +68,7 @@ impl<'a> NodeRefMemory<'a> {
                 reader.read_cells(address_cells),
                 reader.read_cells(size_cells),
             ) {
-                regions.push(MemoryRegion {
-                    address,
-                    size,
-                });
+                regions.push(MemoryRegion { address, size });
             }
         }
         regions
@@ -92,12 +92,12 @@ impl<'a> Deref for NodeRefMemory<'a> {
 /// 检查节点是否是 memory 节点
 fn is_memory_node(node: &NodeRefGen) -> bool {
     // 检查 device_type 属性是否为 "memory"
-    if let Some(device_type) = node.device_type() {
-        if device_type == "memory" {
-            return true;
-        }
+    if let Some(device_type) = node.device_type()
+        && device_type == "memory"
+    {
+        return true;
     }
 
     // 或者节点名以 "memory" 开头
     node.name().starts_with("memory")
-}
+}
diff --git a/fdt-edit/src/node/mod.rs b/fdt-edit/src/node/mod.rs
@@ -311,4 +311,3 @@ impl From<&fdt_raw::Node<'_>> for Node {
         new_node
     }
 }
-
diff --git a/fdt-edit/tests/clock.rs b/fdt-edit/tests/clock.rs
@@ -1,8 +1,8 @@
 #![cfg(unix)]
 
 use dtb_file::*;
-use fdt_edit::*;
 use fdt_edit::NodeKind;
+use fdt_edit::*;
 
 #[cfg(test)]
 mod tests {
diff --git a/fdt-edit/tests/display_debug.rs b/fdt-edit/tests/display_debug.rs
@@ -227,8 +227,12 @@ mod tests {
         assert!(deep_debug.contains("[000]"));
 
         // 验证包含特定节点类型
-        assert!(deep_debug.contains("Clock") || deep_debug.contains("InterruptController") ||
-                deep_debug.contains("Memory") || deep_debug.contains("Generic"));
+        assert!(
+            deep_debug.contains("Clock")
+                || deep_debug.contains("InterruptController")
+                || deep_debug.contains("Memory")
+                || deep_debug.contains("Generic")
+        );
     }
 
     #[test]
@@ -242,7 +246,12 @@ mod tests {
 
         let mut uart = Node::new("uart@9000000");
         uart.set_property(Property::new("compatible", b"arm,pl011\0".to_vec()));
-        uart.set_property(Property::new("reg", vec![0x00, 0x90, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00]));
+        uart.set_property(Property::new(
+            "reg",
+            vec![
+                0x00, 0x90, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
+            ],
+        ));
         uart.set_property(Property::new("status", b"okay\0".to_vec()));
 
         soc.add_child(uart);
@@ -259,4 +268,4 @@ mod tests {
         assert!(deep_debug.contains("#address-cells=1"));
         assert!(deep_debug.contains("#size-cells=1"));
     }
-}
+}
diff --git a/fdt-edit/tests/memory.rs b/fdt-edit/tests/memory.rs
@@ -1,8 +1,8 @@
 #![cfg(unix)]
 
 use dtb_file::*;
-use fdt_edit::*;
 use fdt_edit::NodeKind;
+use fdt_edit::*;
 
 #[cfg(test)]
 mod tests {
diff --git a/fdt-parser/src/cache/node/pci.rs b/fdt-parser/src/cache/node/pci.rs
@@ -213,8 +213,8 @@ impl Pci {
         while !data.remain().as_ref().is_empty() {
             // Parse child bus address (3 cells for PCI)
             let mut child_addr = [0u32; 3];
-            for i in 0..3 {
-                child_addr[i] = data.take_u32().ok()?;
+            for addr in child_addr.iter_mut() {
+                *addr = data.take_u32().ok()?;
             }
 
             // Parse parent bus address (2 cells for 64-bit)
@@ -296,9 +296,9 @@ impl Pci {
 
         let encoded_address = [child_addr_high, child_addr_mid, child_addr_low];
         let mut masked_child_address = Vec::with_capacity(child_addr_cells);
-        for idx in 0..child_addr_cells {
+        for (idx, mask) in mask.iter().enumerate().take(child_addr_cells) {
             let value = *encoded_address.get(idx).unwrap_or(&0);
-            masked_child_address.push(value & mask[idx]);
+            masked_child_address.push(value & mask);
         }
 
         let encoded_irq = [pin];
diff --git a/fdt-raw/tests/node.rs b/fdt-raw/tests/node.rs
@@ -111,7 +111,10 @@ fn test_fdt_debug() {
         ("nodes:", "nodes field"),
     ];
     for (pattern, desc) in struct_checks {
-        assert!(output.contains(pattern), "Debug output should contain {desc}");
+        assert!(
+            output.contains(pattern),
+            "Debug output should contain {desc}"
+        );
     }
 
     // 验证 header 字段
@@ -413,7 +416,6 @@ fn test_reg_parsing() {
                 );
             }
 
-  
             if node.name() == "fw-cfg@9020000" {
                 found_fw_cfg_reg = true;
                 assert_eq!(reg_infos.len(), 1, "fw-cfg should have one reg entry");

Original file line number	Diff line number	Diff line change
`@@ -311,4 +311,3 @@ impl From<&fdt_raw::Node<'_>> for Node {`
`311`	`311`	`new_node`
`312`	`312`	`}`
`313`	`313`	`}`
`314`		`-`