Merge pull request #1380 from aimileus/unavailable-toolchain

Give correct error message if user tries to install an unavailable toolchain
rust-lang · May 27, 2018 · 62c36af · 62c36af
2 parents 09fb0f5 + d536825
commit 62c36af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/rustup-cli/errors.rs b/src/rustup-cli/errors.rs
@@ -27,6 +27,10 @@ error_chain! {
             description("toolchain is not installed")
             display("toolchain '{}' is not installed", t)
         }
+        InvalidToolchainName(t: String) {
+            description("invalid toolchain name")
+            display("invalid toolchain name: '{}'", t)
+        }
         InfiniteRecursion {
             description("infinite recursion detected")
         }

diff --git a/src/rustup-cli/rustup_mode.rs b/src/rustup-cli/rustup_mode.rs
@@ -558,7 +558,7 @@ fn update(cfg: &Cfg, m: &ArgMatches) -> Result<()> {
             let status = if !toolchain.is_custom() {
                 Some(try!(toolchain.install_from_dist(m.is_present("force"))))
             } else if !toolchain.exists() {
-                return Err(ErrorKind::ToolchainNotInstalled(toolchain.name().to_string()).into());
+                return Err(ErrorKind::InvalidToolchainName(toolchain.name().to_string()).into());
             } else {
                 None
             };