Update serde to 1.0.

Cargo.toml

@@ -11,8 +11,8 @@ repository = "https://github.com/ruma/ruma-events"
 version = "0.7.0"
 
 [dependencies]
-ruma-identifiers = "0.10"
-ruma-signatures = "0.2"
-serde = "0.9"
-serde_derive = "0.9"
-serde_json = "0.9"
+ruma-identifiers = "0.11"
+ruma-signatures = "0.3"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"

src/collections/all.rs

@@ -192,8 +192,8 @@ impl Serialize for Event {
     }
 }
 
-impl Deserialize for Event {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
+impl<'de> Deserialize<'de> for Event {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
         let value: Value = try!(Deserialize::deserialize(deserializer));
 
         let event_type_value = match value.get("type") {
@@ -439,8 +439,8 @@ impl Serialize for RoomEvent {
     }
 }
 
-impl Deserialize for RoomEvent {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
+impl<'de> Deserialize<'de> for RoomEvent {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
         let value: Value = try!(Deserialize::deserialize(deserializer));
 
         let event_type_value = match value.get("type") {
@@ -642,8 +642,8 @@ impl Serialize for StateEvent {
     }
 }
 
-impl Deserialize for StateEvent {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
+impl<'de> Deserialize<'de> for StateEvent {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
         let value: Value = try!(Deserialize::deserialize(deserializer));
 
         let event_type_value = match value.get("type") {

src/collections/only.rs

@@ -65,8 +65,8 @@ impl Serialize for Event {
     }
 }
 
-impl Deserialize for Event {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
+impl<'de> Deserialize<'de> for Event {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
         let value: Value = try!(Deserialize::deserialize(deserializer));
 
         let event_type_value = match value.get("type") {
@@ -146,8 +146,8 @@ impl Serialize for RoomEvent {
     }
 }
 
-impl Deserialize for RoomEvent {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
+impl<'de> Deserialize<'de> for RoomEvent {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
         let value: Value = try!(Deserialize::deserialize(deserializer));
 
         let event_type_value = match value.get("type") {

src/lib.rs

@@ -183,9 +183,9 @@ pub enum EventType {
 }
 
 /// A basic event.
-pub trait Event: Debug + Deserialize + Serialize {
+pub trait Event where Self: Debug + for<'a> Deserialize<'a> + Serialize {
     /// The event-type-specific payload this event carries.
-    type Content: Debug + Deserialize + Serialize;
+    type Content: Debug + for<'a> Deserialize<'a> + Serialize;
 
     /// The event's content.
     fn content(&self) -> &Self::Content;
@@ -307,11 +307,11 @@ impl Serialize for EventType {
     }
 }
 
-impl Deserialize for EventType {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
+impl<'de> Deserialize<'de> for EventType {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
         struct EventTypeVisitor;
 
-        impl Visitor for EventTypeVisitor {
+        impl<'de> Visitor<'de> for EventTypeVisitor {
             type Value = EventType;
 
             fn expecting(&self, formatter: &mut Formatter) -> FmtResult {

src/room/message.rs

@@ -268,8 +268,8 @@ impl Serialize for MessageEventContent {
     }
 }
 
-impl Deserialize for MessageEventContent {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
+impl<'de> Deserialize<'de> for MessageEventContent {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
         let value: Value = try!(Deserialize::deserialize(deserializer));
 
         let message_type_value = match value.get("msgtype") {

src/stripped.rs

@@ -65,8 +65,9 @@ pub enum StrippedState {
 
 /// A "stripped-down" version of a core state event.
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct StrippedStateContent<C> where C: Deserialize + Serialize {
+pub struct StrippedStateContent<C> where C: for<'a> Deserialize<'a> + Serialize {
     /// Data specific to the event type.
+    #[serde(bound(deserialize = ""))]
     pub content: C,
     /// The type of the event.
     #[serde(rename="type")]
@@ -94,8 +95,8 @@ impl Serialize for StrippedState {
     }
 }
 
-impl Deserialize for StrippedState {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
+impl<'de> Deserialize<'de> for StrippedState {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
         let value: Value = try!(Deserialize::deserialize(deserializer));
 
         let event_type_value = match value.get("type") {