cargo fmt

Signed-off-by: girlbossceo <june@girlboss.ceo>
This commit is contained in:
girlbossceo 2023-07-29 14:30:48 +00:00
parent 3494d7759e
commit d7061e6984
6 changed files with 31 additions and 22 deletions

View file

@ -1,8 +1,8 @@
mod data;
pub use data::Data;
use ruma::serde::Base64;
use ruma::{
OwnedDeviceId, OwnedEventId, OwnedRoomId, OwnedServerName, OwnedServerSigningKeyId, OwnedUserId,
serde::Base64, OwnedDeviceId, OwnedEventId, OwnedRoomId, OwnedServerName,
OwnedServerSigningKeyId, OwnedUserId,
};
use crate::api::server_server::FedDest;
@ -15,14 +15,16 @@ use ruma::{
},
DeviceId, RoomVersionId, ServerName, UserId,
};
use std::sync::atomic::{self, AtomicBool};
use std::{
collections::{BTreeMap, HashMap},
fs,
future::Future,
net::{IpAddr, SocketAddr},
path::PathBuf,
sync::{Arc, Mutex, RwLock},
sync::{
atomic::{self, AtomicBool},
Arc, Mutex, RwLock,
},
time::{Duration, Instant},
};
use tokio::sync::{broadcast, watch::Receiver, Mutex as TokioMutex, Semaphore};

View file

@ -344,7 +344,8 @@ impl Service {
.map(|create_event| create_event.room_version)
.ok_or({
warn!("Invalid room version for room {room_id}");
Error::BadDatabase("Invalid room version")})?;
Error::BadDatabase("Invalid room version")
})?;
Ok(room_version)
}

View file

@ -62,7 +62,9 @@ impl Service {
device_id: OwnedDeviceId,
request: &mut sync_events::v4::Request,
) -> BTreeMap<String, BTreeMap<OwnedRoomId, bool>> {
let Some(conn_id) = request.conn_id.clone() else { return BTreeMap::new(); };
let Some(conn_id) = request.conn_id.clone() else {
return BTreeMap::new();
};
let cache = &mut self.connections.lock().unwrap();
let cached = Arc::clone(