diff --git a/src/core/mod.rs b/src/core/mod.rs index d201709b..1b7b8fa1 100644 --- a/src/core/mod.rs +++ b/src/core/mod.rs @@ -17,7 +17,7 @@ pub use ::tracing; pub use config::Config; pub use error::Error; pub use info::{rustc_flags_capture, version, version::version}; -pub use pdu::{PduBuilder, PduCount, PduEvent}; +pub use pdu::{Event, PduBuilder, PduCount, PduEvent}; pub use server::Server; pub use utils::{ctor, dtor, implement, result, result::Result}; diff --git a/src/core/pdu/state_res.rs b/src/core/pdu/event.rs similarity index 85% rename from src/core/pdu/state_res.rs rename to src/core/pdu/event.rs index a27c9822..15117f92 100644 --- a/src/core/pdu/state_res.rs +++ b/src/core/pdu/event.rs @@ -1,11 +1,12 @@ use std::sync::Arc; -use ruma::{events::TimelineEventType, state_res, EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId}; +pub use ruma::state_res::Event; +use ruma::{events::TimelineEventType, EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId}; use serde_json::value::RawValue as RawJsonValue; use super::PduEvent; -impl state_res::Event for PduEvent { +impl Event for PduEvent { type Id = Arc; fn event_id(&self) -> &Self::Id { &self.event_id } diff --git a/src/core/pdu/mod.rs b/src/core/pdu/mod.rs index ed11adbb..9c3aaf9b 100644 --- a/src/core/pdu/mod.rs +++ b/src/core/pdu/mod.rs @@ -1,10 +1,10 @@ mod builder; mod content; mod count; +mod event; mod filter; mod id; mod redact; -mod state_res; mod strip; mod unsigned; @@ -19,6 +19,7 @@ use serde_json::value::RawValue as RawJsonValue; pub use self::{ builder::{Builder, Builder as PduBuilder}, count::PduCount, + event::Event, id::*, }; use crate::Result;