unify the vec_from_comma_separated func

Author: s7tya

site/src/api.rs

@@ -4,10 +4,43 @@
 //!
 //! The responses are calculated in the server.rs file.
 
+use serde::de::{DeserializeOwned, Error};
+use serde::Deserializer;
+use std::fmt::Formatter;
+use std::marker::PhantomData;
 use std::result::Result as StdResult;
 
 pub type ServerResult<T> = StdResult<T, String>;
 
+// Deserializes a comma separated list of GraphKind values
+fn vec_from_comma_separated<'de, T: DeserializeOwned, D>(
+    deserializer: D,
+) -> Result<Vec<T>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    struct CommaSeparatedVisitor<T>(PhantomData<T>);
+
+    impl<'de, T: DeserializeOwned> serde::de::Visitor<'de> for CommaSeparatedVisitor<T> {
+        type Value = Vec<T>;
+
+        fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
+            formatter.write_str("comma separated list of GraphKind values")
+        }
+
+        fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+        where
+            E: Error,
+        {
+            v.split(',')
+                .map(|v| T::deserialize(serde::de::value::StrDeserializer::new(v)))
+                .collect::<Result<Vec<T>, _>>()
+        }
+    }
+
+    deserializer.deserialize_str(CommaSeparatedVisitor(Default::default()))
+}
+
 pub mod info {
     use database::Date;
     use serde::Serialize;
@@ -112,11 +145,9 @@ pub mod graphs {
 
 pub mod detail_graphs {
     use crate::api::graphs::{GraphKind, Series};
+    use crate::api::vec_from_comma_separated;
     use collector::Bound;
-    use serde::de::{DeserializeOwned, Error};
-    use serde::{Deserialize, Deserializer, Serialize};
-    use std::fmt::Formatter;
-    use std::marker::PhantomData;
+    use serde::{Deserialize, Serialize};
 
     #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
     pub struct Request {
@@ -130,35 +161,6 @@ pub mod detail_graphs {
         pub kinds: Vec<GraphKind>,
     }
 
-    // Deserializes a comma separated list of GraphKind values
-    fn vec_from_comma_separated<'de, T: DeserializeOwned, D>(
-        deserializer: D,
-    ) -> Result<Vec<T>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        struct CommaSeparatedVisitor<T>(PhantomData<T>);
-
-        impl<'de, T: DeserializeOwned> serde::de::Visitor<'de> for CommaSeparatedVisitor<T> {
-            type Value = Vec<T>;
-
-            fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
-                formatter.write_str("comma separated list of GraphKind values")
-            }
-
-            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
-            where
-                E: Error,
-            {
-                v.split(',')
-                    .map(|v| T::deserialize(serde::de::value::StrDeserializer::new(v)))
-                    .collect::<Result<Vec<T>, _>>()
-            }
-        }
-
-        deserializer.deserialize_str(CommaSeparatedVisitor(Default::default()))
-    }
-
     #[derive(Debug, Serialize)]
     pub struct Response {
         pub commits: Vec<(i64, String)>,
@@ -203,11 +205,9 @@ pub mod detail_sections {
 
 pub mod runtime_detail_graphs {
     use crate::api::graphs::{GraphKind, Series};
+    use crate::api::vec_from_comma_separated;
     use collector::Bound;
-    use serde::de::{DeserializeOwned, Error};
-    use serde::{Deserialize, Deserializer, Serialize};
-    use std::fmt::Formatter;
-    use std::marker::PhantomData;
+    use serde::{Deserialize, Serialize};
 
     #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
     pub struct Request {
@@ -219,35 +219,6 @@ pub mod runtime_detail_graphs {
         pub kinds: Vec<GraphKind>,
     }
 
-    // Deserializes a comma separated list of GraphKind values
-    fn vec_from_comma_separated<'de, T: DeserializeOwned, D>(
-        deserializer: D,
-    ) -> Result<Vec<T>, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        struct CommaSeparatedVisitor<T>(PhantomData<T>);
-
-        impl<'de, T: DeserializeOwned> serde::de::Visitor<'de> for CommaSeparatedVisitor<T> {
-            type Value = Vec<T>;
-
-            fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
-                formatter.write_str("comma separated list of GraphKind values")
-            }
-
-            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
-            where
-                E: Error,
-            {
-                v.split(',')
-                    .map(|v| T::deserialize(serde::de::value::StrDeserializer::new(v)))
-                    .collect::<Result<Vec<T>, _>>()
-            }
-        }
-
-        deserializer.deserialize_str(CommaSeparatedVisitor(Default::default()))
-    }
-
     #[derive(Debug, Serialize)]
     pub struct Response {
         pub commits: Vec<(i64, String)>,