From a0ecd76e210cc924884a5b1c1d2d81d3b608827a Mon Sep 17 00:00:00 2001
From: Devin Ragotzy <devin.ragotzy@gmail.com>
Date: Tue, 26 Jan 2021 21:53:03 -0500
Subject: [PATCH] Run cargo fmt using nightly
---
src/client_server/push.rs | 21 +++++++++++----------
src/client_server/read_marker.rs | 3 ++-
src/database/appservice.rs | 6 ++++--
src/database/globals.rs | 9 +++++----
src/error.rs | 6 +++++-
src/main.rs | 16 ++++++++++------
6 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/src/client_server/push.rs b/src/client_server/push.rs
index 667d6677c..fd938c1cb 100644
--- a/src/client_server/push.rs
+++ b/src/client_server/push.rs
@@ -5,10 +5,11 @@
error::ErrorKind,
r0::push::{
delete_pushrule, get_pushers, get_pushrule, get_pushrule_actions, get_pushrule_enabled,
- get_pushrules_all, set_pushrule, set_pushrule_actions, set_pushrule_enabled, RuleKind,
+ get_pushrules_all, set_pusher, set_pushrule, set_pushrule_actions,
+ set_pushrule_enabled, RuleKind,
},
},
- events::EventType,
+ events::{push_rules, EventType},
push::{
ConditionalPushRuleInit, ContentPushRule, OverridePushRule, PatternedPushRuleInit,
RoomPushRule, SenderPushRule, SimplePushRuleInit, UnderridePushRule,
@@ -30,7 +31,7 @@ pub async fn get_pushrules_all_route(
let event = db
.account_data
- .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+ .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
.ok_or(Error::BadRequest(
ErrorKind::NotFound,
"PushRules event not found.",
@@ -54,7 +55,7 @@ pub async fn get_pushrule_route(
let event = db
.account_data
- .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+ .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
.ok_or(Error::BadRequest(
ErrorKind::NotFound,
"PushRules event not found.",
@@ -116,7 +117,7 @@ pub async fn set_pushrule_route(
let mut event = db
.account_data
- .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+ .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
.ok_or(Error::BadRequest(
ErrorKind::NotFound,
"PushRules event not found.",
@@ -262,7 +263,7 @@ pub async fn get_pushrule_actions_route(
let mut event = db
.account_data
- .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+ .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
.ok_or(Error::BadRequest(
ErrorKind::NotFound,
"PushRules event not found.",
@@ -325,7 +326,7 @@ pub async fn set_pushrule_actions_route(
let mut event = db
.account_data
- .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+ .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
.ok_or(Error::BadRequest(
ErrorKind::NotFound,
"PushRules event not found.",
@@ -428,7 +429,7 @@ pub async fn get_pushrule_enabled_route(
let mut event = db
.account_data
- .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+ .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
.ok_or(Error::BadRequest(
ErrorKind::NotFound,
"PushRules event not found.",
@@ -488,7 +489,7 @@ pub async fn set_pushrule_enabled_route(
let mut event = db
.account_data
- .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+ .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
.ok_or(Error::BadRequest(
ErrorKind::NotFound,
"PushRules event not found.",
@@ -591,7 +592,7 @@ pub async fn delete_pushrule_route(
let mut event = db
.account_data
- .get::<ruma::events::push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
+ .get::<push_rules::PushRulesEvent>(None, &sender_user, EventType::PushRules)?
.ok_or(Error::BadRequest(
ErrorKind::NotFound,
"PushRules event not found.",
diff --git a/src/client_server/read_marker.rs b/src/client_server/read_marker.rs
index 0c4ec1a49..bb76a4408 100644
--- a/src/client_server/read_marker.rs
+++ b/src/client_server/read_marker.rs
@@ -2,7 +2,8 @@
use crate::{ConduitResult, Database, Error, Ruma};
use ruma::{
api::client::{
- error::ErrorKind, r0::capabilities::get_capabilities, r0::read_marker::set_read_marker,
+ error::ErrorKind,
+ r0::{capabilities::get_capabilities, read_marker::set_read_marker},
},
events::{AnyEphemeralRoomEvent, AnyEvent, EventType},
};
diff --git a/src/database/appservice.rs b/src/database/appservice.rs
index 26ea5b936..764291d6d 100644
--- a/src/database/appservice.rs
+++ b/src/database/appservice.rs
@@ -1,6 +1,8 @@
use crate::{utils, Error, Result};
-use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::{
+ collections::HashMap,
+ sync::{Arc, RwLock},
+};
#[derive(Clone)]
pub struct Appservice {
diff --git a/src/database/globals.rs b/src/database/globals.rs
index 7156a75aa..fc4adc3eb 100644
--- a/src/database/globals.rs
+++ b/src/database/globals.rs
@@ -4,10 +4,11 @@
api::federation::discovery::{ServerSigningKeys, VerifyKey},
ServerName, ServerSigningKeyId,
};
-use std::collections::{BTreeMap, HashMap};
-use std::sync::Arc;
-use std::sync::RwLock;
-use std::time::Duration;
+use std::{
+ collections::{BTreeMap, HashMap},
+ sync::{Arc, RwLock},
+ time::Duration,
+};
use trust_dns_resolver::TokioAsyncResolver;
pub const COUNTER: &str = "c";
diff --git a/src/error.rs b/src/error.rs
index 13efce67c..d8f10f4e2 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,4 +1,8 @@
-use std::{collections::HashMap, sync::RwLock, time::Duration, time::Instant};
+use std::{
+ collections::HashMap,
+ sync::RwLock,
+ time::{Duration, Instant},
+};
use log::error;
use ruma::{
diff --git a/src/main.rs b/src/main.rs
index 054c859c0..5aa0a19ee 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,11 +18,15 @@
pub use ruma_wrapper::{ConduitResult, Ruma, RumaResponse};
use log::LevelFilter;
-use rocket::figment::{
- providers::{Env, Format, Toml},
- Figment,
+use rocket::{
+ catch, catchers,
+ fairing::AdHoc,
+ figment::{
+ providers::{Env, Format, Toml},
+ Figment,
+ },
+ routes, Request,
};
-use rocket::{catch, catchers, fairing::AdHoc, routes, Request};
fn setup_rocket() -> rocket::Rocket {
// Force log level off, so we can use our own logger
@@ -143,6 +147,7 @@ fn setup_rocket() -> rocket::Rocket {
client_server::get_key_changes_route,
client_server::get_pushers_route,
client_server::set_pushers_route,
+ // client_server::third_party_route,
client_server::upgrade_room_route,
server_server::get_server_version_route,
server_server::get_server_keys_route,
@@ -165,8 +170,7 @@ fn setup_rocket() -> rocket::Rocket {
.await
.expect("config is valid");
- data.sending
- .start_handler(&data.globals, &data.rooms, &data.appservice);
+ data.sending.start_handler(&data);
log::set_boxed_logger(Box::new(ConduitLogger {
db: data.clone(),
last_logs: Default::default(),
--
GitLab