Extract split_features() fn

Author: Turbo87

src/models.rs

@@ -24,6 +24,7 @@ mod default_versions;
 pub mod dependency;
 mod download;
 mod email;
+pub mod feature;
 mod follow;
 mod keyword;
 pub mod krate;

src/models/feature.rs

@@ -0,0 +1,15 @@
+use std::collections::BTreeMap;
+
+pub type FeaturesMap = BTreeMap<String, Vec<String>>;
+
+/// Splits the given [`FeaturesMap`] into two [`FeaturesMap`]s based on their
+/// values.
+///
+/// See <https://rust-lang.github.io/rfcs/3143-cargo-weak-namespaced-features.html>.
+pub fn split_features(features: FeaturesMap) -> (FeaturesMap, FeaturesMap) {
+    features.into_iter().partition(|(_k, vals)| {
+        !vals
+            .iter()
+            .any(|v| v.starts_with("dep:") || v.contains("?/"))
+    })
+}

src/models/krate.rs

@@ -1,5 +1,3 @@
-use std::collections::BTreeMap;
-
 use chrono::NaiveDateTime;
 use diesel::associations::Identifiable;
 use diesel::dsl;
@@ -10,6 +8,7 @@ use secrecy::SecretString;
 use thiserror::Error;
 
 use crate::controllers::helpers::pagination::*;
+use crate::models::feature::split_features;
 use crate::models::helpers::with_count::*;
 use crate::models::version::TopVersions;
 use crate::models::{
@@ -484,12 +483,7 @@ impl Crate {
                 deps.sort();
 
                 let features = version.features().unwrap_or_default();
-                let (features, features2): (BTreeMap<_, _>, BTreeMap<_, _>) =
-                    features.into_iter().partition(|(_k, vals)| {
-                        !vals
-                            .iter()
-                            .any(|v| v.starts_with("dep:") || v.contains("?/"))
-                    });
+                let (features, features2) = split_features(features);
 
                 let (features2, v) = if features2.is_empty() {
                     (None, None)

src/models/version.rs

@@ -7,6 +7,7 @@ use serde::Deserialize;
 
 use crate::util::errors::{bad_request, AppResult};
 
+use crate::models::feature::FeaturesMap;
 use crate::models::{Crate, Dependency, User};
 use crate::schema::*;
 use crate::sql::split_part;
@@ -71,7 +72,7 @@ impl Version {
     ///
     /// * `Ok(BTreeMap<String, Vec<String>>)` - If the deserialization was successful.
     /// * `Err(serde_json::Error)` - If the deserialization failed.
-    pub fn features(&self) -> Result<BTreeMap<String, Vec<String>>, serde_json::Error> {
+    pub fn features(&self) -> Result<FeaturesMap, serde_json::Error> {
         BTreeMap::<String, Vec<String>>::deserialize(&self.features)
     }
 }