diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs index 9acc65cc508..de2023195ab 100644 --- a/src/bin/cargo/cli.rs +++ b/src/bin/cargo/cli.rs @@ -5,6 +5,8 @@ use cargo::{self, drop_print, drop_println, CliResult, Config}; use clap::{AppSettings, Arg, ArgMatches}; use itertools::Itertools; use std::collections::HashMap; +use std::ffi::OsStr; +use std::ffi::OsString; use std::fmt::Write; use super::commands; @@ -241,20 +243,20 @@ fn expand_aliases( } (Some(_), None) => { // Command is built-in and is not conflicting with alias, but contains ignored values. - if let Some(mut values) = args.get_many::("") { + if let Some(values) = args.get_many::("") { return Err(anyhow::format_err!( "\ trailing arguments after built-in command `{}` are unsupported: `{}` To pass the arguments to the subcommand, remove `--`", cmd, - values.join(" "), + values.map(|s| s.to_string_lossy()).join(" "), ) .into()); } } (None, None) => {} - (_, Some(mut alias)) => { + (_, Some(alias)) => { // Check if this alias is shadowing an external subcommand // (binary of the form `cargo-`) // Currently this is only a warning, but after a transition period this will become @@ -270,7 +272,11 @@ For more information, see issue #10049 ("").unwrap_or_default().cloned()); + let mut alias = alias + .into_iter() + .map(|s| OsString::from(s)) + .collect::>(); + alias.extend(args.get_many::("").unwrap_or_default().cloned()); // new_args strips out everything before the subcommand, so // capture those global options now. // Note that an alias to an external command will not receive @@ -346,12 +352,12 @@ fn execute_subcommand(config: &mut Config, cmd: &str, subcommand_args: &ArgMatch return exec(config, subcommand_args); } - let mut ext_args: Vec<&str> = vec![cmd]; + let mut ext_args: Vec<&OsStr> = vec![OsStr::new(cmd)]; ext_args.extend( subcommand_args - .get_many::("") + .get_many::("") .unwrap_or_default() - .map(String::as_str), + .map(OsString::as_os_str), ); super::execute_external_subcommand(config, cmd, &ext_args) } @@ -400,6 +406,7 @@ pub fn cli() -> Command { }; Command::new("cargo") .allow_external_subcommands(true) + .allow_invalid_utf8_for_external_subcommands(true) .setting(AppSettings::DeriveDisplayOrder) // Doesn't mix well with our list of common cargo commands. See clap-rs/clap#3108 for // opening clap up to allow us to style our help template diff --git a/src/bin/cargo/commands/help.rs b/src/bin/cargo/commands/help.rs index 23c555d227d..9e4c9ee2d03 100644 --- a/src/bin/cargo/commands/help.rs +++ b/src/bin/cargo/commands/help.rs @@ -4,6 +4,7 @@ use cargo::util::errors::CargoResult; use cargo::{drop_println, Config}; use cargo_util::paths::resolve_executable; use flate2::read::GzDecoder; +use std::ffi::OsStr; use std::ffi::OsString; use std::io::Read; use std::io::Write; @@ -21,7 +22,11 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { let subcommand = args.get_one::("SUBCOMMAND"); if let Some(subcommand) = subcommand { if !try_help(config, subcommand)? { - crate::execute_external_subcommand(config, subcommand, &[subcommand, "--help"])?; + crate::execute_external_subcommand( + config, + subcommand, + &[OsStr::new(subcommand), OsStr::new("--help")], + )?; } } else { let mut cmd = crate::cli::cli(); diff --git a/src/bin/cargo/main.rs b/src/bin/cargo/main.rs index dead961f44d..341b2c42d63 100644 --- a/src/bin/cargo/main.rs +++ b/src/bin/cargo/main.rs @@ -7,6 +7,7 @@ use cargo::util::{self, closest_msg, command_prelude, CargoResult, CliResult, Co use cargo_util::{ProcessBuilder, ProcessError}; use std::collections::BTreeMap; use std::env; +use std::ffi::OsStr; use std::fs; use std::path::{Path, PathBuf}; @@ -152,7 +153,7 @@ fn find_external_subcommand(config: &Config, cmd: &str) -> Option { .find(|file| is_executable(file)) } -fn execute_external_subcommand(config: &Config, cmd: &str, args: &[&str]) -> CliResult { +fn execute_external_subcommand(config: &Config, cmd: &str, args: &[&OsStr]) -> CliResult { let path = find_external_subcommand(config, cmd); let command = match path { Some(command) => command,