move core::pdu and core::state_res into core::matrix::

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/rooms/event_handler/state_at_incoming.rs

@@ -5,7 +5,9 @@ use std::{
 };
 
 use conduwuit::{
-	PduEvent, Result, StateMap, debug, err, implement, trace,
+	Result, debug, err, implement,
+	matrix::{PduEvent, StateMap},
+	trace,
 	utils::stream::{BroadbandExt, IterStream, ReadyExt, TryBroadbandExt, TryWidebandExt},
 };
 use futures::{FutureExt, StreamExt, TryFutureExt, TryStreamExt, future::try_join};

src/service/rooms/event_handler/upgrade_outlier_pdu.rs

@@ -1,7 +1,8 @@
 use std::{borrow::Borrow, collections::BTreeMap, iter::once, sync::Arc, time::Instant};
 
 use conduwuit::{
-	Err, EventTypeExt, PduEvent, Result, StateKey, debug, debug_info, err, implement, state_res,
+	Err, Result, debug, debug_info, err, implement,
+	matrix::{EventTypeExt, PduEvent, StateKey, state_res},
 	trace,
 	utils::stream::{BroadbandExt, ReadyExt},
 	warn,