misc cleanup

src/client_server/account.rs

@@ -1,7 +1,7 @@
-use std::{collections::BTreeMap, convert::TryInto, sync::Arc};
+use std::{collections::BTreeMap, convert::TryInto};
 
-use super::{State, DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
-use crate::{database::ReadGuard, pdu::PduBuilder, utils, ConduitResult, Database, Error, Ruma};
+use super::{DEVICE_ID_LENGTH, SESSION_ID_LENGTH, TOKEN_LENGTH};
+use crate::{database::ReadGuard, pdu::PduBuilder, utils, ConduitResult, Error, Ruma};
 use log::info;
 use ruma::{
     api::client::{

src/client_server/alias.rs

@@ -1,6 +1,3 @@
-use std::sync::Arc;
-
-use super::State;
 use crate::{database::ReadGuard, ConduitResult, Database, Error, Ruma};
 use regex::Regex;
 use ruma::{

src/client_server/backup.rs

@@ -1,7 +1,4 @@
-use std::sync::Arc;
-
-use super::State;
-use crate::{database::ReadGuard, ConduitResult, Database, Error, Ruma};
+use crate::{database::ReadGuard, ConduitResult, Error, Ruma};
 use ruma::api::client::{
     error::ErrorKind,
     r0::backup::{

src/client_server/config.rs

@@ -1,7 +1,4 @@
-use std::sync::Arc;
-
-use super::State;
-use crate::{database::ReadGuard, ConduitResult, Database, Error, Ruma};
+use crate::{database::ReadGuard, ConduitResult, Error, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,

src/client_server/context.rs

@@ -1,7 +1,6 @@
-use super::State;
-use crate::{database::ReadGuard, ConduitResult, Database, Error, Ruma};
+use crate::{database::ReadGuard, ConduitResult, Error, Ruma};
 use ruma::api::client::{error::ErrorKind, r0::context::get_context};
-use std::{convert::TryFrom, sync::Arc};
+use std::convert::TryFrom;
 
 #[cfg(feature = "conduit_bin")]
 use rocket::get;

src/client_server/device.rs

@@ -1,7 +1,4 @@
-use std::sync::Arc;
-
-use super::State;
-use crate::{database::ReadGuard, utils, ConduitResult, Database, Error, Ruma};
+use crate::{database::ReadGuard, utils, ConduitResult, Error, Ruma};
 use ruma::api::client::{
     error::ErrorKind,
     r0::{

src/client_server/directory.rs

@@ -1,6 +1,3 @@
-use std::sync::Arc;
-
-use super::State;
 use crate::{database::ReadGuard, ConduitResult, Database, Error, Result, Ruma};
 use log::info;
 use ruma::{

src/client_server/keys.rs

@@ -1,4 +1,4 @@
-use super::{State, SESSION_ID_LENGTH};
+use super::SESSION_ID_LENGTH;
 use crate::{database::ReadGuard, utils, ConduitResult, Database, Error, Result, Ruma};
 use ruma::{
     api::client::{
@@ -14,10 +14,7 @@ use ruma::{
     encryption::UnsignedDeviceInfo,
     DeviceId, DeviceKeyAlgorithm, UserId,
 };
-use std::{
-    collections::{BTreeMap, HashSet},
-    sync::Arc,
-};
+use std::collections::{BTreeMap, HashSet};
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, post};

src/client_server/media.rs

@@ -1,15 +1,12 @@
-use super::State;
-use crate::{
-    database::media::FileMeta, database::ReadGuard, utils, ConduitResult, Database, Error, Ruma,
-};
+use crate::{database::media::FileMeta, database::ReadGuard, utils, ConduitResult, Error, Ruma};
 use ruma::api::client::{
     error::ErrorKind,
     r0::media::{create_content, get_content, get_content_thumbnail, get_media_config},
 };
+use std::convert::TryInto;
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, post};
-use std::{convert::TryInto, sync::Arc};
 
 const MXC_LENGTH: usize = 32;
 

src/client_server/membership.rs

@@ -1,4 +1,3 @@
-use super::State;
 use crate::{
     client_server,
     database::ReadGuard,

src/client_server/message.rs

@@ -1,5 +1,4 @@
-use super::State;
-use crate::{database::ReadGuard, pdu::PduBuilder, utils, ConduitResult, Database, Error, Ruma};
+use crate::{database::ReadGuard, pdu::PduBuilder, utils, ConduitResult, Error, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,
@@ -11,7 +10,6 @@ use ruma::{
 use std::{
     collections::BTreeMap,
     convert::{TryFrom, TryInto},
-    sync::Arc,
 };
 
 #[cfg(feature = "conduit_bin")]

src/client_server/mod.rs

@@ -64,9 +64,7 @@ pub use voip::*;
 use super::State;
 #[cfg(feature = "conduit_bin")]
 use {
-    crate::ConduitResult,
-    rocket::{options, State},
-    ruma::api::client::r0::to_device::send_event_to_device,
+    crate::ConduitResult, rocket::options, ruma::api::client::r0::to_device::send_event_to_device,
 };
 
 pub const DEVICE_ID_LENGTH: usize = 10;

src/client_server/presence.rs

@@ -1,7 +1,6 @@
-use super::State;
-use crate::{database::ReadGuard, utils, ConduitResult, Database, Ruma};
+use crate::{database::ReadGuard, utils, ConduitResult, Ruma};
 use ruma::api::client::r0::presence::{get_presence, set_presence};
-use std::{convert::TryInto, sync::Arc, time::Duration};
+use std::{convert::TryInto, time::Duration};
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, put};

src/client_server/profile.rs

@@ -1,5 +1,4 @@
-use super::State;
-use crate::{database::ReadGuard, pdu::PduBuilder, utils, ConduitResult, Database, Error, Ruma};
+use crate::{database::ReadGuard, pdu::PduBuilder, utils, ConduitResult, Error, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,
@@ -10,10 +9,10 @@ use ruma::{
     events::EventType,
     serde::Raw,
 };
+use std::convert::TryInto;
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, put};
-use std::{convert::TryInto, sync::Arc};
 
 #[cfg_attr(
     feature = "conduit_bin",

src/client_server/push.rs

@@ -1,7 +1,4 @@
-use std::sync::Arc;
-
-use super::State;
-use crate::{database::ReadGuard, ConduitResult, Database, Error, Ruma};
+use crate::{database::ReadGuard, ConduitResult, Error, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,

src/client_server/read_marker.rs

@@ -1,5 +1,4 @@
-use super::State;
-use crate::{database::ReadGuard, ConduitResult, Database, Error, Ruma};
+use crate::{database::ReadGuard, ConduitResult, Error, Ruma};
 use ruma::{
     api::client::{
         error::ErrorKind,
@@ -9,10 +8,10 @@ use ruma::{
     receipt::ReceiptType,
     MilliSecondsSinceUnixEpoch,
 };
+use std::collections::BTreeMap;
 
 #[cfg(feature = "conduit_bin")]
 use rocket::post;
-use std::{collections::BTreeMap, sync::Arc};
 
 #[cfg_attr(
     feature = "conduit_bin",

src/client_server/redact.rs

@@ -1,10 +1,8 @@
-use super::State;
-use crate::{database::ReadGuard, pdu::PduBuilder, ConduitResult, Database, Ruma};
+use crate::{database::ReadGuard, pdu::PduBuilder, ConduitResult, Ruma};
 use ruma::{
     api::client::r0::redact::redact_event,
     events::{room::redaction, EventType},
 };
-use std::sync::Arc;
 
 #[cfg(feature = "conduit_bin")]
 use rocket::put;

src/client_server/room.rs

@@ -1,7 +1,5 @@
-use super::State;
 use crate::{
-    client_server::invite_helper, database::ReadGuard, pdu::PduBuilder, ConduitResult, Database,
-    Error, Ruma,
+    client_server::invite_helper, database::ReadGuard, pdu::PduBuilder, ConduitResult, Error, Ruma,
 };
 use log::info;
 use ruma::{
@@ -16,7 +14,7 @@ use ruma::{
     serde::Raw,
     RoomAliasId, RoomId, RoomVersionId,
 };
-use std::{cmp::max, collections::BTreeMap, convert::TryFrom, sync::Arc};
+use std::{cmp::max, collections::BTreeMap, convert::TryFrom};
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, post};

src/client_server/search.rs

@@ -1,7 +1,5 @@
-use super::State;
-use crate::{database::ReadGuard, ConduitResult, Database, Error, Ruma};
+use crate::{database::ReadGuard, ConduitResult, Error, Ruma};
 use ruma::api::client::{error::ErrorKind, r0::search::search_events};
-use std::sync::Arc;
 
 #[cfg(feature = "conduit_bin")]
 use rocket::post;

src/client_server/session.rs

@@ -1,7 +1,5 @@
-use std::sync::Arc;
-
-use super::{State, DEVICE_ID_LENGTH, TOKEN_LENGTH};
-use crate::{database::ReadGuard, utils, ConduitResult, Database, Error, Ruma};
+use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
+use crate::{database::ReadGuard, utils, ConduitResult, Error, Ruma};
 use log::info;
 use ruma::{
     api::client::{

src/client_server/state.rs

@@ -1,6 +1,3 @@
-use std::sync::Arc;
-
-use super::State;
 use crate::{database::ReadGuard, pdu::PduBuilder, ConduitResult, Database, Error, Result, Ruma};
 use ruma::{
     api::client::{

src/client_server/sync.rs

@@ -1,4 +1,3 @@
-use super::State;
 use crate::{database::ReadGuard, ConduitResult, Database, Error, Result, Ruma, RumaResponse};
 use log::error;
 use ruma::{

src/client_server/tag.rs

@@ -1,10 +1,9 @@
-use super::State;
-use crate::{database::ReadGuard, ConduitResult, Database, Ruma};
+use crate::{database::ReadGuard, ConduitResult, Ruma};
 use ruma::{
     api::client::r0::tag::{create_tag, delete_tag, get_tags},
     events::EventType,
 };
-use std::{collections::BTreeMap, sync::Arc};
+use std::collections::BTreeMap;
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{delete, get, put};

src/client_server/to_device.rs

@@ -1,7 +1,4 @@
-use std::sync::Arc;
-
-use super::State;
-use crate::{database::ReadGuard, ConduitResult, Database, Error, Ruma};
+use crate::{database::ReadGuard, ConduitResult, Error, Ruma};
 use ruma::{
     api::client::{error::ErrorKind, r0::to_device::send_event_to_device},
     to_device::DeviceIdOrAllDevices,

src/client_server/typing.rs

@@ -1,7 +1,4 @@
-use std::sync::Arc;
-
-use super::State;
-use crate::{database::ReadGuard, utils, ConduitResult, Database, Ruma};
+use crate::{database::ReadGuard, utils, ConduitResult, Ruma};
 use create_typing_event::Typing;
 use ruma::api::client::r0::typing::create_typing_event;
 

src/client_server/user_directory.rs

@@ -1,7 +1,4 @@
-use std::sync::Arc;
-
-use super::State;
-use crate::{database::ReadGuard, ConduitResult, Database, Ruma};
+use crate::{database::ReadGuard, ConduitResult, Ruma};
 use ruma::api::client::r0::user_directory::search_users;
 
 #[cfg(feature = "conduit_bin")]