fix mod/use order

Yes, it does actually bother me, thanks for asking.
This commit is contained in:
Charles Hall 2024-10-03 15:28:24 -07:00
parent 287f6b9163
commit 5a490a4397
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
30 changed files with 83 additions and 50 deletions

View file

@ -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,
}

View file

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

View file

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

View file

@ -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,

View file

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

View file

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

View file

@ -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,
}

View file

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

View file

@ -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;

View file

@ -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,
}

View file

@ -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:

View file

@ -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,
}

View file

@ -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,

View file

@ -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,
}

View file

@ -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>,

View file

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