refactor: Ruma upstreaming, half-baked edition

Co-authored-by: Jade Ellis <jade@ellis.link>

src/core/mod.rs

@@ -9,6 +9,18 @@ pub mod log;
 pub mod matrix;
 pub mod metrics;
 pub mod mods;
+
+#[cfg(any(not(conduwuit_mods), not(feature = "conduwuit_mods")))]
+pub mod mods {
+	#[macro_export]
+	macro_rules! mod_ctor {
+		() => {};
+	}
+	#[macro_export]
+	macro_rules! mod_dtor {
+		() => {};
+	}
+}
 pub mod server;
 pub mod utils;
 
@@ -27,7 +39,7 @@ pub use info::{
 	version::{name, version},
 };
 pub use matrix::{
-	Event, EventTypeExt, Pdu, PduCount, PduEvent, PduId, RoomVersion, pdu, state_res,
+	Event, EventTypeExt, Pdu, PduCount, PduEvent, PduId, pdu, state_res,
 };
 pub use parking_lot::{Mutex as SyncMutex, RwLock as SyncRwLock};
 pub use server::Server;
@@ -36,15 +48,3 @@ pub use utils::{implement, result, result::Result};
 pub use crate as conduwuit_core;
 
 conduwuit_macros::introspect_crate! {}
-
-#[cfg(any(not(conduwuit_mods), not(feature = "conduwuit_mods")))]
-pub mod mods {
-	#[macro_export]
-	macro_rules! mod_ctor {
-		() => {};
-	}
-	#[macro_export]
-	macro_rules! mod_dtor {
-		() => {};
-	}
-}