Merge pull request #2239 from jplatte/delimited_option_args

cli: Allow specifying multiple component or target values in one argument

Author: kinnison

src/cli/rustup_mode.rs

@@ -318,15 +318,17 @@ pub fn cli() -> App<'static, 'static> {
                                 .long("component")
                                 .short("c")
                                 .takes_value(true)
-                                .multiple(true),
+                                .multiple(true)
+                                .use_delimiter(true),
                         )
                         .arg(
                             Arg::with_name("targets")
                                 .help("Add specific targets on installation")
                                 .long("target")
                                 .short("t")
                                 .takes_value(true)
-                                .multiple(true),
+                                .multiple(true)
+                                .use_delimiter(true),
                         )
                         .arg(
                             Arg::with_name("force")

src/cli/setup_mode.rs

@@ -67,15 +67,17 @@ pub fn main() -> Result<()> {
                 .long("component")
                 .short("c")
                 .takes_value(true)
-                .multiple(true),
+                .multiple(true)
+                .use_delimiter(true),
         )
         .arg(
             Arg::with_name("targets")
                 .help("Target name to also install")
                 .long("target")
                 .short("target")
                 .takes_value(true)
-                .multiple(true),
+                .multiple(true)
+                .use_delimiter(true),
         )
         .arg(
             Arg::with_name("no-modify-path")

tests/cli-inst-interactive.rs

@@ -3,8 +3,8 @@
 pub mod mock;
 
 use crate::mock::clitools::{
-    self, expect_stderr_ok, expect_stdout_ok, set_current_dist_date, Config, SanitizedOutput,
-    Scenario,
+    self, expect_ok, expect_stderr_ok, expect_stdout_ok, set_current_dist_date, this_host_triple,
+    Config, SanitizedOutput, Scenario,
 };
 use crate::mock::{get_path, restore_path};
 use lazy_static::lazy_static;
@@ -248,6 +248,31 @@ fn user_says_nope_after_advanced_install() {
     });
 }
 
+#[test]
+fn install_with_components() {
+    fn go(comp_args: &[&str]) {
+        let mut args = vec!["rustup-init", "-y"];
+        args.extend_from_slice(comp_args);
+
+        setup(&|config| {
+            expect_ok(config, &args);
+            expect_stdout_ok(
+                config,
+                &["rustup", "component", "list"],
+                "rust-src (installed)",
+            );
+            expect_stdout_ok(
+                config,
+                &["rustup", "component", "list"],
+                &format!("rust-analysis-{} (installed)", this_host_triple()),
+            );
+        })
+    }
+
+    go(&["-c", "rust-src", "-c", "rust-analysis"]);
+    go(&["-c", "rust-src,rust-analysis"]);
+}
+
 #[test]
 fn install_forces_and_skips_rls() {
     setup_(true, &|config| {

tests/cli-v2.rs

@@ -1235,6 +1235,71 @@ fn target_list_ignores_unavailable_targets() {
     })
 }
 
+#[test]
+fn install_with_components() {
+    fn go(comp_args: &[&str]) {
+        let mut args = vec![
+            "rustup",
+            "toolchain",
+            "install",
+            "nightly",
+            "--no-self-update",
+        ];
+        args.extend_from_slice(comp_args);
+
+        setup(&|config| {
+            expect_ok(config, &args);
+            expect_stdout_ok(
+                config,
+                &["rustup", "component", "list"],
+                "rust-src (installed)",
+            );
+            expect_stdout_ok(
+                config,
+                &["rustup", "component", "list"],
+                &format!("rust-analysis-{} (installed)", this_host_triple()),
+            );
+        })
+    }
+
+    go(&["-c", "rust-src", "-c", "rust-analysis"]);
+    go(&["-c", "rust-src,rust-analysis"]);
+}
+
+#[test]
+fn install_with_targets() {
+    fn go(comp_args: &[&str]) {
+        let mut args = vec![
+            "rustup",
+            "toolchain",
+            "install",
+            "nightly",
+            "--no-self-update",
+        ];
+        args.extend_from_slice(comp_args);
+
+        setup(&|config| {
+            expect_ok(config, &args);
+            expect_stdout_ok(
+                config,
+                &["rustup", "target", "list"],
+                &format!("{} (installed)", clitools::CROSS_ARCH1),
+            );
+            expect_stdout_ok(
+                config,
+                &["rustup", "target", "list"],
+                &format!("{} (installed)", clitools::CROSS_ARCH2),
+            );
+        })
+    }
+
+    go(&["-t", clitools::CROSS_ARCH1, "-t", clitools::CROSS_ARCH2]);
+    go(&[
+        "-t",
+        &format!("{},{}", clitools::CROSS_ARCH1, clitools::CROSS_ARCH2),
+    ]);
+}
+
 #[test]
 fn install_with_component_and_target() {
     setup(&|config| {