Move show_dist_version to DistributableToolchain

Author: rbtcollins

src/cli/rustup_mode.rs

@@ -784,7 +784,7 @@ fn check_updates(cfg: &Cfg) -> Result<()> {
             (ref name, Ok(ref toolchain)) => {
                 let distributable = DistributableToolchain::new(&toolchain)?;
                 let current_version = distributable.show_version()?;
-                let dist_version = toolchain.show_dist_version()?;
+                let dist_version = distributable.show_dist_version()?;
                 let _ = t.attr(term2::Attr::Bold);
                 write!(t, "{} - ", name)?;
                 match (current_version, dist_version) {

src/toolchain.rs

@@ -496,19 +496,6 @@ impl<'a> Toolchain<'a> {
         })
     }
     // Distributable only. Installed only.
-    pub fn show_dist_version(&self) -> Result<Option<String>> {
-        let update_hash = self.update_hash()?;
-
-        match crate::dist::dist::dl_v2_manifest(
-            self.download_cfg(),
-            update_hash.as_ref().map(|p| &**p),
-            &self.desc()?,
-        )? {
-            Some((manifest, _)) => Ok(Some(manifest.get_rust_version()?.to_string())),
-            None => Ok(None),
-        }
-    }
-    // Distributable only. Installed only.
     pub fn list_components(&self) -> Result<Option<Vec<ComponentStatus>>> {
         if !self.exists() {
             return Err(ErrorKind::ToolchainNotInstalled(self.name.to_owned()).into());
@@ -894,6 +881,20 @@ impl<'a> DistributableToolchain<'a> {
         }
     }
 
+    // Installed only.
+    pub fn show_dist_version(&self) -> Result<Option<String>> {
+        let update_hash = self.0.update_hash()?;
+
+        match crate::dist::dist::dl_v2_manifest(
+            self.0.download_cfg(),
+            update_hash.as_ref().map(|p| &**p),
+            &self.0.desc()?,
+        )? {
+            Some((manifest, _)) => Ok(Some(manifest.get_rust_version()?.to_string())),
+            None => Ok(None),
+        }
+    }
+
     // Installed only.
     pub fn show_version(&self) -> Result<Option<String>> {
         match self.get_manifest()? {