Move install_from_dir to CustomToolchain

Author: rbtcollins

src/cli/errors.rs

@@ -26,6 +26,9 @@ error_chain! {
     }
 
     errors {
+        InvalidCustomToolchainName(t: String) {
+            display("invalid custom toolchain name: '{}'", t)
+        }
         PermissionDenied {
             description("permission denied")
         }

src/cli/rustup_mode.rs

@@ -5,10 +5,11 @@ use crate::self_update;
 use crate::term2;
 use crate::term2::Terminal;
 use crate::topical_doc;
+
 use clap::{App, AppSettings, Arg, ArgGroup, ArgMatches, Shell, SubCommand};
 use rustup::dist::dist::{PartialTargetTriple, PartialToolchainDesc, Profile, TargetTriple};
 use rustup::dist::manifest::Component;
-use rustup::toolchain::DistributableToolchain;
+use rustup::toolchain::{CustomToolchain, DistributableToolchain};
 use rustup::utils::utils::{self, ExitCode};
 use rustup::Notification;
 use rustup::{command, Cfg, ComponentStatus, Toolchain};
@@ -1233,9 +1234,13 @@ fn toolchain_link(cfg: &Cfg, m: &ArgMatches<'_>) -> Result<()> {
     let path = m.value_of("path").unwrap();
     let toolchain = cfg.get_toolchain(toolchain, true)?;
 
-    toolchain
-        .install_from_dir(Path::new(path), true)
-        .map_err(Into::into)
+    if let Ok(custom) = CustomToolchain::new(&toolchain) {
+        custom
+            .install_from_dir(Path::new(path), true)
+            .map_err(Into::into)
+    } else {
+        Err(ErrorKind::InvalidCustomToolchainName(toolchain.name().to_string()).into())
+    }
 }
 
 fn toolchain_remove(cfg: &mut Cfg, m: &ArgMatches<'_>) -> Result<()> {

src/toolchain.rs

@@ -221,30 +221,6 @@ impl<'a> Toolchain<'a> {
         Ok(())
     }
 
-    // Custom only. Not installed only.
-    pub fn install_from_dir(&self, src: &Path, link: bool) -> Result<()> {
-        self.ensure_custom()?;
-        let custom = CustomToolchain::new(&self)?;
-
-        let mut pathbuf = PathBuf::from(src);
-
-        pathbuf.push("lib");
-        utils::assert_is_directory(&pathbuf)?;
-        pathbuf.pop();
-        pathbuf.push("bin");
-        utils::assert_is_directory(&pathbuf)?;
-        pathbuf.push(format!("rustc{}", EXE_SUFFIX));
-        utils::assert_is_file(&pathbuf)?;
-
-        if link {
-            InstallMethod::Link(&utils::to_absolute(src)?, &custom).install(&self)?;
-        } else {
-            InstallMethod::Copy(src, &custom).install(&self)?;
-        }
-
-        Ok(())
-    }
-
     // Both Distributable and Custom; Installed only.
     pub fn create_command<T: AsRef<OsStr>>(&self, binary: T) -> Result<Command> {
         if !self.exists() {
@@ -514,6 +490,27 @@ impl<'a> CustomToolchain<'a> {
             Err(format!("{} is not a custom toolchain", toolchain.name()).into())
         }
     }
+
+    // Not installed only.
+    pub fn install_from_dir(&self, src: &Path, link: bool) -> Result<()> {
+        let mut pathbuf = PathBuf::from(src);
+
+        pathbuf.push("lib");
+        utils::assert_is_directory(&pathbuf)?;
+        pathbuf.pop();
+        pathbuf.push("bin");
+        utils::assert_is_directory(&pathbuf)?;
+        pathbuf.push(format!("rustc{}", EXE_SUFFIX));
+        utils::assert_is_file(&pathbuf)?;
+
+        if link {
+            InstallMethod::Link(&utils::to_absolute(src)?, self).install(&self.0)?;
+        } else {
+            InstallMethod::Copy(src, self).install(&self.0)?;
+        }
+
+        Ok(())
+    }
 }
 
 impl<'a> InstalledToolchain<'a> for CustomToolchain<'a> {