From 418c91d5ff1129581d24f62ee911843b04d7f638 Mon Sep 17 00:00:00 2001
From: Jimmy Cuadra <jimmy@jimmycuadra.com>
Date: Thu, 20 Apr 2017 21:57:36 -0700
Subject: [PATCH] Update serde and serde_json to 1.0.

---
 Cargo.toml |  4 ++--
 src/lib.rs | 40 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a8957ca5..4c095a7a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ version = "0.10.0"
 lazy_static = "0.2"
 rand = "0.3"
 regex = "0.2"
-serde = "0.9"
+serde = "1.0"
 url = "1.4"
 
 [dependencies.diesel]
@@ -22,4 +22,4 @@ optional = true
 version = "0.12"
 
 [dev-dependencies]
-serde_json = "0.9"
+serde_json = "1.0"
diff --git a/src/lib.rs b/src/lib.rs
index 1d04ed57..8091cc69 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -462,33 +462,33 @@ impl Serialize for UserId {
     }
 }
 
-impl Deserialize for EventId {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
-        deserializer.deserialize(EventIdVisitor)
+impl<'de> Deserialize<'de> for EventId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+        deserializer.deserialize_any(EventIdVisitor)
     }
 }
 
-impl Deserialize for RoomAliasId {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
-        deserializer.deserialize(RoomAliasIdVisitor)
+impl<'de> Deserialize<'de> for RoomAliasId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+        deserializer.deserialize_any(RoomAliasIdVisitor)
     }
 }
 
-impl Deserialize for RoomId {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
-        deserializer.deserialize(RoomIdVisitor)
+impl<'de> Deserialize<'de> for RoomId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+        deserializer.deserialize_any(RoomIdVisitor)
     }
 }
 
-impl Deserialize for RoomIdOrAliasId {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
-        deserializer.deserialize(RoomIdOrAliasIdVisitor)
+impl<'de> Deserialize<'de> for RoomIdOrAliasId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+        deserializer.deserialize_any(RoomIdOrAliasIdVisitor)
     }
 }
 
-impl Deserialize for UserId {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
-        deserializer.deserialize(UserIdVisitor)
+impl<'de> Deserialize<'de> for UserId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
+        deserializer.deserialize_any(UserIdVisitor)
     }
 }
 
@@ -598,7 +598,7 @@ impl<'a> TryFrom<&'a str> for UserId {
     }
 }
 
-impl Visitor for EventIdVisitor {
+impl<'de> Visitor<'de> for EventIdVisitor {
     type Value = EventId;
 
     fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
@@ -613,7 +613,7 @@ impl Visitor for EventIdVisitor {
     }
 }
 
-impl Visitor for RoomAliasIdVisitor {
+impl<'de> Visitor<'de> for RoomAliasIdVisitor {
     type Value = RoomAliasId;
 
     fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
@@ -628,7 +628,7 @@ impl Visitor for RoomAliasIdVisitor {
     }
 }
 
-impl Visitor for RoomIdVisitor {
+impl<'de> Visitor<'de> for RoomIdVisitor {
     type Value = RoomId;
 
     fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
@@ -643,7 +643,7 @@ impl Visitor for RoomIdVisitor {
     }
 }
 
-impl Visitor for RoomIdOrAliasIdVisitor {
+impl<'de> Visitor<'de> for RoomIdOrAliasIdVisitor {
     type Value = RoomIdOrAliasId;
 
     fn expecting(&self, formatter: &mut Formatter) -> FmtResult {
@@ -658,7 +658,7 @@ impl Visitor for RoomIdOrAliasIdVisitor {
     }
 }
 
-impl Visitor for UserIdVisitor {
+impl<'de> Visitor<'de> for UserIdVisitor {
     type Value = UserId;
 
     fn expecting(&self, formatter: &mut Formatter) -> FmtResult {