From d536825b1a4f664729d5e0a421adbe8297340edb Mon Sep 17 00:00:00 2001
From: Emiel Wiedijk <me@aimileus.nl>
Date: Sat, 17 Mar 2018 20:19:40 +0100
Subject: [PATCH] rustup-cli: error message unavailable toolchain

Currently if a user runs `rustup install unavailable-toolchain`, the
error message is: `error: toolchain 'unavailable-toolchain' is not
installed`. This is error message is weird, since the user runs rustup
to install the toolchain. This commit copies the "InvalidToolchainName"
error from rustup-dist, and configures rustup install to use this error.
---
 src/rustup-cli/errors.rs      | 4 ++++
 src/rustup-cli/rustup_mode.rs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/rustup-cli/errors.rs b/src/rustup-cli/errors.rs
index f36486e573..38e7ecc1dd 100644
--- 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
index 05c932772c..df3c224f2f 100644
--- a/src/rustup-cli/rustup_mode.rs
+++ b/src/rustup-cli/rustup_mode.rs
@@ -468,7 +468,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
             };