From 5ec0be2b41005a6f1ed39383cae0e391ba55dbce Mon Sep 17 00:00:00 2001 From: Jonathan de Jong Date: Sun, 4 Jul 2021 02:15:04 +0200 Subject: [PATCH] fmt --- src/database.rs | 4 +++- src/database/admin.rs | 9 ++++----- src/database/sending.rs | 20 ++++++++++++++++---- src/main.rs | 5 ++++- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/database.rs b/src/database.rs index fda8a955..7c60b10a 100644 --- a/src/database.rs +++ b/src/database.rs @@ -340,7 +340,9 @@ impl Database { guard.rooms.edus.presenceid_presence.clear()?; guard.admin.start_handler(Arc::clone(&db), admin_receiver); - guard.sending.start_handler(Arc::clone(&db), sending_receiver); + guard + .sending + .start_handler(Arc::clone(&db), sending_receiver); drop(guard); diff --git a/src/database/admin.rs b/src/database/admin.rs index f79b789a..fcc13c37 100644 --- a/src/database/admin.rs +++ b/src/database/admin.rs @@ -35,8 +35,9 @@ impl Admin { let guard = db.read().await; - let conduit_user = UserId::try_from(format!("@conduit:{}", guard.globals.server_name())) - .expect("@conduit:server_name is valid"); + let conduit_user = + UserId::try_from(format!("@conduit:{}", guard.globals.server_name())) + .expect("@conduit:server_name is valid"); let conduit_room = guard .rooms @@ -53,9 +54,7 @@ impl Admin { drop(guard); - let send_message = |message: message::MessageEventContent| { - - }; + let send_message = |message: message::MessageEventContent| {}; loop { tokio::select! { diff --git a/src/database/sending.rs b/src/database/sending.rs index 102fb15f..7c9cf644 100644 --- a/src/database/sending.rs +++ b/src/database/sending.rs @@ -30,7 +30,10 @@ use ruma::{ receipt::ReceiptType, MilliSecondsSinceUnixEpoch, ServerName, UInt, UserId, }; -use tokio::{select, sync::{Semaphore, RwLock}}; +use tokio::{ + select, + sync::{RwLock, Semaphore}, +}; use super::abstraction::Tree; @@ -90,7 +93,11 @@ enum TransactionStatus { } impl Sending { - pub fn start_handler(&self, db: Arc>, mut receiver: mpsc::UnboundedReceiver>) { + pub fn start_handler( + &self, + db: Arc>, + mut receiver: mpsc::UnboundedReceiver>, + ) { tokio::spawn(async move { let mut futures = FuturesUnordered::new(); @@ -102,7 +109,8 @@ impl Sending { let guard = db.read().await; for (key, outgoing_kind, event) in - guard.sending + guard + .sending .servercurrentevents .iter() .filter_map(|(key, _)| { @@ -132,7 +140,11 @@ impl Sending { for (outgoing_kind, events) in initial_transactions { current_transaction_status .insert(outgoing_kind.get_prefix(), TransactionStatus::Running); - futures.push(Self::handle_events(outgoing_kind.clone(), events, Arc::clone(&db))); + futures.push(Self::handle_events( + outgoing_kind.clone(), + events, + Arc::clone(&db), + )); } loop { diff --git a/src/main.rs b/src/main.rs index 44444d61..9968b87a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,7 +12,10 @@ mod pdu; mod ruma_wrapper; mod utils; -use std::{sync::{Arc, Weak}, time::{Duration, Instant}}; +use std::{ + sync::{Arc, Weak}, + time::{Duration, Instant}, +}; use database::Config; pub use database::Database;