refactor(cli): Simplify script logic

Author: epage

src/bin/cargo/cli.rs

@@ -337,9 +337,7 @@ To pass the arguments to the subcommand, remove `--`",
                     }
                 }
                 if commands::run::is_manifest_command(cmd) {
-                    {
-                        return Ok((args, GlobalArgs::default()));
-                    }
+                    return Ok((args, GlobalArgs::default()));
                 }
 
                 let mut alias = alias
@@ -476,15 +474,12 @@ impl Exec {
         match self {
             Self::Builtin(exec) => exec(gctx, subcommand_args),
             Self::Manifest(cmd) => {
-                // Placeholder
-                {
-                    let ext_args: Vec<OsString> = subcommand_args
-                        .get_many::<OsString>("")
-                        .unwrap_or_default()
-                        .cloned()
-                        .collect();
-                    commands::run::exec_manifest_command(gctx, &cmd, &ext_args)
-                }
+                let ext_args: Vec<OsString> = subcommand_args
+                    .get_many::<OsString>("")
+                    .unwrap_or_default()
+                    .cloned()
+                    .collect();
+                commands::run::exec_manifest_command(gctx, &cmd, &ext_args)
             }
             Self::External(cmd) => {
                 let mut ext_args = vec![OsStr::new(&cmd)];

src/bin/cargo/commands/run.rs

@@ -96,45 +96,42 @@ pub fn is_manifest_command(arg: &str) -> bool {
 
 pub fn exec_manifest_command(gctx: &mut GlobalContext, cmd: &str, args: &[OsString]) -> CliResult {
     let manifest_path = Path::new(cmd);
-    match manifest_path.is_file() {
-        true => {}
-        false => {
-            let possible_commands = crate::list_commands(gctx);
-            let is_dir = if manifest_path.is_dir() {
-                format!(": `{cmd}` is a directory")
-            } else {
+    if !manifest_path.is_file() {
+        let possible_commands = crate::list_commands(gctx);
+        let is_dir = if manifest_path.is_dir() {
+            format!(": `{cmd}` is a directory")
+        } else {
+            "".to_owned()
+        };
+        let suggested_command = if let Some(suggested_command) = possible_commands
+            .keys()
+            .filter(|c| cmd.starts_with(c.as_str()))
+            .max_by_key(|c| c.len())
+        {
+            let actual_args = cmd.strip_prefix(suggested_command).unwrap();
+            let args = if args.is_empty() {
                 "".to_owned()
-            };
-            let suggested_command = if let Some(suggested_command) = possible_commands
-                .keys()
-                .filter(|c| cmd.starts_with(c.as_str()))
-                .max_by_key(|c| c.len())
-            {
-                let actual_args = cmd.strip_prefix(suggested_command).unwrap();
-                let args = if args.is_empty() {
-                    "".to_owned()
-                } else {
-                    format!(
-                        " {}",
-                        args.into_iter().map(|os| os.to_string_lossy()).join(" ")
-                    )
-                };
+            } else {
                 format!(
-                    "\nhelp: there is a command with a similar name: `{suggested_command} {actual_args}{args}`"
+                    " {}",
+                    args.into_iter().map(|os| os.to_string_lossy()).join(" ")
                 )
-            } else {
-                "".to_owned()
-            };
-            let suggested_script = if let Some(suggested_script) = suggested_script(cmd) {
-                format!("\nhelp: there is a script with a similar name: `{suggested_script}`")
-            } else {
-                "".to_owned()
             };
-            return Err(anyhow::anyhow!(
-                "no such file or subcommand `{cmd}`{is_dir}{suggested_command}{suggested_script}"
+            format!(
+                "\nhelp: there is a command with a similar name: `{suggested_command} {actual_args}{args}`"
             )
-            .into());
-        }
+        } else {
+            "".to_owned()
+        };
+        let suggested_script = if let Some(suggested_script) = suggested_script(cmd) {
+            format!("\nhelp: there is a script with a similar name: `{suggested_script}`")
+        } else {
+            "".to_owned()
+        };
+        return Err(anyhow::anyhow!(
+            "no such file or subcommand `{cmd}`{is_dir}{suggested_command}{suggested_script}"
+        )
+        .into());
     }
 
     let manifest_path = root_manifest(Some(manifest_path), gctx)?;

src/cargo/util/command_prelude.rs

@@ -1097,13 +1097,10 @@ pub fn root_manifest(manifest_path: Option<&Path>, gctx: &GlobalContext) -> Carg
                 manifest_path.display()
             )
         } else if !path.ends_with("Cargo.toml") && !crate::util::toml::is_embedded(&path) {
-            // Placeholder
-            {
-                anyhow::bail!(
-                    "the manifest-path must be a path to a Cargo.toml or script file: `{}`",
-                    path.display()
-                )
-            }
+            anyhow::bail!(
+                "the manifest-path must be a path to a Cargo.toml or script file: `{}`",
+                path.display()
+            )
         }
         Ok(path)
     } else {