From eaddc6dce2abf51a892989abdd172e29e7a727a6 Mon Sep 17 00:00:00 2001
From: Jimmy Cuadra <jimmy@jimmycuadra.com>
Date: Thu, 20 Jun 2019 22:41:26 -0700
Subject: [PATCH] Use str::parse for conversion from JSON.

---
 src/direct.rs             | 2 +-
 src/dummy.rs              | 2 +-
 src/presence.rs           | 2 +-
 src/room/pinned_events.rs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/direct.rs b/src/direct.rs
index 5cb38d6c..d1b9262f 100644
--- a/src/direct.rs
+++ b/src/direct.rs
@@ -67,7 +67,7 @@ mod tests {
             rooms[1].to_string()
         );
 
-        let event = DirectEvent::from_str(&json_data).unwrap();
+        let event: DirectEvent = json_data.parse().unwrap();
         let direct_rooms = event.content.get(&alice).unwrap();
 
         assert!(direct_rooms.contains(&rooms[0]));
diff --git a/src/dummy.rs b/src/dummy.rs
index 9a5fee29..2e53d0d2 100644
--- a/src/dummy.rs
+++ b/src/dummy.rs
@@ -42,6 +42,6 @@ mod tests {
     fn deserialization() {
         let json = r#"{"content":{},"type":"m.dummy"}"#;
 
-        assert!(DummyEvent::from_str(json).is_ok());
+        assert!(json.parse::<DummyEvent>().is_ok());
     }
 }
diff --git a/src/presence.rs b/src/presence.rs
index 06c6472e..e10fa0f0 100644
--- a/src/presence.rs
+++ b/src/presence.rs
@@ -100,7 +100,7 @@ mod tests {
             r#"{"content":{"avatar_url":"mxc://localhost:wefuiwegh8742w","currently_active":false,"last_active_ago":2478593,"presence":"online","status_msg":"Making cupcakes"},"sender":"@example:localhost","type":"m.presence"}"#;
 
         assert_eq!(to_string(&event).unwrap(), serialized_event);
-        let deserialized_event = PresenceEvent::from_str(serialized_event).unwrap();
+        let deserialized_event: PresenceEvent = serialized_event.parse().unwrap();
         assert_eq!(deserialized_event.content, event.content);
         assert_eq!(deserialized_event.sender, event.sender);
     }
diff --git a/src/room/pinned_events.rs b/src/room/pinned_events.rs
index 7f81a410..48e8a408 100644
--- a/src/room/pinned_events.rs
+++ b/src/room/pinned_events.rs
@@ -47,7 +47,7 @@ mod tests {
         };
 
         let serialized_event = to_string(&event).unwrap();
-        let parsed_event = PinnedEventsEvent::from_str(&serialized_event).unwrap();
+        let parsed_event: PinnedEventsEvent = serialized_event.parse().unwrap();
 
         assert_eq!(parsed_event.event_id(), event.event_id());
         assert_eq!(parsed_event.room_id(), event.room_id());