fix

Author: syphar

src/db/add_package.rs

@@ -7,7 +7,7 @@ use crate::{
     error::Result,
     registry_api::{CrateData, CrateOwner, ReleaseData},
     storage::CompressionAlgorithm,
-    utils::{MetadataPackage, rustc_version::parse_rustc_date},
+    utils::{cargo_metadata::PackageExt, rustc_version::parse_rustc_date},
     web::crate_details::{latest_release, releases_for_crate},
 };
 use anyhow::{Context, anyhow};
@@ -1301,13 +1301,4 @@ mod test {
             Ok(())
         })
     }
-
-    #[test_case("[]")]
-    #[test_case(r#"[["rand", "^0.9", "normal", false], ["sdl3", "^0.16", "normal", false]]"#)]
-    #[test_case(r#"[["vec_map", "^0.0.1", "normal", false]]"#)]
-    #[test_case(r#"[["byteorder","^0.5"],["clippy","^0"],["num","^0.1"],["quickcheck","^0.2"]]"#)]
-    fn test_parse_release_dependency_json(input: &str) -> Result<()> {
-        let deps: Vec<ReleaseDependency> = serde_json::from_str(input)?;
-        Ok(())
-    }
 }

src/db/types/dependencies.rs

@@ -1,20 +1,22 @@
-use crate::utils::Dependency;
+use cargo_metadata::{Dependency, DependencyBuilder, DependencyKind};
 use derive_more::Deref;
 use semver::VersionReq;
 use serde::{Deserialize, Serialize};
 
-const DEFAULT_KIND: &str = "normal";
-
 /// The three possible representations of a dependency in our internal JSON format
 /// in the `releases.dependencies` column.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
 enum Dep {
     Two((String, VersionReq)),
-    Three((String, VersionReq, String)),
-    Four((String, VersionReq, String, bool)),
+    Three((String, VersionReq, DependencyKind)),
+    Four((String, VersionReq, DependencyKind, bool)),
 }
 
+// FIXME: open question: should we use `cargo_metadata::Dependency` here? We would insert
+// many default values like default-features, registry, rename, etc,
+// that we don't have in the database.
+
 /// A crate dependency in our internal representation for releases.dependencies json.
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Deref)]
 #[serde(from = "Dep", into = "Dep")]
@@ -23,31 +25,35 @@ pub(crate) struct ReleaseDependency(Dependency);
 impl From<Dep> for ReleaseDependency {
     fn from(src: Dep) -> Self {
         let (name, req, kind, optional) = match src {
-            Dep::Two((name, req)) => (name, req, DEFAULT_KIND.into(), false),
+            Dep::Two((name, req)) => (name, req, DependencyKind::default(), false),
             Dep::Three((name, req, kind)) => (name, req, kind, false),
             Dep::Four((name, req, kind, optional)) => (name, req, kind, optional),
         };
 
-        ReleaseDependency(Dependency {
-            name,
-            req,
-            kind: Some(kind),
-            optional,
-            rename: None,
-        })
+        ReleaseDependency(
+            DependencyBuilder::default()
+                .name(name)
+                .source(None)
+                .req(req)
+                .kind(kind)
+                .optional(optional)
+                .uses_default_features(false)
+                .features(vec![])
+                .target(None)
+                .rename(None)
+                .registry(None)
+                .path(None)
+                .build()
+                .expect("we know the data is correct"),
+        )
     }
 }
 
 impl From<ReleaseDependency> for Dep {
     // dependency serialization for new releases.
     fn from(rd: ReleaseDependency) -> Self {
         let d = rd.0;
-        Dep::Four((
-            d.name,
-            d.req,
-            d.kind.unwrap_or_else(|| DEFAULT_KIND.into()),
-            d.optional,
-        ))
+        Dep::Four((d.name, d.req, d.kind, d.optional))
     }
 }