From d38e385aab7faac038b8e1ebfdfd2bc383e2739a Mon Sep 17 00:00:00 2001
From: "Ragotzy.devin" <devin.ragotzy@gmail.com>
Date: Mon, 8 Jun 2020 08:40:59 -0400
Subject: [PATCH] Remove unused imports and fix serde::ser::Error trait not
 being in scope

---
 ruma-events-macros/src/event.rs | 4 ++--
 src/event_kinds.rs              | 3 +--
 src/receipt.rs                  | 2 +-
 src/room/message.rs             | 5 +----
 src/room/name.rs                | 6 +-----
 src/typing.rs                   | 2 +-
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/ruma-events-macros/src/event.rs b/ruma-events-macros/src/event.rs
index 007ab319..d154f2c1 100644
--- a/ruma-events-macros/src/event.rs
+++ b/ruma-events-macros/src/event.rs
@@ -48,7 +48,7 @@ pub fn expand_event(input: DeriveInput) -> syn::Result<TokenStream> {
                     let time_since_epoch =
                         self.origin_server_ts.duration_since(::std::time::UNIX_EPOCH).unwrap();
 
-                    let timestamp = ::js_int::UInt::try_from(time_since_epoch.as_millis())
+                    let timestamp = <::js_int::UInt as ::std::convert::TryFrom<_>>::try_from(time_since_epoch.as_millis())
                         .map_err(S::Error::custom)?;
 
                     state.serialize_field("origin_server_ts", &timestamp)?;
@@ -81,7 +81,7 @@ pub fn expand_event(input: DeriveInput) -> syn::Result<TokenStream> {
             where
                 S: ::serde::ser::Serializer,
             {
-                use ::serde::ser::SerializeStruct as _;
+                use ::serde::ser::{SerializeStruct as _, Error as _};
 
                 let event_type = #event_ty;
 
diff --git a/src/event_kinds.rs b/src/event_kinds.rs
index dc93294e..01b2ca26 100644
--- a/src/event_kinds.rs
+++ b/src/event_kinds.rs
@@ -1,8 +1,7 @@
-use std::{convert::TryFrom, time::SystemTime};
+use std::time::SystemTime;
 
 use ruma_events_macros::Event;
 use ruma_identifiers::{EventId, RoomId, UserId};
-use serde::ser::Error;
 
 use crate::{
     BasicEventContent, EphemeralRoomEventContent, MessageEventContent, StateEventContent,
diff --git a/src/receipt.rs b/src/receipt.rs
index a4d81507..65617d27 100644
--- a/src/receipt.rs
+++ b/src/receipt.rs
@@ -3,7 +3,7 @@
 use std::{collections::BTreeMap, time::SystemTime};
 
 use ruma_events_macros::EphemeralRoomEventContent;
-use ruma_identifiers::{EventId, RoomId, UserId};
+use ruma_identifiers::{EventId, UserId};
 use serde::{Deserialize, Serialize};
 
 /// Informs the client who has read a message specified by it's event id.
diff --git a/src/room/message.rs b/src/room/message.rs
index ce14f83d..07584a25 100644
--- a/src/room/message.rs
+++ b/src/room/message.rs
@@ -1,14 +1,11 @@
 //! Types for the *m.room.message* event.
 
-use std::time::SystemTime;
-
 use js_int::UInt;
 use ruma_events_macros::MessageEventContent;
-use ruma_identifiers::{EventId, RoomId, UserId};
+use ruma_identifiers::EventId;
 use serde::{Deserialize, Serialize};
 
 use super::{EncryptedFile, ImageInfo, ThumbnailInfo};
-use crate::UnsignedData;
 
 pub mod feedback;
 
diff --git a/src/room/name.rs b/src/room/name.rs
index f48f14e9..5c86a09a 100644
--- a/src/room/name.rs
+++ b/src/room/name.rs
@@ -1,13 +1,9 @@
 //! Types for the *m.room.name* event.
 
-use std::ops::Deref;
-use std::time::SystemTime;
-
 use ruma_events_macros::StateEventContent;
-use ruma_identifiers::{EventId, RoomId, UserId};
 use serde::{Deserialize, Serialize};
 
-use crate::{InvalidInput, UnsignedData};
+use crate::InvalidInput;
 
 /// The payload for `NameEvent`.
 #[derive(Clone, Debug, Deserialize, Serialize, StateEventContent)]
diff --git a/src/typing.rs b/src/typing.rs
index 455c0c4c..d3e846cd 100644
--- a/src/typing.rs
+++ b/src/typing.rs
@@ -1,7 +1,7 @@
 //! Types for the *m.typing* event.
 
 use ruma_events_macros::EphemeralRoomEventContent;
-use ruma_identifiers::{RoomId, UserId};
+use ruma_identifiers::UserId;
 use serde::{Deserialize, Serialize};
 
 /// Informs the client who is currently typing in a given room.