Dead code removal

Author: rbtcollins

src/errors.rs

@@ -189,10 +189,6 @@ error_chain! {
             description("invalid toolchain name")
             display("invalid toolchain name: '{}'", t)
         }
-        InvalidCustomToolchainName(t: String) {
-            description("invalid custom toolchain name")
-            display("invalid custom toolchain name: '{}'", t)
-        }
         InvalidProfile(t: String) {
             description("invalid profile name")
             display("invalid profile name: '{}'; valid names are: {}", t, valid_profile_names())

src/install.rs

@@ -1,11 +1,9 @@
 //! Installation and upgrade of both distribution-managed and local
 //! toolchains
 
-use crate::dist::component::{Components, Package, TarGzPackage, Transaction};
 use crate::dist::dist;
 use crate::dist::download::DownloadCfg;
 use crate::dist::prefix::InstallPrefix;
-use crate::dist::temp;
 use crate::dist::Notification;
 use crate::errors::Result;
 use crate::notifications::Notification as RootNotification;
@@ -17,7 +15,6 @@ use std::path::Path;
 pub enum InstallMethod<'a> {
     Copy(&'a Path, &'a CustomToolchain<'a>),
     Link(&'a Path, &'a CustomToolchain<'a>),
-    Installer(&'a Path, &'a temp::Cfg, &'a CustomToolchain<'a>),
     // bool is whether to force an update
     Dist {
         desc: &'a dist::ToolchainDesc,
@@ -86,7 +83,7 @@ impl<'a> InstallMethod<'a> {
         if path.exists() {
             // Don't uninstall first for Dist method
             match self {
-                InstallMethod::Dist { .. } | InstallMethod::Installer(..) => {}
+                InstallMethod::Dist { .. } => {}
                 _ => {
                     uninstall(path, notify_handler)?;
                 }
@@ -102,10 +99,6 @@ impl<'a> InstallMethod<'a> {
                 utils::symlink_dir(src, &path, notify_handler)?;
                 Ok(true)
             }
-            InstallMethod::Installer(src, temp_cfg, ..) => {
-                InstallMethod::tar_gz(src, path, &temp_cfg, notify_handler)?;
-                Ok(true)
-            }
             InstallMethod::Dist {
                 desc,
                 profile,
@@ -145,34 +138,6 @@ impl<'a> InstallMethod<'a> {
             }
         }
     }
-
-    fn tar_gz(
-        src: &Path,
-        path: &Path,
-        temp_cfg: &temp::Cfg,
-        notify_handler: &dyn Fn(Notification<'_>),
-    ) -> Result<()> {
-        notify_handler(Notification::Extracting(src, path));
-
-        let prefix = InstallPrefix::from(path.to_owned());
-        let installation = Components::open(prefix.clone())?;
-        let notification_converter = |notification: crate::utils::Notification<'_>| {
-            notify_handler(notification.into());
-        };
-        let reader = utils::FileReaderWithProgress::new_file(&src, &notification_converter)?;
-        let package: &dyn Package =
-            &TarGzPackage::new(reader, temp_cfg, Some(&notification_converter))?;
-
-        let mut tx = Transaction::new(prefix, temp_cfg, notify_handler);
-
-        for component in package.components() {
-            tx = package.install(&installation, &component, None, tx)?;
-        }
-
-        tx.commit();
-
-        Ok(())
-    }
 }
 
 pub fn uninstall(path: &Path, notify_handler: &dyn Fn(Notification<'_>)) -> Result<()> {

src/toolchain.rs

@@ -22,7 +22,6 @@ use std::process::{Command, Stdio};
 use std::str::FromStr;
 use std::time::Duration;
 
-use url::Url;
 use wait_timeout::ChildExt;
 
 /// An installed toolchain
@@ -151,65 +150,6 @@ impl<'a> Toolchain<'a> {
             == Some(true)
     }
 
-    // TO be a downcast or something.
-    fn ensure_custom(&self) -> Result<()> {
-        if !self.is_custom() {
-            Err(crate::ErrorKind::InvalidCustomToolchainName(self.name.to_string()).into())
-        } else {
-            Ok(())
-        }
-    }
-
-    // Custom only. Installed or not installed.
-    pub fn install_from_installers(&self, installers: &[&OsStr]) -> Result<()> {
-        self.ensure_custom()?;
-
-        let custom = CustomToolchain::new(&self)?;
-        self.remove()?;
-
-        // FIXME: This should do all downloads first, then do
-        // installs, and do it all in a single transaction.
-        for installer in installers {
-            let installer_str = installer.to_str().unwrap_or("bogus");
-            match installer_str.rfind('.') {
-                Some(i) => {
-                    let extension = &installer_str[i + 1..];
-                    if extension != "gz" {
-                        return Err(ErrorKind::BadInstallerType(extension.to_string()).into());
-                    }
-                }
-                None => return Err(ErrorKind::BadInstallerType(String::from("(none)")).into()),
-            }
-
-            // FIXME: Pretty hacky
-            let is_url = installer_str.starts_with("file://")
-                || installer_str.starts_with("http://")
-                || installer_str.starts_with("https://");
-            let url = Url::parse(installer_str).ok();
-            let url = if is_url { url } else { None };
-            if let Some(url) = url {
-                // Download to a local file
-                let local_installer = self.cfg.temp_cfg.new_file_with_ext("", ".tar.gz")?;
-                utils::download_file(&url, &local_installer, None, &|n| {
-                    (self.cfg.notify_handler)(n.into())
-                })?;
-                InstallMethod::Installer(&local_installer, &self.cfg.temp_cfg, &custom)
-                    .install(&self)?;
-            } else {
-                // If installer is a filename
-
-                // No need to download
-                let local_installer = Path::new(installer);
-
-                // Install from file
-                InstallMethod::Installer(&local_installer, &self.cfg.temp_cfg, &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() {