fix: refine codes

Author: halajohn

.vscode/settings.json

@@ -80,7 +80,7 @@
   "rust-analyzer.rustfmt.extraArgs": [
     "+nightly",
     "--config",
-    "max_width=80,wrap_comments=true"
+    "max_width=80,wrap_comments=true,wrap_comments=true,use_small_heuristics=Max,format_strings=true,style_edition=2021"
   ],
   "rust-analyzer.showUnlinkedFileNotification": false,
   "search.exclude": {

core/src/ten_manager/src/cmd/cmd_create.rs

@@ -46,7 +46,10 @@ pub fn create_sub_cmd(args_cfg: &crate::cmd_line::ArgsCfg) -> Command {
         )
         .arg(
             Arg::new("PACKAGE_NAME")
-                .help("The name of the package with optional version requirement (e.g., [email protected])")
+                .help(
+                    "The name of the package with optional version \
+                     requirement (e.g., [email protected])",
+                )
                 .required(true),
         )
         .arg(
@@ -74,8 +77,8 @@ pub fn create_sub_cmd(args_cfg: &crate::cmd_line::ArgsCfg) -> Command {
                 .long("template-data")
                 .help(
                     "The placeholders used within the template and their \
-                corresponding values. The format is key-value pairs, e.g., \
-                `--template-data key=value`",
+                     corresponding values. The format is key-value pairs, \
+                     e.g., `--template-data key=value`",
                 )
                 .value_name("KEY=VALUE")
                 .action(ArgAction::Append),
@@ -96,9 +99,8 @@ pub fn parse_sub_cmd(sub_cmd_args: &ArgMatches) -> Result<CreateCommand> {
         .cloned()
         .ok_or_else(|| anyhow!("Missing required argument: PACKAGE_NAME"))?;
 
-    let os = sub_cmd_args
-        .get_one::<String>("OS")
-        .and_then(|s| s.parse::<Os>().ok());
+    let os =
+        sub_cmd_args.get_one::<String>("OS").and_then(|s| s.parse::<Os>().ok());
 
     let arch = sub_cmd_args
         .get_one::<String>("ARCH")
@@ -128,14 +130,13 @@ pub fn parse_sub_cmd(sub_cmd_args: &ArgMatches) -> Result<CreateCommand> {
 
     if cmd.template_data.contains_key("package_name") {
         return Err(anyhow!(
-            "The 'package_name' is set via the command line as '{}', \
-            and cannot be modified through '--template-data'.",
+            "The 'package_name' is set via the command line as '{}', and \
+             cannot be modified through '--template-data'.",
             cmd.pkg_name
         ));
     }
 
-    cmd.template_data
-        .insert("package_name".to_string(), cmd.pkg_name.clone());
+    cmd.template_data.insert("package_name".to_string(), cmd.pkg_name.clone());
 
     let template = sub_cmd_args
         .get_one::<String>("TEMPLATE")

core/src/ten_manager/src/cmd/cmd_delete.rs

@@ -48,16 +48,8 @@ pub fn create_sub_cmd(args_cfg: &crate::cmd_line::ArgsCfg) -> Command {
                 .help("The name of the package")
                 .required(true),
         )
-        .arg(
-            Arg::new("VERSION")
-                .help("The name of the package")
-                .required(true),
-        )
-        .arg(
-            Arg::new("HASH")
-                .help("The hash of the package")
-                .required(true),
-        )
+        .arg(Arg::new("VERSION").help("The name of the package").required(true))
+        .arg(Arg::new("HASH").help("The hash of the package").required(true))
 }
 
 pub fn parse_sub_cmd(

core/src/ten_manager/src/cmd/cmd_designer.rs

@@ -102,7 +102,7 @@ pub async fn execute_cmd(
 
             out.normal_line(&format!(
                 "{}  Doesn't specify the base directory, use current working \
-                directory instead: {}",
+                 directory instead: {}",
                 Emoji("💡", "!"),
                 &cwd
             ));

core/src/ten_manager/src/cmd/cmd_fetch.rs

@@ -48,7 +48,10 @@ pub fn create_sub_cmd(args_cfg: &crate::cmd_line::ArgsCfg) -> Command {
         )
         .arg(
             Arg::new("PACKAGE_NAME")
-                .help("The name of the package with optional version requirement (e.g., [email protected]")
+                .help(
+                    "The name of the package with optional version \
+                     requirement (e.g., [email protected]",
+                )
                 .required(true),
         )
         .arg(

core/src/ten_manager/src/cmd/cmd_install.rs

@@ -103,7 +103,10 @@ pub fn create_sub_cmd(args_cfg: &crate::cmd_line::ArgsCfg) -> Command {
         )
         .arg(
             Arg::new("PACKAGE_NAME")
-                .help("The name of the package with optional version requirement (e.g., [email protected])")
+                .help(
+                    "The name of the package with optional version \
+                     requirement (e.g., [email protected])",
+                )
                 .required(false),
         )
         .arg(
@@ -194,7 +197,8 @@ pub fn parse_sub_cmd(sub_cmd_args: &ArgMatches) -> Result<InstallCommand> {
 
             if sub_cmd_args.get_one::<String>("PACKAGE_NAME").is_some() {
                 return Err(anyhow::anyhow!(
-                    "PACKAGE_NAME is not required when a local path is specified."
+                    "PACKAGE_NAME is not required when a local path is \
+                     specified."
                 ));
             }
         } else {
@@ -531,9 +535,10 @@ pub async fn execute_cmd(
             || local_version_str.contains(",")
         {
             return Err(anyhow!(
-                    "Invalid version requirement '{}' in local package manifest: contains forbidden characters (||, whitespace, or ,)",
-                    local_version_str
-                ));
+                "Invalid version requirement '{}' in local package manifest: \
+                 contains forbidden characters (||, whitespace, or ,)",
+                local_version_str
+            ));
         }
         let installing_pkg_version_req = VersionReq::parse(&local_version_str)?;
 
@@ -590,8 +595,8 @@ pub async fn execute_cmd(
     }
 
     out.normal_line(&format!(
-        "{}  Attempting to retrieve information about locked packages \
-from manifest-lock.json...",
+        "{}  Attempting to retrieve information about locked packages from \
+         manifest-lock.json...",
         Emoji("📜", "")
     ));
 
@@ -609,9 +614,7 @@ from manifest-lock.json...",
         tman_config.clone(),
         &command_data.support,
         initial_pkgs_to_find_candidates,
-        dep_relationship_from_cmd_line
-            .as_ref()
-            .map(|rel| &rel.dependency),
+        dep_relationship_from_cmd_line.as_ref().map(|rel| &rel.dependency),
         &all_compatible_installed_pkgs,
         all_candidates,
         locked_pkgs.as_ref(),
@@ -681,8 +684,8 @@ from manifest-lock.json...",
             if out.is_interactive() {
                 // "y" for continuing to install, "n" for stopping.
                 let ans = Confirm::new(
-                    "Warning!!! Some local packages will be overwritten, \
-do you want to continue?",
+                    "Warning!!! Some local packages will be overwritten, do \
+                     you want to continue?",
                 )
                 .with_default(false)
                 .prompt();

core/src/ten_manager/src/cmd/cmd_modify/cmd_modify_graph.rs

@@ -51,7 +51,7 @@ pub fn create_sub_cmd(_args_cfg: &crate::cmd_line::ArgsCfg) -> Command {
                 .short('m')
                 .help(
                     "The path=JsonString to modify in the selected graph. \
-                    E.g. .name=\"test\"",
+                     E.g. .name=\"test\"",
                 )
                 .required(true)
                 .num_args(1),
@@ -68,10 +68,7 @@ pub fn create_sub_cmd(_args_cfg: &crate::cmd_line::ArgsCfg) -> Command {
 
 pub fn parse_sub_cmd(sub_cmd_args: &ArgMatches) -> Result<ModifyGraphCommand> {
     let cmd = ModifyGraphCommand {
-        app_dir: sub_cmd_args
-            .get_one::<String>("APP_DIR")
-            .unwrap()
-            .to_string(),
+        app_dir: sub_cmd_args.get_one::<String>("APP_DIR").unwrap().to_string(),
         predefined_graph_name: sub_cmd_args
             .get_one::<String>("PREDEFINED_GRAPH_NAME")
             .unwrap()

core/src/ten_manager/src/cmd/cmd_package.rs

@@ -39,14 +39,18 @@ pub fn create_sub_cmd(_args_cfg: &crate::cmd_line::ArgsCfg) -> Command {
         .arg(
             Arg::new("GET_IDENTITY")
                 .long("get-identity")
-                .help("Output the package identity (type, name, version, hash) to stdout and exit")
+                .help(
+                    "Output the package identity (type, name, version, hash) \
+                     to stdout and exit",
+                )
                 .action(clap::ArgAction::SetTrue)
                 .hide(true)
                 .required(false),
         )
         .after_help(
             "Switch to the base directory of the TEN package you want to \
-            package, then simply run 'tman package' directly in that directory.",
+             package, then simply run 'tman package' directly in that \
+             directory.",
         )
 }
 
@@ -55,10 +59,7 @@ pub fn parse_sub_cmd(
 ) -> Result<crate::cmd::cmd_package::PackageCommand> {
     let output_path = sub_cmd_args.get_one::<String>("OUTPUT_PATH").cloned();
     let get_identity = sub_cmd_args.get_flag("GET_IDENTITY");
-    Ok(crate::cmd::cmd_package::PackageCommand {
-        output_path,
-        get_identity,
-    })
+    Ok(crate::cmd::cmd_package::PackageCommand { output_path, get_identity })
 }
 
 pub async fn execute_cmd(

core/src/ten_manager/src/cmd/cmd_publish.rs

@@ -28,12 +28,10 @@ use crate::registry::upload_package;
 pub struct PublishCommand {}
 
 pub fn create_sub_cmd(_args_cfg: &crate::cmd_line::ArgsCfg) -> Command {
-    Command::new("publish")
-        .about("Publish a package")
-        .after_help(
-            "Switch to the base directory of the TEN package you want to \
-        publish, then simply run 'tman publish' directly in that directory.",
-        )
+    Command::new("publish").about("Publish a package").after_help(
+        "Switch to the base directory of the TEN package you want to publish, \
+         then simply run 'tman publish' directly in that directory.",
+    )
 }
 
 pub fn parse_sub_cmd(

core/src/ten_manager/src/cmd/cmd_run.rs

@@ -58,10 +58,7 @@ pub fn parse_sub_cmd(sub_cmd_args: &ArgMatches) -> Result<RunCommand> {
         .map(|vals| vals.map(|s| s.to_string()).collect())
         .unwrap_or_default();
 
-    Ok(RunCommand {
-        script_name,
-        extra_args,
-    })
+    Ok(RunCommand { script_name, extra_args })
 }
 
 pub async fn execute_cmd(
@@ -102,7 +99,7 @@ pub async fn execute_cmd(
             return Err(anyhow!(
                 "No 'scripts' field found in {}",
                 manifest_path.display()
-            ))
+            ));
         }
     };
 
@@ -129,7 +126,7 @@ pub async fn execute_cmd(
                 "Script '{}' not found in '{}'",
                 &cmd.script_name,
                 SCRIPTS
-            ))
+            ));
         }
     };