get rid of Vec<_> newtype

Author: syphar

src/db/add_package.rs

@@ -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: ReleaseDependencyList = 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

@@ -55,25 +55,20 @@ 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(ReleaseDependency).collect())
+impl From<Dependency> for ReleaseDependency {
+    fn from(dep: Dependency) -> Self {
+        ReleaseDependency(dep)
     }
 }
 
-impl ReleaseDependencyList {
-    pub(crate) fn into_iter_dependencies(self) -> impl Iterator<Item = Dependency> {
-        self.0.into_iter().map(|rd| rd.0)
+impl From<ReleaseDependency> for Dependency {
+    fn from(dep: ReleaseDependency) -> Self {
+        dep.0
     }
 }
 
+pub(crate) type ReleaseDependencyList = Vec<ReleaseDependency>;
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -117,7 +112,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

@@ -234,19 +234,18 @@ 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: Vec<Dependency> = krate
+            .dependencies
+            .map(serde_json::from_value::<ReleaseDependencyList>)
+            .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()
+            .into_iter()
+            .map(Into::into)
+            .collect();
 
         let mut crate_details = CrateDetails {
             name: krate.name,