Merge pull request #1073 from jordanhiltunen/master

Alias 'rustup toolchain uninstall' to 'rustup uninstall'
rust-lang · Apr 19, 2017 · f7e0a9e · f7e0a9e
2 parents 77021f8 d327470
commit f7e0a9e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/rustup-cli/rustup_mode.rs b/src/rustup-cli/rustup_mode.rs
@@ -31,6  31,7 @@ pub fn main() -> Result<()> {
         ("show", Some(_)) => try!(show(cfg)),
         ("install", Some(m)) => try!(update(cfg, m)),
         ("update", Some(m)) => try!(update(cfg, m)),
         ("uninstall", Some(m)) => try!(toolchain_remove(cfg, m)),
         ("default", Some(m)) => try!(default_(cfg, m)),
         ("toolchain", Some(c)) => {
             match c.subcommand() {
@@ -133,6  134,12 @@ pub fn cli() -> App<'static, 'static> {
             .arg(Arg::with_name("toolchain")
                 .required(true)
                 .multiple(true)))
         .subcommand(SubCommand::with_name("uninstall")
             .about("Uninstall Rust toolchains")
             .setting(AppSettings::Hidden) // synonym for 'toolchain uninstall'
             .arg(Arg::with_name("toolchain")
                 .required(true)
                 .multiple(true)))
         .subcommand(SubCommand::with_name("update")
             .about("Update Rust toolchains")
             .after_help(UPDATE_HELP)

diff --git a/tests/cli-rustup.rs b/tests/cli-rustup.rs
@@ -567,6  567,22 @@ fn toolchain_update_is_like_update() {
     });
 }
 
 
 #[test]
 fn toolchain_uninstall_is_like_uninstall() {
     setup(&|config| {
         expect_ok(config, &["rustup", "uninstall", "nightly"]);
         let mut cmd = clitools::cmd(config, "rustup", &["show"]);
         clitools::env(config, &mut cmd);
         let out = cmd.output().unwrap();
         assert!(out.status.success());
         let stdout = String::from_utf8(out.stdout).unwrap();
         assert!(!stdout.contains(
             for_host!("'nightly-2015-01-01-{}'")));
 
     });
 }
 
 #[test]
 fn toolchain_update_is_like_update_except_that_bare_install_is_an_error() {
     setup(&|config| {