From e8882fe8142d7b55ed4c8ccc6150946945f9e237 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Fri, 4 Dec 2020 21:05:48 +0100 Subject: [PATCH] events: Regroup crate-local imports --- ruma-events/src/key/verification/accept.rs | 6 ++---- ruma-events/src/key/verification/cancel.rs | 5 ++--- ruma-events/src/key/verification/key.rs | 1 - ruma-events/src/key/verification/mac.rs | 1 - ruma-events/src/key/verification/start.rs | 1 - 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ruma-events/src/key/verification/accept.rs b/ruma-events/src/key/verification/accept.rs index de299f81..b05cc3a4 100644 --- a/ruma-events/src/key/verification/accept.rs +++ b/ruma-events/src/key/verification/accept.rs @@ -8,13 +8,11 @@ use ruma_events_macros::MessageEventContent; use serde::{Deserialize, Serialize}; use serde_json::Value as JsonValue; +#[cfg(feature = "unstable-pre-spec")] +use super::Relation; use super::{ HashAlgorithm, KeyAgreementProtocol, MessageAuthenticationCode, ShortAuthenticationString, }; - -#[cfg(feature = "unstable-pre-spec")] -use super::Relation; - #[cfg(feature = "unstable-pre-spec")] use crate::MessageEvent; diff --git a/ruma-events/src/key/verification/cancel.rs b/ruma-events/src/key/verification/cancel.rs index 6682bb78..14fa2931 100644 --- a/ruma-events/src/key/verification/cancel.rs +++ b/ruma-events/src/key/verification/cancel.rs @@ -6,11 +6,10 @@ use ruma_events_macros::MessageEventContent; use ruma_serde::StringEnum; use serde::{Deserialize, Serialize}; -#[cfg(feature = "unstable-pre-spec")] -use crate::MessageEvent; - #[cfg(feature = "unstable-pre-spec")] use super::Relation; +#[cfg(feature = "unstable-pre-spec")] +use crate::MessageEvent; /// Cancels a key verification process/request. #[cfg(feature = "unstable-pre-spec")] diff --git a/ruma-events/src/key/verification/key.rs b/ruma-events/src/key/verification/key.rs index b0bc3bd9..7cda74cf 100644 --- a/ruma-events/src/key/verification/key.rs +++ b/ruma-events/src/key/verification/key.rs @@ -7,7 +7,6 @@ use serde::{Deserialize, Serialize}; #[cfg(feature = "unstable-pre-spec")] use super::Relation; - #[cfg(feature = "unstable-pre-spec")] use crate::MessageEvent; diff --git a/ruma-events/src/key/verification/mac.rs b/ruma-events/src/key/verification/mac.rs index b6c852ac..bf2e5560 100644 --- a/ruma-events/src/key/verification/mac.rs +++ b/ruma-events/src/key/verification/mac.rs @@ -9,7 +9,6 @@ use serde::{Deserialize, Serialize}; #[cfg(feature = "unstable-pre-spec")] use super::Relation; - #[cfg(feature = "unstable-pre-spec")] use crate::MessageEvent; diff --git a/ruma-events/src/key/verification/start.rs b/ruma-events/src/key/verification/start.rs index 769e7692..624b8a40 100644 --- a/ruma-events/src/key/verification/start.rs +++ b/ruma-events/src/key/verification/start.rs @@ -14,7 +14,6 @@ use super::Relation; use super::{ HashAlgorithm, KeyAgreementProtocol, MessageAuthenticationCode, ShortAuthenticationString, }; - use crate::InvalidInput; #[cfg(feature = "unstable-pre-spec")] use crate::MessageEvent;