fix mod/use order

Yes, it does actually bother me, thanks for asking.

src/database.rs

@@ -1,6 +1,3 @@
-pub(crate) mod abstraction;
-pub(crate) mod key_value;
-
 use std::{
     collections::{BTreeMap, HashMap, HashSet},
     fs,
@@ -10,7 +7,6 @@ use std::{
     sync::{Arc, Mutex, RwLock},
 };
 
-use abstraction::{KeyValueDatabaseEngine, KvTree};
 use lru_cache::LruCache;
 use ruma::{
     events::{
@@ -35,6 +31,11 @@ use crate::{
     services, utils, Config, Error, PduEvent, Result,
 };
 
+pub(crate) mod abstraction;
+pub(crate) mod key_value;
+
+use abstraction::{KeyValueDatabaseEngine, KvTree};
+
 pub(crate) struct KeyValueDatabase {
     db: Arc<dyn KeyValueDatabaseEngine>,
 

src/database/key_value/rooms.rs

@@ -1,3 +1,5 @@
+use crate::{database::KeyValueDatabase, service};
+
 mod alias;
 mod auth_chain;
 mod directory;
@@ -16,6 +18,4 @@ mod threads;
 mod timeline;
 mod user;
 
-use crate::{database::KeyValueDatabase, service};
-
 impl service::rooms::Data for KeyValueDatabase {}

src/database/key_value/rooms/edus.rs

@@ -1,5 +1,5 @@
-mod read_receipt;
-
 use crate::{database::KeyValueDatabase, service};
 
+mod read_receipt;
+
 impl service::rooms::edus::Data for KeyValueDatabase {}

src/main.rs

@@ -5,6 +5,8 @@
 use std::process::ExitCode;
 
 use clap::Parser;
+#[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]
+use tikv_jemallocator::Jemalloc;
 use tracing::{error, info};
 
 mod api;
@@ -19,8 +21,6 @@ mod utils;
 pub(crate) use api::ruma_wrapper::{Ar, Ra};
 pub(crate) use config::Config;
 pub(crate) use service::{pdu::PduEvent, services, Services};
-#[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]
-use tikv_jemallocator::Jemalloc;
 pub(crate) use utils::error::{Error, Result};
 
 #[cfg(all(not(target_env = "msvc"), feature = "jemalloc"))]

src/service/account_data.rs

@@ -1,4 +1,5 @@
 mod data;
 
 pub(crate) use data::Data;
+
 pub(crate) type Service = &'static dyn Data;

src/service/appservice.rs

@@ -1,8 +1,5 @@
-mod data;
-
 use std::collections::BTreeMap;
 
-pub(crate) use data::Data;
 use futures_util::Future;
 use regex::RegexSet;
 use ruma::{
@@ -13,6 +10,10 @@ use tokio::sync::RwLock;
 
 use crate::Result;
 
+mod data;
+
+pub(crate) use data::Data;
+
 /// Compiled regular expressions for a namespace.
 #[derive(Clone, Debug)]
 pub(crate) struct NamespaceRegex {

src/service/globals.rs

@@ -1,4 +1,3 @@
-mod data;
 use std::{
     collections::{BTreeMap, HashMap},
     error::Error as StdError,
@@ -15,7 +14,6 @@ use std::{
 };
 
 use base64::{engine::general_purpose, Engine as _};
-pub(crate) use data::{Data, SigningKeys};
 use futures_util::FutureExt;
 use hyper::service::Service as _;
 use hyper_util::{
@@ -48,6 +46,10 @@ use crate::{
     Config, Error, Result,
 };
 
+mod data;
+
+pub(crate) use data::{Data, SigningKeys};
+
 type WellKnownMap = HashMap<OwnedServerName, (FedDest, String)>;
 type TlsNameMap = HashMap<String, (Vec<IpAddr>, u16)>;
 // Time if last failed try, number of failed tries

src/service/key_backups.rs

@@ -1,4 +1,5 @@
 mod data;
 
 pub(crate) use data::Data;
+
 pub(crate) type Service = &'static dyn Data;

src/service/pusher.rs

@@ -1,8 +1,6 @@
-mod data;
 use std::{fmt::Debug, mem};
 
 use bytes::BytesMut;
-pub(crate) use data::Data;
 use ruma::{
     api::{
         client::push::{set_pusher, Pusher, PusherKind},
@@ -29,6 +27,10 @@ use tracing::warn;
 
 use crate::{services, utils, Error, PduEvent, Result};
 
+mod data;
+
+pub(crate) use data::Data;
+
 pub(crate) struct Service {
     pub(crate) db: &'static dyn Data,
 }

src/service/rooms/auth_chain.rs

@@ -1,16 +1,18 @@
-mod data;
 use std::{
     collections::{BTreeSet, HashSet},
     sync::Arc,
 };
 
-pub(crate) use data::Data;
 use ruma::{api::client::error::ErrorKind, EventId, RoomId};
 use tracing::{debug, error, warn};
 
 use super::short::ShortEventId;
 use crate::{services, utils::debug_slice_truncated, Error, Result};
 
+mod data;
+
+pub(crate) use data::Data;
+
 pub(crate) struct Service {
     pub(crate) db: &'static dyn Data,
 }

src/service/rooms/directory.rs

@@ -1,4 +1,5 @@
 mod data;
 
 pub(crate) use data::Data;
+
 pub(crate) type Service = &'static dyn Data;

src/service/rooms/edus/read_receipt.rs

@@ -1,4 +1,5 @@
 mod data;
 
 pub(crate) use data::Data;
+
 pub(crate) type Service = &'static dyn Data;

src/service/rooms/lazy_loading.rs

@@ -1,13 +1,15 @@
-mod data;
 use std::collections::{HashMap, HashSet};
 
-pub(crate) use data::Data;
 use ruma::{DeviceId, OwnedDeviceId, OwnedRoomId, OwnedUserId, RoomId, UserId};
 use tokio::sync::Mutex;
 
 use super::timeline::PduCount;
 use crate::Result;
 
+mod data;
+
+pub(crate) use data::Data;
+
 pub(crate) struct Service {
     pub(crate) db: &'static dyn Data,
 

src/service/rooms/metadata.rs

@@ -1,4 +1,5 @@
 mod data;
 
 pub(crate) use data::Data;
+
 pub(crate) type Service = &'static dyn Data;

src/service/rooms/outlier.rs

@@ -1,4 +1,5 @@
 mod data;
 
 pub(crate) use data::Data;
+
 pub(crate) type Service = &'static dyn Data;

src/service/rooms/pdu_metadata.rs

@@ -1,7 +1,5 @@
-mod data;
 use std::sync::Arc;
 
-pub(crate) use data::Data;
 use ruma::{
     api::client::relations::get_relating_events,
     events::{relation::RelationType, TimelineEventType},
@@ -12,6 +10,10 @@ use serde::Deserialize;
 use super::timeline::PduCount;
 use crate::{services, PduEvent, Result};
 
+mod data;
+
+pub(crate) use data::Data;
+
 pub(crate) struct Service {
     pub(crate) db: &'static dyn Data,
 }

src/service/rooms/search.rs

@@ -1,4 +1,5 @@
 mod data;
 
 pub(crate) use data::Data;
+
 pub(crate) type Service = &'static dyn Data;

src/service/rooms/short.rs

@@ -1,5 +1,7 @@
 mod data;
 
+pub(crate) use data::Data;
+
 macro_rules! short_id_type {
     ($name:ident) => {
         #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -23,5 +25,4 @@ short_id_type!(ShortEventId);
 short_id_type!(ShortStateHash);
 short_id_type!(ShortStateKey);
 
-pub(crate) use data::Data;
 pub(crate) type Service = &'static dyn Data;

src/service/rooms/state.rs

@@ -1,11 +1,9 @@
-mod data;
 use std::{
     collections::{HashMap, HashSet},
     iter,
     sync::Arc,
 };
 
-pub(crate) use data::Data;
 use ruma::{
     api::client::error::ErrorKind,
     events::{
@@ -29,6 +27,10 @@ use crate::{
     Error, PduEvent, Result,
 };
 
+mod data;
+
+pub(crate) use data::Data;
+
 pub(crate) struct Service {
     pub(crate) db: &'static dyn Data,
 }

src/service/rooms/state_accessor.rs

@@ -1,10 +1,8 @@
-mod data;
 use std::{
     collections::HashMap,
     sync::{Arc, Mutex},
 };
 
-pub(crate) use data::Data;
 use lru_cache::LruCache;
 use ruma::{
     events::{
@@ -35,6 +33,10 @@ use crate::{
     Error, PduEvent, Result,
 };
 
+mod data;
+
+pub(crate) use data::Data;
+
 pub(crate) struct Service {
     pub(crate) db: &'static dyn Data,
     pub(crate) server_visibility_cache:

src/service/rooms/state_cache.rs

@@ -1,7 +1,5 @@
-mod data;
 use std::{collections::HashSet, sync::Arc};
 
-pub(crate) use data::Data;
 use ruma::{
     events::{
         ignored_user_list::IgnoredUserListEvent,
@@ -16,6 +14,10 @@ use tracing::warn;
 
 use crate::{service::appservice::RegistrationInfo, services, Error, Result};
 
+mod data;
+
+pub(crate) use data::Data;
+
 pub(crate) struct Service {
     pub(crate) db: &'static dyn Data,
 }

src/service/rooms/state_compressor.rs

@@ -8,6 +8,7 @@ use std::{
 use lru_cache::LruCache;
 use ruma::{EventId, RoomId};
 
+use super::short::{ShortEventId, ShortStateHash, ShortStateKey};
 use crate::{
     observability::{FoundIn, Lookup, METRICS},
     services, utils, Result,
@@ -18,8 +19,6 @@ pub(crate) mod data;
 pub(crate) use data::Data;
 use data::StateDiff;
 
-use super::short::{ShortEventId, ShortStateHash, ShortStateKey};
-
 #[derive(Clone)]
 pub(crate) struct CompressedStateLayer {
     pub(crate) shortstatehash: ShortStateHash,

src/service/rooms/threads.rs

@@ -1,6 +1,3 @@
-mod data;
-
-pub(crate) use data::Data;
 use ruma::{
     api::client::{error::ErrorKind, threads::get_threads::v1::IncludeThreads},
     events::relation::BundledThread,
@@ -10,6 +7,10 @@ use serde_json::json;
 
 use crate::{services, Error, PduEvent, Result};
 
+mod data;
+
+pub(crate) use data::Data;
+
 pub(crate) struct Service {
     pub(crate) db: &'static dyn Data,
 }

src/service/rooms/timeline.rs

@@ -1,12 +1,9 @@
-mod data;
-
 use std::{
     cmp::Ordering,
     collections::{BTreeMap, HashSet},
     sync::Arc,
 };
 
-pub(crate) use data::Data;
 use ruma::{
     api::{client::error::ErrorKind, federation},
     canonical_json::to_canonical_value,
@@ -43,6 +40,10 @@ use crate::{
     Error, PduEvent, Result,
 };
 
+mod data;
+
+pub(crate) use data::Data;
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct PduId {
     inner: Vec<u8>,

src/service/rooms/user.rs

@@ -1,4 +1,5 @@
 mod data;
 
 pub(crate) use data::Data;
+
 pub(crate) type Service = &'static dyn Data;

src/service/sending.rs

@@ -1,5 +1,3 @@
-mod data;
-
 use std::{
     collections::{BTreeMap, HashMap, HashSet},
     fmt::Debug,
@@ -8,7 +6,6 @@ use std::{
 };
 
 use base64::{engine::general_purpose, Engine as _};
-pub(crate) use data::Data;
 use federation::transactions::send_transaction_message;
 use futures_util::{stream::FuturesUnordered, StreamExt};
 use ruma::{
@@ -50,6 +47,10 @@ use crate::{
     Config, Error, PduEvent, Result,
 };
 
+mod data;
+
+pub(crate) use data::Data;
+
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub(crate) enum Destination {
     Appservice(String),

src/service/transaction_ids.rs

@@ -1,4 +1,5 @@
 mod data;
 
 pub(crate) use data::Data;
+
 pub(crate) type Service = &'static dyn Data;

src/service/uiaa.rs

@@ -1,6 +1,3 @@
-mod data;
-
-pub(crate) use data::Data;
 use ruma::{
     api::client::{
         error::ErrorKind,
@@ -14,6 +11,10 @@ use crate::{
     api::client_server::SESSION_ID_LENGTH, services, utils, Error, Result,
 };
 
+mod data;
+
+pub(crate) use data::Data;
+
 pub(crate) struct Service {
     pub(crate) db: &'static dyn Data,
 }

src/service/users.rs

@@ -1,11 +1,9 @@
-mod data;
 use std::{
     collections::{BTreeMap, BTreeSet},
     mem,
     sync::{Arc, Mutex},
 };
 
-pub(crate) use data::Data;
 use ruma::{
     api::client::{
         device::Device,
@@ -24,6 +22,10 @@ use ruma::{
 
 use crate::{services, Error, Result};
 
+mod data;
+
+pub(crate) use data::Data;
+
 pub(crate) struct SlidingSyncCache {
     lists: BTreeMap<String, SyncRequestList>,
     subscriptions: BTreeMap<OwnedRoomId, sync_events::v4::RoomSubscription>,

src/utils.rs

@@ -1,7 +1,3 @@
-pub(crate) mod error;
-pub(crate) mod on_demand_hashmap;
-pub(crate) mod room_version;
-
 use std::{
     borrow::Cow,
     cmp, fmt,
@@ -21,6 +17,10 @@ use ruma::{
 
 use crate::{Error, Result};
 
+pub(crate) mod error;
+pub(crate) mod on_demand_hashmap;
+pub(crate) mod room_version;
+
 // Hopefully we have a better chat protocol in 530 years
 #[allow(clippy::as_conversions, clippy::cast_possible_truncation)]
 pub(crate) fn millis_since_unix_epoch() -> u64 {