git::Crate: Extract separate DependencyKind enum

We will extract the `git` module into a dedicated crate in one of the next commits. This would be impossible if the crate had to depend on the main crate, since it would result in a cyclic dependency.

Author: Turbo87

src/controllers/krate/publish.rs

@@ -355,7 +355,7 @@ pub fn add_dependencies(
                     optional: dep.optional,
                     default_features: dep.default_features,
                     target: dep.target.clone(),
-                    kind: dep.kind.or(Some(DependencyKind::Normal)),
+                    kind: dep.kind.or(Some(DependencyKind::Normal)).map(|dk| dk.into()),
                     package,
                 },
                 (

src/git.rs

@@ -7,8 +7,6 @@ use std::process::Command;
 use tempfile::TempDir;
 use url::Url;
 
-use crate::models::DependencyKind;
-
 static DEFAULT_GIT_SSH_USERNAME: &str = "git";
 
 #[derive(Clone)]
@@ -148,6 +146,14 @@ pub struct Dependency {
     pub package: Option<String>,
 }
 
+#[derive(Copy, Clone, Serialize, Deserialize, Debug)]
+#[serde(rename_all = "lowercase")]
+pub enum DependencyKind {
+    Normal,
+    Build,
+    Dev,
+}
+
 pub struct RepositoryConfig {
     pub index_location: Url,
     pub credentials: Credentials,

src/models/dependency.rs

@@ -2,6 +2,7 @@ use diesel::deserialize::{self, FromSql};
 use diesel::pg::Pg;
 use diesel::sql_types::Integer;
 
+use crate::git::DependencyKind as IndexDependencyKind;
 use crate::models::{Crate, Version};
 use crate::schema::*;
 
@@ -42,6 +43,16 @@ pub enum DependencyKind {
     // if you add a kind here, be sure to update `from_row` below.
 }
 
+impl From<DependencyKind> for IndexDependencyKind {
+    fn from(dk: DependencyKind) -> Self {
+        match dk {
+            DependencyKind::Normal => IndexDependencyKind::Normal,
+            DependencyKind::Build => IndexDependencyKind::Build,
+            DependencyKind::Dev => IndexDependencyKind::Dev,
+        }
+    }
+}
+
 impl FromSql<Integer, Pg> for DependencyKind {
     fn from_sql(bytes: Option<&[u8]>) -> deserialize::Result<Self> {
         match <i32 as FromSql<Integer, Pg>>::from_sql(bytes)? {