Fix import grouping issues

ruma-api-macros/src/util.rs

@@ -1,9 +1,10 @@
 //! Functions to aid the `Api::to_tokens` method.
 
+use std::collections::BTreeSet;
+
 use proc_macro2::{Span, TokenStream};
 use proc_macro_crate::crate_name;
 use quote::quote;
-use std::collections::BTreeSet;
 use syn::{
     AngleBracketedGenericArguments, AttrStyle, Attribute, GenericArgument, Ident, Lifetime,
     ParenthesizedGenericArguments, PathArguments, Type, TypeArray, TypeBareFn, TypeGroup,

ruma-client-api/src/r0/account/deactivate.rs

@@ -2,9 +2,8 @@
 
 use ruma_api::ruma_api;
 
-use crate::r0::uiaa::{AuthData, IncomingAuthData, UiaaResponse};
-
 use super::ThirdPartyIdRemovalStatus;
+use crate::r0::uiaa::{AuthData, IncomingAuthData, UiaaResponse};
 
 ruma_api! {
     metadata: {

ruma-client-api/src/r0/backup.rs

@@ -16,10 +16,11 @@ pub mod get_backup_keys;
 pub mod get_latest_backup;
 pub mod update_backup;
 
+use std::collections::BTreeMap;
+
 use js_int::UInt;
 use ruma_identifiers::{DeviceKeyId, UserId};
 use serde::{Deserialize, Serialize};
-use std::collections::BTreeMap;
 
 /// A wrapper around a mapping of session IDs to key data.
 #[derive(Clone, Debug, Serialize, Deserialize)]

ruma-client-api/src/r0/device/get_device.rs

@@ -1,9 +1,10 @@
 //! [GET /_matrix/client/r0/devices/{deviceId}](https://matrix.org/docs/spec/client_server/r0.6.0#get-matrix-client-r0-devices-deviceid)
 
-use super::Device;
 use ruma_api::ruma_api;
 use ruma_identifiers::DeviceId;
 
+use super::Device;
+
 ruma_api! {
     metadata: {
         description: "Get a device for authenticated user.",

ruma-client-api/src/r0/device/get_devices.rs

@@ -1,8 +1,9 @@
 //! [GET /_matrix/client/r0/devices](https://matrix.org/docs/spec/client_server/r0.6.0#get-matrix-client-r0-devices)
 
-use super::Device;
 use ruma_api::ruma_api;
 
+use super::Device;
+
 ruma_api! {
     metadata: {
         description: "Get registered devices for authenticated user.",

ruma-client-api/src/r0/keys/claim_keys.rs

@@ -1,8 +1,6 @@
 //! [POST /_matrix/client/r0/keys/claim](https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-keys-claim)
 
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, time::Duration};
-
-use std::time::Duration;
 
 use ruma_api::ruma_api;
 use ruma_identifiers::{DeviceIdBox, DeviceKeyAlgorithm, DeviceKeyId, UserId};

ruma-client-api/src/r0/message/get_message_events.rs

@@ -133,12 +133,11 @@ pub enum Direction {
 
 #[cfg(test)]
 mod tests {
-    use super::{Direction, Request};
-
     use js_int::uint;
     use ruma_api::OutgoingRequest;
     use ruma_identifiers::room_id;
 
+    use super::{Direction, Request};
     use crate::r0::filter::{LazyLoadOptions, RoomEventFilter};
 
     #[test]

ruma-client-api/src/r0/sync/sync_events.rs

@@ -532,11 +532,10 @@ impl DeviceLists {
 mod tests {
     use std::time::Duration;
 
+    use matches::assert_matches;
     use ruma_api::{IncomingRequest as _, OutgoingRequest as _};
     use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
 
-    use matches::assert_matches;
-
     use super::{Filter, IncomingFilter, IncomingRequest, PresenceState, Request, Timeline};
 
     #[test]

ruma-client-api/src/r0/typing/create_typing_event.rs

@@ -1,10 +1,10 @@
 //! [PUT /_matrix/client/r0/rooms/{roomId}/typing/{userId}](https://matrix.org/docs/spec/client_server/r0.6.0#put-matrix-client-r0-rooms-roomid-typing-userid)
 
-use serde::{de::Error, Deserialize, Deserializer, Serialize};
 use std::time::Duration;
 
 use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
+use serde::{de::Error, Deserialize, Deserializer, Serialize};
 
 ruma_api! {
     metadata: {

ruma-client/src/lib.rs

@@ -101,6 +101,7 @@
 #![deny(missing_debug_implementations, missing_docs)]
 
 use std::{
+    collections::BTreeMap,
     convert::TryFrom,
     sync::{Arc, Mutex},
     time::Duration,
@@ -118,7 +119,6 @@ use ruma_client_api::r0::sync::sync_events::{
 use ruma_common::presence::PresenceState;
 use ruma_identifiers::DeviceId;
 use ruma_serde::urlencoded;
-use std::collections::BTreeMap;
 
 mod error;
 mod session;

ruma-common/src/push/action.rs

@@ -167,11 +167,11 @@ mod tweak_serde {
 
 #[cfg(test)]
 mod tests {
-    use super::{Action, Tweak};
-
     use matches::assert_matches;
     use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
 
+    use super::{Action, Tweak};
+
     #[test]
     fn serialize_string() {
         assert_eq!(to_json_value(&Action::Notify).unwrap(), json!("notify"));

ruma-common/src/thirdparty.rs

@@ -6,7 +6,6 @@ use std::collections::BTreeMap;
 
 use ruma_identifiers::{RoomAliasId, UserId};
 use ruma_serde::StringEnum;
-
 use serde::{Deserialize, Serialize};
 
 /// Metadata about a third party protocol.

ruma-events/src/dummy.rs

@@ -43,11 +43,11 @@ impl DerefMut for DummyEventContent {
 
 #[cfg(test)]
 mod tests {
-    use super::{DummyEvent, DummyEventContent, Empty};
     use ruma_serde::Raw;
-
     use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
 
+    use super::{DummyEvent, DummyEventContent, Empty};
+
     #[test]
     fn serialization() {
         let dummy_event = DummyEvent { content: DummyEventContent(Empty) };

ruma-events/src/key/verification.rs

@@ -5,14 +5,14 @@
 //! The MSC for the in-room variants of the `m.key.verification.*` events can be found
 //! [here](https://github.com/matrix-org/matrix-doc/pull/2241).
 
-#[cfg(feature = "unstable-pre-spec")]
-use serde::{Deserialize, Serialize};
 #[cfg(feature = "unstable-pre-spec")]
 use std::convert::TryFrom;
 
 #[cfg(feature = "unstable-pre-spec")]
 use ruma_identifiers::EventId;
 use ruma_serde::StringEnum;
+#[cfg(feature = "unstable-pre-spec")]
+use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "unstable-pre-spec")]
 use crate::room::relationships::{Reference, RelatesToJsonRepr, RelationJsonRepr};
@@ -125,10 +125,10 @@ pub enum VerificationMethod {
 
 #[cfg(test)]
 mod tests {
-    use super::{KeyAgreementProtocol, MessageAuthenticationCode};
-
     use serde_json::{from_value as from_json_value, json};
 
+    use super::{KeyAgreementProtocol, MessageAuthenticationCode};
+
     #[test]
     fn serialize_key_agreement() {
         let serialized =

ruma-events/src/reaction.rs

@@ -2,13 +2,14 @@
 
 use std::convert::TryFrom;
 
+use ruma_events_macros::MessageEventContent;
+use ruma_identifiers::EventId;
+use serde::{Deserialize, Serialize};
+
 use crate::{
     room::relationships::{Annotation, RelatesToJsonRepr, RelationJsonRepr},
     MessageEvent,
 };
-use ruma_events_macros::MessageEventContent;
-use ruma_identifiers::EventId;
-use serde::{Deserialize, Serialize};
 
 /// A reaction to another event.
 pub type ReactionEvent = MessageEvent<ReactionEventContent>;

ruma-events/src/room/encrypted.rs

@@ -124,10 +124,10 @@ impl From<MegolmV1AesSha2ContentInit> for MegolmV1AesSha2Content {
 #[cfg(test)]
 mod tests {
     use matches::assert_matches;
+    use ruma_serde::Raw;
     use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
 
     use super::{EncryptedEventContent, MegolmV1AesSha2Content};
-    use ruma_serde::Raw;
 
     #[test]
     fn serialization() {

ruma-events/src/room/message.rs

@@ -10,12 +10,11 @@ use ruma_serde::StringEnum;
 use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;
 
-#[cfg(feature = "unstable-pre-spec")]
-use crate::key::verification::VerificationMethod;
-
 #[cfg(feature = "unstable-pre-spec")]
 use super::relationships::{Annotation, Reference, RelationJsonRepr, Replacement};
 use super::{relationships::RelatesToJsonRepr, EncryptedFile, ImageInfo, ThumbnailInfo};
+#[cfg(feature = "unstable-pre-spec")]
+use crate::key::verification::VerificationMethod;
 
 // FIXME: Do we want to keep re-exporting this?
 pub use super::relationships::InReplyTo;

ruma-events/src/room/name.rs

@@ -67,9 +67,8 @@ mod tests {
     use ruma_serde::Raw;
     use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
 
-    use crate::{StateEvent, Unsigned};
-
     use super::NameEventContent;
+    use crate::{StateEvent, Unsigned};
 
     #[test]
     fn serialization_with_optional_fields_as_none() {

ruma-events/src/room/relationships.rs

@@ -85,11 +85,12 @@ pub struct Replacement {
 
 #[cfg(test)]
 mod tests {
-    use crate::room::message::Relation;
     use matches::assert_matches;
     use ruma_identifiers::event_id;
     use serde_json::{from_value as from_json_value, json};
 
+    use crate::room::message::Relation;
+
     #[test]
     fn reply_deserialize() {
         let event_id = event_id!("$1598361704261elfgc:localhost");

ruma-events/src/room/server_acl.rs

@@ -40,11 +40,11 @@ pub struct ServerAclEventContent {
 
 #[cfg(test)]
 mod tests {
+    use ruma_serde::Raw;
     use serde_json::{from_value as from_json_value, json};
 
     use super::ServerAclEventContent;
     use crate::StateEvent;
-    use ruma_serde::Raw;
 
     #[test]
     fn default_values() {

ruma-federation-api/src/discovery/get_remote_server_keys_batch/v2.rs

@@ -2,11 +2,12 @@
 
 use std::{collections::BTreeMap, time::SystemTime};
 
-use crate::discovery::ServerSigningKeys;
 use ruma_api::ruma_api;
 use ruma_identifiers::{ServerNameBox, ServerSigningKeyId};
 use serde::{Deserialize, Serialize};
 
+use crate::discovery::ServerSigningKeys;
+
 ruma_api! {
     metadata: {
         description: "Query for keys from multiple servers in a batch format.",

ruma-federation-api/src/membership/create_invite.rs

@@ -1,10 +1,11 @@
 //! Endpoint for inviting a remote user to a room
 
+use std::time::SystemTime;
+
 use ruma_events::{room::member::MemberEventContent, EventType};
 use ruma_identifiers::{ServerName, UserId};
 use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;
-use std::time::SystemTime;
 
 pub mod v1;
 pub mod v2;

ruma-federation-api/src/membership/create_invite/v1.rs

@@ -1,10 +1,11 @@
 //! [PUT /_matrix/federation/v1/invite/{roomId}/{eventId}](https://matrix.org/docs/spec/server_server/r0.1.4#put-matrix-federation-v1-invite-roomid-eventid)
 
+use std::time::SystemTime;
+
 use ruma_api::ruma_api;
 use ruma_events::{room::member::MemberEventContent, EventType};
 use ruma_identifiers::{EventId, RoomId, ServerName, UserId};
 use serde::{Deserialize, Serialize};
-use std::time::SystemTime;
 
 use super::{InviteEvent, StrippedState};
 

ruma-federation-api/src/query/get_custom_information/v1.rs

@@ -1,10 +1,10 @@
 //! [GET /_matrix/federation/v1/query/{queryType}](https://matrix.org/docs/spec/server_server/r0.1.4#get-matrix-federation-v1-query-querytype)
 
+use std::collections::BTreeMap;
+
 use ruma_api::ruma_api;
 use serde_json::Value as JsonValue;
 
-use std::collections::BTreeMap;
-
 ruma_api! {
     metadata: {
         description: "Performs a single query request on the receiving homeserver. The query string arguments are dependent on which type of query is being made.",

ruma-federation-api/src/thirdparty/bind_callback/v1.rs

@@ -1,12 +1,12 @@
 //! [PUT /_matrix/federation/v1/3pid/onbind](https://matrix.org/docs/spec/server_server/r0.1.4#put-matrix-federation-v1-3pid-onbind)
 
+use std::collections::BTreeMap;
+
 use ruma_api::ruma_api;
 use ruma_common::thirdparty::Medium;
 use ruma_identifiers::{RoomId, ServerNameBox, ServerSigningKeyId, UserId};
 use serde::{Deserialize, Serialize};
 
-use std::collections::BTreeMap;
-
 ruma_api! {
     metadata: {
         description: "Used by identity servers to notify the homeserver that one of its users has bound a third party identifier successfully",

ruma-push-gateway-api/src/send_event_notification/v1.rs

@@ -1,5 +1,7 @@
 //! [POST /_matrix/push/v1/notify](https://matrix.org/docs/spec/push_gateway/r0.1.1#post-matrix-push-v1-notify)
 
+use std::time::SystemTime;
+
 use js_int::UInt;
 use ruma_api::ruma_api;
 use ruma_common::push::{PusherData, Tweak};
@@ -8,7 +10,6 @@ use ruma_identifiers::{EventId, RoomAliasId, RoomId, UserId};
 use ruma_serde::{Outgoing, StringEnum};
 use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue as RawJsonValue;
-use std::time::SystemTime;
 
 ruma_api! {
     metadata: {

ruma-serde/src/canonical_json.rs

@@ -63,14 +63,14 @@ pub fn to_canonical_value<T: Serialize>(value: T) -> Result<value::CanonicalJson
 mod tests {
     use std::{collections::BTreeMap, convert::TryInto};
 
+    use js_int::int;
+    use serde_json::{from_str as from_json_str, json, to_string as to_json_string};
+
     use super::{
         to_canonical_value, to_string as to_canonical_json_string, try_from_json_map,
         value::CanonicalJsonValue,
     };
 
-    use js_int::int;
-    use serde_json::{from_str as from_json_str, json, to_string as to_json_string};
-
     #[test]
     fn serialize_canon() {
         let json: CanonicalJsonValue = json!({