Review refactorings

Author: l4l

src/crates/mod.rs

@@ -14,7 +14,7 @@ trait CrateTrait: std::fmt::Display {
 }
 
 enum CrateType {
-    CratesIO(registry::RegistryCrate),
+    Registry(registry::RegistryCrate),
     Git(git::GitRepo),
     Local(local::Local),
 }
@@ -25,7 +25,7 @@ pub struct Crate(CrateType);
 impl Crate {
     /// Load a create from specified registry.
     pub fn registry(registry_index: &str, name: &str, version: &str) -> Self {
-        Crate(CrateType::CratesIO(registry::RegistryCrate::new(
+        Crate(CrateType::Registry(registry::RegistryCrate::new(
             registry::Registry::Alternative(registry::AlternativeRegistry::new(registry_index)),
             name,
             version,
@@ -34,7 +34,7 @@ impl Crate {
 
     /// Load a crate from the [crates.io registry](https://crates.io).
     pub fn crates_io(name: &str, version: &str) -> Self {
-        Crate(CrateType::CratesIO(registry::RegistryCrate::new(
+        Crate(CrateType::Registry(registry::RegistryCrate::new(
             registry::Registry::CratesIo,
             name,
             version,
@@ -86,7 +86,7 @@ impl Crate {
 
     fn as_trait(&self) -> &dyn CrateTrait {
         match &self.0 {
-            CrateType::CratesIO(krate) => krate,
+            CrateType::Registry(krate) => krate,
             CrateType::Git(repo) => repo,
             CrateType::Local(local) => local,
         }

src/crates/registry.rs

@@ -10,6 +10,58 @@ use tar::Archive;
 
 static CRATES_ROOT: &str = "https://static.crates.io/crates";
 
+pub struct AlternativeRegistry {
+    registry_index: String,
+}
+
+impl AlternativeRegistry {
+    pub fn new(registry_index: impl Into<String>) -> AlternativeRegistry {
+        AlternativeRegistry {
+            registry_index: registry_index.into(),
+        }
+    }
+
+    fn index(&self) -> &str {
+        self.registry_index.as_str()
+    }
+
+    fn index_folder(&self) -> String {
+        crate::utils::escape_path(self.registry_index.as_bytes())
+    }
+}
+
+pub enum Registry {
+    CratesIo,
+    Alternative(AlternativeRegistry),
+}
+
+impl Registry {
+    fn cache_folder(&self) -> String {
+        match self {
+            Registry::CratesIo => "cratesio-sources".into(),
+            Registry::Alternative(alt) => format!("{}-sources", alt.index_folder()),
+        }
+    }
+
+    fn name(&self) -> String {
+        match self {
+            Registry::CratesIo => "crates.io".into(),
+            Registry::Alternative(alt) => alt.index().to_string(),
+        }
+    }
+}
+
+pub(super) struct RegistryCrate {
+    registry: Registry,
+    name: String,
+    version: String,
+}
+
+#[derive(serde::Deserialize)]
+struct IndexConfig {
+    dl: String,
+}
+
 impl RegistryCrate {
     pub(super) fn new(registry: Registry, name: &str, version: &str) -> Self {
         RegistryCrate {
@@ -69,58 +121,6 @@ impl RegistryCrate {
     }
 }
 
-#[derive(serde::Deserialize)]
-struct IndexConfig {
-    dl: String,
-}
-
-pub struct AlternativeRegistry {
-    registry_index: String,
-}
-
-impl AlternativeRegistry {
-    pub fn new(registry_index: impl Into<String>) -> AlternativeRegistry {
-        AlternativeRegistry {
-            registry_index: registry_index.into(),
-        }
-    }
-
-    fn index(&self) -> &str {
-        self.registry_index.as_str()
-    }
-
-    fn index_folder(&self) -> String {
-        crate::utils::escape_path(self.registry_index.as_bytes())
-    }
-}
-
-pub enum Registry {
-    CratesIo,
-    Alternative(AlternativeRegistry),
-}
-
-impl Registry {
-    fn cache_folder(&self) -> String {
-        match self {
-            Registry::CratesIo => "cratesio-sources".into(),
-            Registry::Alternative(alt) => format!("{}-sources", alt.index()),
-        }
-    }
-
-    fn name(&self) -> String {
-        match self {
-            Registry::CratesIo => "crates.io".into(),
-            Registry::Alternative(_alt) => todo!(),
-        }
-    }
-}
-
-pub(super) struct RegistryCrate {
-    registry: Registry,
-    name: String,
-    version: String,
-}
-
 impl CrateTrait for RegistryCrate {
     fn fetch(&self, workspace: &Workspace) -> Result<(), Error> {
         let local = self.cache_path(workspace);