Update to log4rs 0.7

sfackler · Apr 26, 2017 · 86dde9d · 86dde9d
1 parent c63f2c3
commit 86dde9d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,15 +18,15 @@ file = ["log4rs/file", "serde", "serde_derive", "serde-value", "humantime"]
 [dependencies]
 antidote = "1.0"
 humantime = { version = "1.0", optional = true }
-linked-hash-map = "0.3"
+linked-hash-map = "0.4"
 log = "0.3"
 log-mdc = { version = "0.1", optional = true }
-log4rs = { version = "0.6", default_features = false }
-serde = { version = "0.9", optional = true }
-serde_derive = { version = "0.9", optional = true }
-serde-value = { version = "0.4", optional = true }
-ordered-float = { version = "0.2", optional = true }
+log4rs = { version = "0.7", default_features = false }
+serde = { version = "1.0", optional = true }
+serde_derive = { version = "1.0", optional = true }
+serde-value = { version = "0.5", optional = true }
+ordered-float = { version = "0.4", optional = true }
 
 [dev-dependencies]
-log4rs = { version = "0.6", default_features = false, features = ["file"] }
-serde_yaml = "0.6"
+log4rs = { version = "0.7", default_features = false, features = ["file"] }
+serde_yaml = "0.7"
diff --git a/src/lib.rs b/src/lib.rs
@@ -212,9 +212,9 @@ struct RouterConfig {
 }
 
 #[cfg(feature = "file")]
-impl de::Deserialize for RouterConfig {
+impl<'de> de::Deserialize<'de> for RouterConfig {
     fn deserialize<D>(d: D) -> Result<RouterConfig, D::Error>
-        where D: de::Deserializer
+        where D: de::Deserializer<'de>
     {
         let mut map = BTreeMap::<Value, Value>::deserialize(d)?;
 
@@ -231,18 +231,18 @@ impl de::Deserialize for RouterConfig {
 }
 
 #[cfg(feature = "file")]
-fn de_duration<D>(d: D) -> Result<Option<Duration>, D::Error>
-    where D: de::Deserializer
+fn de_duration<'de, D>(d: D) -> Result<Option<Duration>, D::Error>
+    where D: de::Deserializer<'de>
 {
     struct S(Duration);
 
-    impl de::Deserialize for S {
+    impl<'de2> de::Deserialize<'de2> for S {
         fn deserialize<D>(d: D) -> Result<S, D::Error>
-            where D: de::Deserializer
+            where D: de::Deserializer<'de2>
         {
             struct V;
 
-            impl de::Visitor for V {
+            impl<'de3> de::Visitor<'de3> for V {
                 type Value = S;
 
                 fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
@@ -258,7 +258,7 @@ fn de_duration<D>(d: D) -> Result<Option<Duration>, D::Error>
                 }
             }
 
-            d.deserialize(V)
+            d.deserialize_str(V)
         }
     }
 

diff --git a/src/route/pattern/mod.rs b/src/route/pattern/mod.rs
@@ -119,9 +119,9 @@ struct AppenderConfig {
     config: Value,
 }
 
-impl de::Deserialize for AppenderConfig {
+impl<'de> de::Deserialize<'de> for AppenderConfig {
     fn deserialize<D>(d: D) -> Result<AppenderConfig, D::Error>
-        where D: de::Deserializer
+        where D: de::Deserializer<'de>
     {
         let mut map = BTreeMap::<Value, Value>::deserialize(d)?;