Move DistributableToolchain::installed_paths() into Cfg

Author: djc

src/config.rs

@@ -427,6 +427,20 @@ impl<'a> Cfg<'a> {
         Ok(())
     }
 
+    pub(crate) fn installed_paths<'b>(
+        &self,
+        desc: &ToolchainDesc,
+        path: &'b Path,
+    ) -> anyhow::Result<Vec<InstalledPath<'b>>> {
+        Ok(vec![
+            InstalledPath::File {
+                name: "update hash",
+                path: self.get_hash_file(desc, false)?,
+            },
+            InstalledPath::Dir { path },
+        ])
+    }
+
     pub(crate) fn get_hash_file(
         &self,
         toolchain: &ToolchainDesc,
@@ -978,6 +992,12 @@ enum ParseMode {
     Both,
 }
 
+/// Installed paths
+pub(crate) enum InstalledPath<'a> {
+    File { name: &'static str, path: PathBuf },
+    Dir { path: &'a Path },
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/toolchain/distributable.rs

@@ -21,7 +21,7 @@ use crate::{
 
 use super::{
     names::{LocalToolchainName, ToolchainName},
-    toolchain::{InstalledPath, Toolchain},
+    toolchain::Toolchain,
 };
 
 /// An official toolchain installed on the local disk
@@ -545,20 +545,6 @@ impl<'a> DistributableToolchain<'a> {
             None => Ok(None),
         }
     }
-
-    pub(crate) fn installed_paths<'b>(
-        cfg: &Cfg<'_>,
-        desc: &ToolchainDesc,
-        path: &'b Path,
-    ) -> anyhow::Result<Vec<InstalledPath<'b>>> {
-        Ok(vec![
-            InstalledPath::File {
-                name: "update hash",
-                path: cfg.get_hash_file(desc, false)?,
-            },
-            InstalledPath::Dir { path },
-        ])
-    }
 }
 
 impl<'a> TryFrom<&Toolchain<'a>> for DistributableToolchain<'a> {

src/toolchain/toolchain.rs

@@ -16,7 +16,7 @@ use tracing::info;
 use wait_timeout::ChildExt;
 
 use crate::{
-    config::{ActiveReason, Cfg},
+    config::{ActiveReason, Cfg, InstalledPath},
     dist::PartialToolchainDesc,
     env_var, install,
     notifications::Notification,
@@ -424,9 +424,7 @@ impl<'a> Toolchain<'a> {
                 (cfg.notify_handler)(Notification::UninstallingToolchain(&name));
                 let installed_paths = match &name {
                     ToolchainName::Custom(_) => Ok(vec![InstalledPath::Dir { path: &path }]),
-                    ToolchainName::Official(desc) => {
-                        DistributableToolchain::installed_paths(cfg, desc, &path)
-                    }
+                    ToolchainName::Official(desc) => cfg.installed_paths(desc, &path),
                 }?;
                 for path in installed_paths {
                     match path {
@@ -459,9 +457,3 @@ impl<'a> Toolchain<'a> {
         Ok(())
     }
 }
-
-/// Installed paths
-pub(crate) enum InstalledPath<'a> {
-    File { name: &'static str, path: PathBuf },
-    Dir { path: &'a Path },
-}