Fix new function signatures

5 files changed, 15 insertions, 15 deletions

diff --git a/src/annotation.rs b/src/annotation.rs
index 1a73545..682c170 100644
--- a/src/annotation.rs
+++ b/src/annotation.rs
@@ -52,7 +52,7 @@ impl Annotation {
 
 impl Serialize for Annotation {
 
-    fn serialize<S>(&self, serializer: &mut S) -> RResult<(), S::Error>
+    fn serialize<S>(&self, serializer: S) -> RResult<S::Ok, S::Error>
         where S: Serializer
     {
         let mut state = try!(serializer.serialize_struct("Annotation", 2));
@@ -65,7 +65,7 @@ impl Serialize for Annotation {
 
 impl Deserialize for Annotation {
 
-    fn deserialize<D>(deserializer: &mut D) -> RResult<Annotation, D::Error>
+    fn deserialize<D>(deserializer: D) -> RResult<Annotation, D::Error>
         where D: Deserializer
     {
         static FIELDS: &'static [&'static str] = &[
@@ -88,7 +88,7 @@ impl Visitor for AnnotationDeserializeVisitor {
         write!(fmt, "a taskwarrior annotation object")
     }
 
-    fn visit_map<V>(&mut self, mut visitor: V) -> RResult<Annotation, V::Error>
+    fn visit_map<V>(self, mut visitor: V) -> RResult<Annotation, V::Error>
         where V: DeserializeMapVisitor
     {
         let mut entry       = None;
diff --git a/src/date.rs b/src/date.rs
index c079510..ed19b86 100644
--- a/src/date.rs
+++ b/src/date.rs
@@ -53,7 +53,7 @@ pub static TASKWARRIOR_DATETIME_TEMPLATE : &'static str = "%Y%m%dT%H%M%SZ";
 
 impl Serialize for Date {
 
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where S: Serializer
     {
         let formatted = self.0.format(TASKWARRIOR_DATETIME_TEMPLATE);
@@ -64,7 +64,7 @@ impl Serialize for Date {
 
 impl Deserialize for Date {
 
-    fn deserialize<D>(deserializer: &mut D) -> Result<Date, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<Date, D::Error>
         where D: Deserializer
     {
         struct DateVisitor;
@@ -76,7 +76,7 @@ impl Deserialize for Date {
                 write!(fmt, "a taskwarrior time string")
             }
 
-            fn visit_str<E>(&mut self, value: &str) -> Result<Date, E>
+            fn visit_str<E>(self, value: &str) -> Result<Date, E>
                 where E: SerdeError
             {
                 NaiveDateTime::parse_from_str(value, TASKWARRIOR_DATETIME_TEMPLATE)
diff --git a/src/priority.rs b/src/priority.rs
index 125640e..06c302b 100644
--- a/src/priority.rs
+++ b/src/priority.rs
@@ -32,7 +32,7 @@ pub enum TaskPriority {
 
 impl Serialize for TaskPriority {
 
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where S: Serializer
     {
         serializer.serialize_str(
@@ -48,7 +48,7 @@ impl Serialize for TaskPriority {
 
 impl Deserialize for TaskPriority {
 
-    fn deserialize<D>(deserializer: &mut D) -> Result<TaskPriority, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<TaskPriority, D::Error>
         where D: Deserializer
     {
         struct TaskPriorityVisitor;
@@ -60,7 +60,7 @@ impl Deserialize for TaskPriority {
                 write!(fmt, "one of 'L', 'M', 'H'")
             }
 
-            fn visit_str<E>(&mut self, value: &str) -> Result<TaskPriority, E>
+            fn visit_str<E>(self, value: &str) -> Result<TaskPriority, E>
                 where E: Error
             {
                 match value {
diff --git a/src/status.rs b/src/status.rs
index 7a3c90d..8cdf420 100644
--- a/src/status.rs
+++ b/src/status.rs
@@ -51,7 +51,7 @@ impl Display for TaskStatus {
 
 impl Serialize for TaskStatus {
 
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where S: Serializer
     {
         serializer.serialize_str(
@@ -68,7 +68,7 @@ impl Serialize for TaskStatus {
 }
 
 impl Deserialize for TaskStatus {
-    fn deserialize<D>(deserializer: &mut D) -> Result<TaskStatus, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<TaskStatus, D::Error>
         where D: Deserializer
     {
         struct TaskStatusVisitor;
@@ -80,7 +80,7 @@ impl Deserialize for TaskStatus {
                 write!(fmt, "a taskwarrior status ('pending', 'deleted', ...)")
             }
 
-            fn visit_str<E>(&mut self, value: &str) -> Result<TaskStatus, E>
+            fn visit_str<E>(self, value: &str) -> Result<TaskStatus, E>
                 where E: Error
             {
                 match value {
diff --git a/src/task.rs b/src/task.rs
index eb04853..477a257 100644
--- a/src/task.rs
+++ b/src/task.rs
@@ -240,7 +240,7 @@ impl Task {
 
 impl Serialize for Task {
 
-    fn serialize<S>(&self, serializer: &mut S) -> RResult<(), S::Error>
+    fn serialize<S>(&self, serializer: S) -> RResult<S::Ok, S::Error>
         where S: Serializer
     {
         let mut state = try!(serializer.serialize_struct("Task", 19));
@@ -315,7 +315,7 @@ impl Serialize for Task {
 
 impl Deserialize for Task {
 
-    fn deserialize<D>(deserializer: &mut D) -> RResult<Task, D::Error>
+    fn deserialize<D>(deserializer: D) -> RResult<Task, D::Error>
         where D: Deserializer
     {
         static FIELDS: &'static [&'static str] = &[
@@ -356,7 +356,7 @@ impl Visitor for TaskDeserializeVisitor {
         write!(fmt, "a taskwarrior exported JSON object")
     }
 
-    fn visit_map<V>(&mut self, mut visitor: V) -> RResult<Task, V::Error>
+    fn visit_map<V>(self, mut visitor: V) -> RResult<Task, V::Error>
         where V: DeserializeMapVisitor
     {
         let mut status      = None;