Use correct name for undefined linked toolchain invocation

Closes rust-lang#927.
topecongiro · Mar 24, 2017 · ded5ee2 · ded5ee2
1 parent ebd92af
commit ded5ee2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/rustup/toolchain.rs b/src/rustup/toolchain.rs
@@ -331,7 +331,7 @@ impl<'a> Toolchain<'a> {
             return Err(ErrorKind::ToolchainNotInstalled(self.name.to_owned()).into());
         }
         if !primary_toolchain.exists() {
-            return Err(ErrorKind::ToolchainNotInstalled(self.name.to_owned()).into());
+            return Err(ErrorKind::ToolchainNotInstalled(primary_toolchain.name.to_owned()).into());
         }
 
         let src_file = self.path.join("bin").join(format!("cargo{}", EXE_SUFFIX));

diff --git a/tests/cli-exact.rs b/tests/cli-exact.rs
@@ -315,3 +315,14 @@ fn disable_telemetry() {
                      &format!("info: telemetry set to 'off'\n"));
     });
 }
+
+// issue #927
+#[test]
+fn undefined_linked_toolchain() {
+    setup(&|config| {
+        expect_err_ex(config,
+                      &["cargo", "+bogus", "test"],
+                      r"",
+                      &format!("error: toolchain 'bogus' is not installed\n"));
+    });
+}