Re-run 'cargo fmt'

src/lib.rs

@@ -15,7 +15,8 @@ extern crate ruma_identifiers;
 extern crate ruma_signatures;
 extern crate serde;
 extern crate serde_json;
-#[macro_use] extern crate serde_derive;
+#[macro_use]
+extern crate serde_derive;
 extern crate serde_urlencoded;
 extern crate url;
 

src/r0/account.rs

@@ -81,7 +81,7 @@ pub mod register {
         #[serde(rename = "type")]
         kind: String,
         /// The value of the session key given by the homeserver.
-        session: Option<String>
+        session: Option<String>,
     }
 
     /// The kind of account being registered.

src/r0/context.rs

@@ -2,9 +2,9 @@
 
 /// [GET /_matrix/client/r0/rooms/{roomId}/context/{eventId}](https://matrix.org/docs/spec/client_server/r0.2.0.html#get-matrix-client-r0-rooms-roomid-context-eventid)
 pub mod get_context {
-    use ruma_identifiers::{EventId, RoomId};
-    use ruma_events::collections::only;
     use ruma_api_macros::ruma_api;
+    use ruma_events::collections::only;
+    use ruma_identifiers::{EventId, RoomId};
 
     ruma_api! {
         metadata {

src/r0/directory.rs

@@ -2,8 +2,8 @@
 
 /// [GET /_matrix/client/r0/publicRooms](https://matrix.org/docs/spec/client_server/r0.2.0.html#get-matrix-client-r0-publicrooms)
 pub mod get_public_rooms {
-    use ruma_identifiers::{RoomId, RoomAliasId};
     use ruma_api_macros::ruma_api;
+    use ruma_identifiers::{RoomAliasId, RoomId};
 
     ruma_api! {
         metadata {

src/r0/membership.rs

@@ -22,7 +22,7 @@ pub struct ThirdPartySigned {
 /// [POST /_matrix/client/r0/rooms/{roomId}/invite](https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-rooms-roomid-invite)
 pub mod invite_user {
     use ruma_api_macros::ruma_api;
-    use ruma_identifiers::{UserId, RoomId};
+    use ruma_identifiers::{RoomId, UserId};
 
     ruma_api! {
         metadata {

src/r0/presence.rs

@@ -3,8 +3,8 @@
 /// [PUT /_matrix/client/r0/presence/{userId}/status](https://matrix.org/docs/spec/client_server/r0.2.0.html#put-matrix-client-r0-presence-userid-status)
 pub mod set_presence {
     use ruma_api_macros::ruma_api;
-    use ruma_identifiers::UserId;
     use ruma_events::presence::PresenceState;
+    use ruma_identifiers::UserId;
 
     ruma_api! {
         metadata {

src/r0/redact.rs

@@ -3,7 +3,7 @@
 /// [PUT /_matrix/client/r0/rooms/{roomId}/redact/{eventId}/{txnId}](https://matrix.org/docs/spec/client_server/r0.2.0.html#put-matrix-client-r0-rooms-roomid-redact-eventid-txnid)
 pub mod redact_event {
     use ruma_api_macros::ruma_api;
-    use ruma_identifiers::{RoomId, EventId};
+    use ruma_identifiers::{EventId, RoomId};
 
     ruma_api! {
         metadata {

src/r0/room.rs

@@ -2,8 +2,8 @@
 
 /// [POST /_matrix/client/r0/createRoom](https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-createroom)
 pub mod create_room {
-    use ruma_identifiers::{RoomId, UserId};
     use ruma_api_macros::ruma_api;
+    use ruma_identifiers::{RoomId, UserId};
 
     ruma_api! {
         metadata {

src/r0/search.rs

@@ -41,7 +41,7 @@ pub mod search_events {
     pub struct Categories {
         /// Criteria for searching a category of events.
         #[serde(skip_serializing_if = "Option::is_none")]
-        pub room_events: Option<Criteria>
+        pub room_events: Option<Criteria>,
     }
 
     /// Criteria for searching a category of events.
@@ -107,7 +107,7 @@ pub mod search_events {
     #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Grouping {
         /// The key within events to use for this grouping.
-        pub key: GroupingKey
+        pub key: GroupingKey,
     }
 
     /// The key within events to use for this grouping.

src/r0/send.rs

@@ -3,8 +3,8 @@
 /// [PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}](https://matrix.org/docs/spec/client_server/r0.2.0.html#put-matrix-client-r0-rooms-roomid-state-eventtype)
 pub mod send_state_event_for_empty_key {
     use ruma_api_macros::ruma_api;
-    use ruma_identifiers::{RoomId, EventId};
     use ruma_events::EventType;
+    use ruma_identifiers::{EventId, RoomId};
     use serde_json::Value;
 
     ruma_api! {
@@ -39,8 +39,8 @@ pub mod send_state_event_for_empty_key {
 /// [PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}](https://matrix.org/docs/spec/client_server/r0.2.0.html#put-matrix-client-r0-rooms-roomid-state-eventtype-statekey)
 pub mod send_state_event_for_key {
     use ruma_api_macros::ruma_api;
-    use ruma_identifiers::{RoomId, EventId};
     use ruma_events::EventType;
+    use ruma_identifiers::{EventId, RoomId};
     use serde_json::Value;
 
     ruma_api! {
@@ -78,9 +78,9 @@ pub mod send_state_event_for_key {
 /// [PUT /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId}](https://matrix.org/docs/spec/client_server/r0.2.0.html#put-matrix-client-r0-rooms-roomid-send-eventtype-txnid)
 pub mod send_message_event {
     use ruma_api_macros::ruma_api;
-    use ruma_identifiers::{RoomId, EventId};
-    use ruma_events::EventType;
     use ruma_events::room::message::MessageEventContent;
+    use ruma_events::EventType;
+    use ruma_identifiers::{EventId, RoomId};
 
     ruma_api! {
         metadata {

src/r0/sync.rs

@@ -199,7 +199,10 @@ pub mod sync_events {
     use std::collections::HashMap;
 
     use ruma_api_macros::ruma_api;
-    use ruma_events::{collections::{all, only}, stripped};
+    use ruma_events::{
+        collections::{all, only},
+        stripped,
+    };
     use ruma_identifiers::RoomId;
 
     use r0::filter::FilterDefinition;

src/r0/tag.rs

@@ -4,7 +4,7 @@
 pub mod create_tag {
     use ruma_api_macros::ruma_api;
     use ruma_events::tag::TagInfo;
-    use ruma_identifiers::{UserId, RoomId};
+    use ruma_identifiers::{RoomId, UserId};
 
     ruma_api! {
         metadata {
@@ -39,7 +39,7 @@ pub mod create_tag {
 pub mod get_tags {
     use ruma_api_macros::ruma_api;
     use ruma_events::tag::TagEventContent;
-    use ruma_identifiers::{UserId, RoomId};
+    use ruma_identifiers::{RoomId, UserId};
 
     ruma_api! {
         metadata {
@@ -70,7 +70,7 @@ pub mod get_tags {
 /// [DELETE /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag}](https://matrix.org/docs/spec/client_server/r0.2.0.html#delete-matrix-client-r0-user-userid-rooms-roomid-tags-tag)
 pub mod delete_tag {
     use ruma_api_macros::ruma_api;
-    use ruma_identifiers::{UserId, RoomId};
+    use ruma_identifiers::{RoomId, UserId};
 
     ruma_api! {
         metadata {

src/r0/typing.rs

@@ -3,7 +3,7 @@
 /// [PUT /_matrix/client/r0/rooms/{roomId}/typing/{userId}](https://matrix.org/docs/spec/client_server/r0.2.0.html#put-matrix-client-r0-rooms-roomid-typing-userid)
 pub mod create_typing_event {
     use ruma_api_macros::ruma_api;
-    use ruma_identifiers::{UserId, RoomId};
+    use ruma_identifiers::{RoomId, UserId};
 
     ruma_api! {
         metadata {