fix(alias): dont panic when resolving an empty alias

rust-lang · Mar 21, 2024 · 46214f3 · 46214f3
1 parent 352d8bb
commit 46214f3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/bin/cargo/main.rs b/src/bin/cargo/main.rs
@@ -148,6 +148,13 @@ fn aliased_command(gctx: &GlobalContext, command: &str) -> CargoResult<Option<Ve
     let result = user_alias.or_else(|| {
         builtin_aliases_execs(command).map(|command_str| vec![command_str.1.to_string()])
     });
+    if result
+        .as_ref()
+        .map(|alias| alias.is_empty())
+        .unwrap_or_default()
+    {
+        anyhow::bail!("subcommand is required, but `{alias_name}` is empty");
+    }
     Ok(result)
 }
 

diff --git a/tests/testsuite/cargo_alias_config.rs b/tests/testsuite/cargo_alias_config.rs
@@ -447,11 +447,19 @@ fn empty_alias() {
 
     p.cargo("string")
         .with_status(101)
-        .with_stderr_contains("[..]panicked at[..]")
+        .with_stderr(
+            "\
+[ERROR] subcommand is required, but `alias.string` is empty
+",
+        )
         .run();
 
     p.cargo("array")
         .with_status(101)
-        .with_stderr_contains("[..]panicked at[..]")
+        .with_stderr(
+            "\
+[ERROR] subcommand is required, but `alias.array` is empty
+",
+        )
         .run();
 }