refactor: 优化代码格式，调整导入顺序和函数调用的排版

Author: ZR233

ostool/src/bin/cargo-osrun.rs

@@ -9,9 +9,7 @@ use clap::{Parser, Subcommand};
 use colored::Colorize as _;
 use log::debug;
 use ostool::{
-    logger,
-    resolve_manifest_context,
-    Tool, ToolConfig,
+    Tool, ToolConfig, logger, resolve_manifest_context,
     run::{qemu, uboot::RunUbootArgs},
 };
 

ostool/src/main.rs

@@ -6,11 +6,11 @@ use colored::Colorize as _;
 
 use log::info;
 use ostool::{
-    logger,
-    resolve_manifest_context,
     Tool, ToolConfig,
     build::{self, CargoRunnerKind},
+    logger,
     menuconfig::{MenuConfigHandler, MenuConfigMode},
+    resolve_manifest_context,
     run::{qemu::RunQemuArgs, uboot::RunUbootArgs},
 };
 

ostool/src/run/qemu.rs

@@ -43,7 +43,9 @@ use tokio::fs;
 use crate::{
     Tool,
     run::{
-        output_matcher::{ByteStreamMatcher, StreamMatch, StreamMatchKind, compile_regexes, print_match_event},
+        output_matcher::{
+            ByteStreamMatcher, StreamMatch, StreamMatchKind, compile_regexes, print_match_event,
+        },
         ovmf_prebuilt::{Arch, FileType, Prebuilt, Source},
         shell_init::{ShellAutoInitMatcher, normalize_shell_init_config, spawn_delayed_send},
     },
@@ -173,8 +175,9 @@ async fn load_or_create_qemu_config(
 
     let config_content = match fs::read_to_string(&config_path).await {
         Ok(content) => {
-            let mut config: QemuConfig = toml::from_str(&content)
-                .with_context(|| format!("failed to parse QEMU config: {}", config_path.display()))?;
+            let mut config: QemuConfig = toml::from_str(&content).with_context(|| {
+                format!("failed to parse QEMU config: {}", config_path.display())
+            })?;
             config.normalize(&format!("QEMU config {}", config_path.display()))?;
             return Ok(config);
         }
@@ -923,12 +926,8 @@ mod tests {
         std::fs::write(tmp.path().join("qemu-aarch64.toml"), "").unwrap();
         std::fs::write(tmp.path().join("qemu.toml"), "").unwrap();
 
-        let result = resolve_qemu_config_path_in_dir(
-            tmp.path(),
-            Some(Architecture::Aarch64),
-            None,
-        )
-        .unwrap();
+        let result =
+            resolve_qemu_config_path_in_dir(tmp.path(), Some(Architecture::Aarch64), None).unwrap();
         assert_eq!(result, tmp.path().join("qemu-aarch64.toml"));
     }
 
@@ -938,8 +937,7 @@ mod tests {
         std::fs::write(tmp.path().join(".qemu.toml"), "").unwrap();
 
         let result =
-            resolve_qemu_config_path_in_dir(tmp.path(), Some(Architecture::Aarch64), None)
-                .unwrap();
+            resolve_qemu_config_path_in_dir(tmp.path(), Some(Architecture::Aarch64), None).unwrap();
         assert_eq!(result, tmp.path().join(".qemu.toml"));
     }
 
@@ -948,8 +946,7 @@ mod tests {
         let tmp = TempDir::new().unwrap();
 
         let result =
-            resolve_qemu_config_path_in_dir(tmp.path(), Some(Architecture::Aarch64), None)
-                .unwrap();
+            resolve_qemu_config_path_in_dir(tmp.path(), Some(Architecture::Aarch64), None).unwrap();
         assert_eq!(result, tmp.path().join(".qemu-aarch64.toml"));
     }
 

ostool/src/run/tftp.rs

@@ -338,8 +338,7 @@ fn ensure_tftpd_hpa_service_ready(is_root: bool) -> anyhow::Result<()> {
             program: "systemctl".into(),
             args: vec!["restart".into(), "tftpd-hpa".into()],
         };
-        run_privileged_command(&restart, is_root)
-            .context("failed to restart tftpd-hpa service")?;
+        run_privileged_command(&restart, is_root).context("failed to restart tftpd-hpa service")?;
 
         if udp_port_69_is_listening()? {
             info!("tftpd-hpa is now listening on UDP port 69");
@@ -348,9 +347,7 @@ fn ensure_tftpd_hpa_service_ready(is_root: bool) -> anyhow::Result<()> {
 
         let active = run_capture("systemctl", &["is-active", "tftpd-hpa"])
             .unwrap_or_else(|_| "unknown".to_string());
-        bail!(
-            "tftpd-hpa 服务重启后仍未监听 UDP 69（systemctl is-active: {active}）"
-        );
+        bail!("tftpd-hpa 服务重启后仍未监听 UDP 69（systemctl is-active: {active}）");
     }
 
     bail!("未检测到可用的服务管理器，且 tftpd-hpa 当前未监听 UDP 69，请手动启动服务");

ostool/src/run/uboot.rs

@@ -21,7 +21,10 @@ use uboot_shell::UbootShell;
 use crate::{
     Tool,
     run::{
-        output_matcher::{ByteStreamMatcher, MATCH_DRAIN_DURATION, StreamMatchKind, compile_regexes, print_match_event},
+        output_matcher::{
+            ByteStreamMatcher, MATCH_DRAIN_DURATION, StreamMatchKind, compile_regexes,
+            print_match_event,
+        },
         shell_init::{ShellAutoInitMatcher, normalize_shell_init_config, spawn_delayed_send},
         tftp,
     },
@@ -128,9 +131,10 @@ impl Tool {
             Ok(content) => {
                 println!("Using U-Boot config: {}", config_path.display());
                 let config_content = replace_env_placeholders(&content)?;
-                let mut config: UbootConfig = toml::from_str(&config_content).with_context(|| {
-                    format!("failed to parse U-Boot config: {}", config_path.display())
-                })?;
+                let mut config: UbootConfig =
+                    toml::from_str(&config_content).with_context(|| {
+                        format!("failed to parse U-Boot config: {}", config_path.display())
+                    })?;
                 config.normalize(&format!("U-Boot config {}", config_path.display()))?;
                 config
             }

ostool/src/tool.rs

@@ -1,9 +1,4 @@
-use std::{
-    env::current_dir,
-    ffi::OsStr,
-    path::PathBuf,
-    sync::Arc,
-};
+use std::{env::current_dir, ffi::OsStr, path::PathBuf, sync::Arc};
 
 use anyhow::{Context, anyhow, bail};
 use cargo_metadata::Metadata;
@@ -646,12 +641,9 @@ mod tests {
         .unwrap();
 
         let package_dir = tool.resolve_package_manifest_dir("kernel").unwrap();
-        let resolved = resolve_qemu_config_path_in_dir(
-            &package_dir,
-            Some(Architecture::Aarch64),
-            None,
-        )
-        .unwrap();
+        let resolved =
+            resolve_qemu_config_path_in_dir(&package_dir, Some(Architecture::Aarch64), None)
+                .unwrap();
 
         assert_eq!(resolved, kernel_dir.join(".qemu-aarch64.toml"));
     }