Auto merge of #595 - Mark-Simulacrum:cleanup-deps, r=Mark-Simulacrum

Cleanup deps

Drops paste entirely, removes tokio + futures deps from Cargo.toml (still transitive deps).

Author: bors

Cargo.lock

@@ -23,13 +23,11 @@ csv = "1.0.2"
 dotenv = "0.13"
 failure = "0.1.3"
 flate2 = "1"
-futures = "0.1.13"
 http = "0.1.10"
 hyper = "0.12.8"
 lazy_static = "1.0"
 mime = "0.3.1"
 minifier = { version = "0.0.20", features = ["html"] }
-paste = "0.1.3"
 petgraph = "0.4.11"
 r2d2 = "0.8.2"
 r2d2_sqlite = "0.19.0"
@@ -49,7 +47,6 @@ structopt-derive = "0.2"
 tar = "0.4.0"
 tempfile = "3.0.0"
 tera = "0.11.7"
-tokio = "0.1.11"
 toml = "0.4.6"
 url = "1.1"
 walkdir = "2"

Cargo.toml

@@ -44,7 +44,8 @@ string_enum!(pub enum CapLints {
 
 const SMALL_RANDOM_COUNT: u32 = 20;
 
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(try_from = "String", into = "String")]
 pub enum CrateSelect {
     Full,
     Demo,
@@ -55,6 +56,8 @@ pub enum CrateSelect {
     List(HashSet<String>),
 }
 
+from_into_string!(CrateSelect);
+
 impl FromStr for CrateSelect {
     type Err = failure::Error;
 
@@ -167,8 +170,6 @@ impl FromStr for DeferredCrateSelect {
     }
 }
 
-impl_serde_from_parse!(CrateSelect, expecting = "A valid value of `CrateSelect`");
-
 #[cfg_attr(test, derive(Debug, PartialEq, Eq))]
 #[derive(Clone, Serialize, Deserialize)]
 pub enum Assignee {

src/experiments.rs

@@ -115,7 +115,8 @@ macro_rules! test_result_enum {
         with_reason { $($with_reason_name:ident($reason:ident) => $with_reason_repr:expr,)* }
         without_reason { $($reasonless_name:ident => $reasonless_repr:expr,)* }
     }) => {
-        #[derive(Debug, PartialEq, Eq, Hash, Clone)]
+        #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize, Deserialize)]
+        #[serde(try_from = "String", into = "String")]
         pub enum $name {
             $($with_reason_name($reason),)*
             $($reasonless_name,)*
@@ -301,7 +302,7 @@ test_result_enum!(pub enum TestResult {
     }
 });
 
-impl_serde_from_parse!(TestResult, expecting = "a test result");
+from_into_string!(TestResult);
 
 #[cfg(test)]
 mod tests {

src/results/mod.rs

@@ -1,6 +1,7 @@
 macro_rules! string_enum {
     ($vis:vis enum $name:ident { $($item:ident => $str:expr,)* }) => {
-        #[derive(Debug, PartialEq, Eq, Hash, Copy, Clone)]
+        #[derive(Debug, PartialEq, Eq, Hash, Copy, Clone, Serialize, Deserialize)]
+        #[serde(try_from = "String", into = "String")]
         $vis enum $name {
             $($item,)*
         }
@@ -36,44 +37,22 @@ macro_rules! string_enum {
             }
         }
 
-        impl_serde_from_parse!($name, expecting="foo");
+        from_into_string!($name);
     }
 }
 
-macro_rules! impl_serde_from_parse {
-    ($for:ident, expecting=$expecting:expr) => {
-        paste::item! {
-            struct [<$for Visitor>];
-
-            impl<'de> ::serde::de::Visitor<'de> for [<$for Visitor>] {
-                type Value = $for;
-
-                fn expecting(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-                    f.write_str($expecting)
-                }
-
-                fn visit_str<E: ::serde::de::Error>(self, input: &str) -> Result<$for, E> {
-                    use std::str::FromStr;
-                    $for::from_str(input).map_err(E::custom)
-                }
-            }
-        }
-
-        impl<'de> ::serde::de::Deserialize<'de> for $for {
-            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-            where
-                D: ::serde::de::Deserializer<'de>,
-            {
-                deserializer.deserialize_str(paste::expr! { [<$for Visitor>] })
+macro_rules! from_into_string {
+    ($for:ident) => {
+        impl std::convert::TryFrom<String> for $for {
+            type Error = <$for as std::str::FromStr>::Err;
+            fn try_from(s: String) -> Result<Self, <$for as std::str::FromStr>::Err> {
+                s.parse()
             }
         }
 
-        impl ::serde::ser::Serialize for $for {
-            fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-            where
-                S: ::serde::ser::Serializer,
-            {
-                serializer.serialize_str(&self.to_string())
+        impl From<$for> for String {
+            fn from(s: $for) -> String {
+                s.to_string()
             }
         }
     };

src/utils/macros.rs

@@ -2,7 +2,8 @@ use crate::prelude::*;
 use std::fmt;
 use std::str::FromStr;
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(try_from = "String", into = "String")]
 pub enum Size {
     Bytes(usize),
     Kilobytes(usize),
@@ -11,6 +12,8 @@ pub enum Size {
     Terabytes(usize),
 }
 
+from_into_string!(Size);
+
 impl Size {
     pub(crate) fn to_bytes(&self) -> usize {
         match self {
@@ -61,8 +64,6 @@ impl FromStr for Size {
     }
 }
 
-impl_serde_from_parse!(Size, expecting = "a size");
-
 #[cfg(test)]
 mod tests {
     use super::Size;