Merge pull request #42 from tox-rs/config_update

Remove custom deserializer for log type

Author: kpp

Cargo.lock

@@ -26,7 +26,7 @@ log = "0.4"
 regex = "1"
 tokio = "0.1.7"
 tokio-codec = "0.1"
-config = "0.9.1"
+config = "0.9"
 serde = "1.0"
 serde_derive = "1.0"
 serde_yaml = "0.8.8"

Cargo.toml

@@ -70,6 +70,21 @@ pub struct BootstrapNode {
     addr: String,
 }
 
+impl BootstrapNode {
+    /// Resolve string address of the node to possible multiple `SocketAddr`s.
+    pub fn resolve(&self) -> impl Iterator<Item = PackedNode> {
+        let pk = self.pk;
+        let addrs = match self.addr.to_socket_addrs() {
+            Ok(addrs) => addrs,
+            Err(e) => {
+                warn!("Failed to resolve bootstrap node address '{}': {}", self.addr, e);
+                Vec::new().into_iter()
+            },
+        };
+        addrs.map(move |addr| PackedNode::new(addr, &pk))
+    }
+}
+
 fn de_from_hex<'de, D>(deserializer: D) -> Result<PublicKey, D::Error> where D: Deserializer<'de> {
     let s = String::deserialize(deserializer)?;
 
@@ -79,43 +94,13 @@ fn de_from_hex<'de, D>(deserializer: D) -> Result<PublicKey, D::Error> where D:
         .ok_or_else(|| de::Error::custom("Can't make PublicKey"))
 }
 
-// TODO: Remove this function. Use default String type after bug fix released.
-// Bug is here `https://github.com/mehcode/config-rs/issues/74`
-fn de_log_type<'de, D>(deserializer: D) -> Result<LogType, D::Error> where D: Deserializer<'de> {
-    let s = String::deserialize(deserializer)?;
-
-    match &s[..] {
-        "Stderr" => Ok(LogType::Stderr),
-        "Stdout" => Ok(LogType::Stdout),
-        #[cfg(unix)]
-        "Syslog" => Ok(LogType::Syslog),
-        "None" => Ok(LogType::None),
-        other => Err(de::Error::custom(format!("log-type: invalid value '{}'", other))),
-    }
-}
-
 fn de_threads<'de, D>(deserializer: D) -> Result<Threads, D::Error> where D: Deserializer<'de> {
     let s = String::deserialize(deserializer)?;
 
     Threads::from_str(&s)
         .map_err(|e| de::Error::custom(format!("threads: {:?}", e)))
 }
 
-impl BootstrapNode {
-    /// Resolve string address of the node to possible multiple `SocketAddr`s.
-    pub fn resolve(&self) -> impl Iterator<Item = PackedNode> {
-        let pk = self.pk;
-        let addrs = match self.addr.to_socket_addrs() {
-            Ok(addrs) => addrs,
-            Err(e) => {
-                warn!("Failed to resolve bootstrap node address '{}': {}", self.addr, e);
-                Vec::new().into_iter()
-            },
-        };
-        addrs.map(move |addr| PackedNode::new(addr, &pk))
-    }
-}
-
 /// Config parsed from command line arguments.
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize)]
 pub struct NodeConfig {
@@ -147,7 +132,6 @@ pub struct NodeConfig {
     #[serde(deserialize_with = "de_threads")]
     pub threads: Threads,
     /// Specifies where to write logs.
-    #[serde(deserialize_with = "de_log_type")]
     #[serde(rename = "log-type")]
     pub log_type: LogType,
     /// Message of the day