fix

Author: syphar

src/db/add_package.rs

@@ -1,6 +1,6 @@
 use crate::{
     db::types::{
-        BuildId, BuildStatus, CrateId, Feature, ReleaseId, dependencies::ReleaseDependencyList,
+        BuildId, BuildStatus, CrateId, Feature, ReleaseId, dependencies::ReleaseDependency,
         version::Version,
     },
     docbuilder::DocCoverage,
@@ -48,7 +48,12 @@ pub(crate) async fn finish_release(
     source_size: u64,
 ) -> Result<()> {
     debug!("updating release data");
-    let dependencies: ReleaseDependencyList = metadata_pkg.dependencies.clone().into();
+    let dependencies: Vec<ReleaseDependency> = metadata_pkg
+        .dependencies
+        .iter()
+        .cloned()
+        .map(Into::into)
+        .collect();
     let rustdoc = get_rustdoc(metadata_pkg, source_dir).unwrap_or(None);
     let readme = get_readme(metadata_pkg, source_dir).unwrap_or(None);
     let features = get_features(metadata_pkg);

src/db/types/dependencies.rs

@@ -1,5 +1,4 @@
 use cargo_metadata::{Dependency, DependencyKind};
-use derive_more::Deref;
 use semver::VersionReq;
 use serde::{Deserialize, Serialize};
 
@@ -55,33 +54,18 @@ impl Serialize for ReleaseDependency {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, Default, Deref)]
-#[serde(transparent)]
-pub(crate) struct ReleaseDependencyList(Vec<ReleaseDependency>);
-
-impl<I> From<I> for ReleaseDependencyList
-where
-    I: IntoIterator<Item = Dependency>,
-{
-    fn from(deps: I) -> Self {
-        Self(
-            deps.into_iter()
-                .map(|dep| ReleaseDependency {
-                    name: dep.name,
-                    req: dep.req,
-                    kind: dep.kind,
-                    optional: dep.optional,
-                })
-                .collect(),
-        )
+impl From<Dependency> for ReleaseDependency {
+    fn from(dep: Dependency) -> Self {
+        ReleaseDependency {
+            name: dep.name,
+            req: dep.req,
+            kind: dep.kind,
+            optional: dep.optional,
+        }
     }
 }
 
-// impl ReleaseDependencyList {
-//     pub(crate) fn into_iter_dependencies(self) -> impl Iterator<Item = Dependency> {
-//         self.0.into_iter().map(|rd| rd.0)
-//     }
-// }
+pub(crate) type ReleaseDependencyList = Vec<ReleaseDependency>;
 
 #[cfg(test)]
 mod tests {
@@ -134,7 +118,7 @@ mod tests {
         expected_optional: bool,
     ) -> Result<()> {
         let deps: ReleaseDependencyList = serde_json::from_str(input)?;
-        let [dep] = deps.0.as_slice() else {
+        let [dep] = deps.as_slice() else {
             panic!("expected exactly one dependency");
         };
 

src/web/crate_details.rs

@@ -27,7 +27,6 @@ use axum::{
     extract::Extension,
     response::{IntoResponse, Response as AxumResponse},
 };
-use cargo_metadata::Dependency;
 use chrono::{DateTime, Utc};
 use futures_util::stream::TryStreamExt;
 use log::warn;
@@ -41,7 +40,7 @@ pub(crate) struct CrateDetails {
     pub(crate) version: Version,
     pub(crate) description: Option<String>,
     pub(crate) owners: Vec<(String, String, OwnerKind)>,
-    pub(crate) dependencies: Vec<Dependency>,
+    pub(crate) dependencies: ReleaseDependencyList,
     readme: Option<String>,
     rustdoc: Option<String>, // this is description_long in database
     release_time: Option<DateTime<Utc>>,
@@ -235,19 +234,15 @@ impl CrateDetails {
 
         let parsed_license = krate.license.as_deref().map(super::licenses::parse_license);
 
-        let dependencies = if let Some(value) = krate.dependencies {
-            match serde_json::from_value::<ReleaseDependencyList>(value) {
-                Ok(list) => list.into_iter_dependencies().collect(),
-                Err(_) => {
-                    // NOTE: we sometimes have invalid semver-requirement strings the database
-                    // (at the time writing, 14 releases out of 2 million).
-                    // We silently ignore those here.
-                    Vec::new()
-                }
-            }
-        } else {
-            Vec::new()
-        };
+        let dependencies = krate
+            .dependencies
+            .map(|value| serde_json::from_value::<ReleaseDependencyList>(value))
+            .transpose()
+            // NOTE: we sometimes have invalid semver-requirement strings the database
+            // (at the time writing, 14 releases out of 2 million).
+            // We silently ignore those here.
+            .unwrap_or_default()
+            .unwrap_or_default();
 
         let mut crate_details = CrateDetails {
             name: krate.name,
@@ -450,7 +445,7 @@ struct CrateDetailsPage {
     documentation_url: Option<String>,
     repository_url: Option<String>,
     repository_metadata: Option<RepositoryMetadata>,
-    dependencies: Vec<Dependency>,
+    dependencies: ReleaseDependencyList,
     releases: Vec<Release>,
     readme: Option<String>,
     build_status: BuildStatus,