Merge pull request #52 from matthiasbeyer/update-deps

Update deps

5 files changed, 15 insertions, 19 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 5df3ba1..8556319 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,13 +15,12 @@ readme        = "./README.md"
 license       = "MPL-2.0"
 
 [dependencies]
-chrono = "0.2"
-log = "0.3"
-serde = "0.9"
-serde_derive = "0.9"
-serde_json = "0.9"
-uuid = { version = "0.4", features = ["serde"] }
+chrono = "0.4"
+serde = "1"
+serde_derive = "1"
+serde_json = "1"
+uuid = { version = "0.5", features = ["serde"] }
 
 [dev-dependencies]
-env_logger = "0.3"
+env_logger = "0.4"
 
diff --git a/src/date.rs b/src/date.rs
index ed19b86..49b8b05 100644
--- a/src/date.rs
+++ b/src/date.rs
@@ -8,8 +8,6 @@
 
 use std::error::Error;
 use std::ops::{Deref, DerefMut};
-use std::fmt::Formatter;
-use std::fmt::Result as FmtResult;
 
 use serde::Serialize;
 use serde::Serializer;
@@ -17,7 +15,7 @@ use serde::Deserialize;
 use serde::Deserializer;
 use serde::de::Visitor;
 use serde::de::Error as SerdeError;
-use chrono::naive::datetime::NaiveDateTime;
+use chrono::NaiveDateTime;
 
 /// Date is a NaiveDateTime-Wrapper object to be able to implement foreign traits on it
 #[derive(Clone, Debug, Hash, Eq, PartialEq)]
@@ -62,18 +60,18 @@ impl Serialize for Date {
 
 }
 
-impl Deserialize for Date {
+impl<'de> Deserialize<'de> for Date {
 
     fn deserialize<D>(deserializer: D) -> Result<Date, D::Error>
-        where D: Deserializer
+        where D: Deserializer<'de>
     {
         struct DateVisitor;
 
-        impl Visitor for DateVisitor {
+        impl<'v> Visitor<'v> for DateVisitor {
             type Value = Date;
 
-            fn expecting(&self, fmt: &mut Formatter) -> FmtResult {
-                write!(fmt, "a taskwarrior time string")
+            fn expecting(&self, fmt: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+                write!(fmt, "a string which matches {}", TASKWARRIOR_DATETIME_TEMPLATE)
             }
 
             fn visit_str<E>(self, value: &str) -> Result<Date, E>
@@ -85,7 +83,7 @@ impl Deserialize for Date {
             }
         }
 
-        deserializer.deserialize(DateVisitor)
+        deserializer.deserialize_str(DateVisitor)
     }
 
 }
diff --git a/src/import.rs b/src/import.rs
index 20c1405..e72f2bd 100644
--- a/src/import.rs
+++ b/src/import.rs
@@ -135,7 +135,7 @@ fn test_one_single() {
     use date::Date;
     use date::TASKWARRIOR_DATETIME_TEMPLATE;
     use uuid::Uuid;
-    use chrono::naive::datetime::NaiveDateTime;
+    use chrono::NaiveDateTime;
     fn mkdate(s: &str) -> Date {
         let n = NaiveDateTime::parse_from_str(s, TASKWARRIOR_DATETIME_TEMPLATE);
         Date::from(n.unwrap())
diff --git a/src/lib.rs b/src/lib.rs
index 2ed6b3c..d4f2532 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -45,7 +45,6 @@
 )]
 
 extern crate chrono;
-extern crate log;
 extern crate serde;
 #[macro_use] extern crate serde_derive;
 extern crate serde_json;
diff --git a/src/task.rs b/src/task.rs
index 70c198b..6d2b566 100644
--- a/src/task.rs
+++ b/src/task.rs
@@ -271,7 +271,7 @@ mod test {
     use annotation::Annotation;
 
     use uuid::Uuid;
-    use chrono::naive::datetime::NaiveDateTime;
+    use chrono::NaiveDateTime;
     use serde_json;
 
     fn mkdate(s: &str) -> Date {