Merge pull request #683 from rust-lang-nursery/fix-remove-component

Fix `component remove` command and add a test for it.

Author: brson

src/rustup-cli/rustup_mode.rs

@@ -638,12 +638,13 @@ fn component_add(cfg: &Cfg, m: &ArgMatches) -> Result<()> {
 
 fn component_remove(cfg: &Cfg, m: &ArgMatches) -> Result<()> {
     let toolchain = try!(explicit_or_dir_toolchain(cfg, m));
+    let component = m.value_of("component").expect("");
     let target = m.value_of("target").map(TargetTriple::from_str).or_else(|| {
         toolchain.desc().as_ref().ok().map(|desc| desc.target.clone())
     });
 
     let new_component = Component {
-        pkg: "rust-std".to_string(),
+        pkg: component.to_string(),
         target: target,
     };
 

tests/cli-rustup.rs

@@ -520,7 +520,7 @@ fn proxy_toolchain_shorthand() {
 }
 
 #[test]
-fn src_component_smoke_test() {
+fn add_component() {
     setup(&|config| {
         expect_ok(config, &["rustup", "default", "stable"]);
         expect_ok(config, &["rustup", "component", "add", "rust-src"]);
@@ -530,3 +530,17 @@ fn src_component_smoke_test() {
         assert!(path.exists());
     });
 }
+
+#[test]
+fn remove_component() {
+    setup(&|config| {
+        expect_ok(config, &["rustup", "default", "stable"]);
+        expect_ok(config, &["rustup", "component", "add", "rust-src"]);
+        let path = format!("toolchains/stable-{}/lib/rustlib/src/rust-src/foo.rs",
+                           this_host_triple());
+        let path = config.rustupdir.join(path);
+        assert!(path.exists());
+        expect_ok(config, &["rustup", "component", "remove", "rust-src"]);
+        assert!(!path.parent().unwrap().exists());
+    });
+}