Move show_version to DistributableToolchain

Author: rbtcollins

src/cli/rustup_mode.rs

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

src/toolchain.rs

@@ -496,14 +496,6 @@ impl<'a> Toolchain<'a> {
         })
     }
     // Distributable only. Installed only.
-    pub fn show_version(&self) -> Result<Option<String>> {
-        let distributable = DistributableToolchain::new(&self)?;
-        match distributable.get_manifest()? {
-            Some(manifest) => Ok(Some(manifest.get_rust_version()?.to_string())),
-            None => Ok(None),
-        }
-    }
-    // Distributable only. Installed only.
     pub fn show_dist_version(&self) -> Result<Option<String>> {
         let update_hash = self.update_hash()?;
 
@@ -860,7 +852,7 @@ impl<'a> DistributableToolchain<'a> {
     }
 
     // Installed only.
-    pub fn get_manifest(&self) -> Result<Option<Manifest>> {
+    fn get_manifest(&self) -> Result<Option<Manifest>> {
         if !self.0.exists() {
             return Err(ErrorKind::ToolchainNotInstalled(self.0.name().to_owned()).into());
         }
@@ -897,4 +889,12 @@ impl<'a> DistributableToolchain<'a> {
             targets,
         ))
     }
+
+    // Installed only.
+    pub fn show_version(&self) -> Result<Option<String>> {
+        match self.get_manifest()? {
+            Some(manifest) => Ok(Some(manifest.get_rust_version()?.to_string())),
+            None => Ok(None),
+        }
+    }
 }