Bring back ruma-events

Co-authored-by: Kévin Commaille <zecakeh@tedomum.fr>

crates/ruma-state-res/Cargo.toml

@@ -20,7 +20,8 @@ unstable-exhaustive-types = []
 [dependencies]
 itertools = "0.11.0"
 js_int = { workspace = true }
-ruma-common = { workspace = true, features = ["events"] }
+ruma-common = { workspace = true }
+ruma-events = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
@@ -32,7 +33,7 @@ criterion = { workspace = true, optional = true }
 [dev-dependencies]
 maplit = { workspace = true }
 rand = "0.8.3"
-ruma-common = { workspace = true, features = ["unstable-pdu"] }
+ruma-events = { workspace = true, features = ["unstable-pdu"] }
 tracing-subscriber = "0.3.16"
 
 [[bench]]

crates/ruma-state-res/benches/state_res_bench.rs

@@ -21,17 +21,17 @@ use event::PduEvent;
 use js_int::{int, uint};
 use maplit::{btreemap, hashmap, hashset};
 use ruma_common::{
-    events::{
-        pdu::{EventHash, Pdu, RoomV3Pdu},
-        room::{
-            join_rules::{JoinRule, RoomJoinRulesEventContent},
-            member::{MembershipState, RoomMemberEventContent},
-        },
-        StateEventType, TimelineEventType,
-    },
     room_id, user_id, EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, RoomId, RoomVersionId,
     UserId,
 };
+use ruma_events::{
+    pdu::{EventHash, Pdu, RoomV3Pdu},
+    room::{
+        join_rules::{JoinRule, RoomJoinRulesEventContent},
+        member::{MembershipState, RoomMemberEventContent},
+    },
+    StateEventType, TimelineEventType,
+};
 use ruma_state_res::{self as state_res, Error, Event, Result, StateMap};
 use serde_json::{
     json,
@@ -529,10 +529,8 @@ impl EventTypeExt for &TimelineEventType {
 }
 
 mod event {
-    use ruma_common::{
-        events::{pdu::Pdu, TimelineEventType},
-        MilliSecondsSinceUnixEpoch, OwnedEventId, RoomId, UserId,
-    };
+    use ruma_common::{MilliSecondsSinceUnixEpoch, OwnedEventId, RoomId, UserId};
+    use ruma_events::{pdu::Pdu, TimelineEventType};
     use ruma_state_res::Event;
     use serde::{Deserialize, Serialize};
     use serde_json::value::RawValue as RawJsonValue;

crates/ruma-state-res/src/event_auth.rs

@@ -2,19 +2,16 @@ use std::{borrow::Borrow, collections::BTreeSet};
 
 use js_int::{int, Int};
 use ruma_common::{
-    events::{
-        room::{
-            create::RoomCreateEventContent,
-            join_rules::{JoinRule, RoomJoinRulesEventContent},
-            member::{MembershipState, ThirdPartyInvite},
-            power_levels::RoomPowerLevelsEventContent,
-            third_party_invite::RoomThirdPartyInviteEventContent,
-        },
-        StateEventType, TimelineEventType,
-    },
     serde::{Base64, Raw},
     OwnedUserId, RoomVersionId, UserId,
 };
+use ruma_events::room::{
+    create::RoomCreateEventContent,
+    join_rules::{JoinRule, RoomJoinRulesEventContent},
+    member::{MembershipState, ThirdPartyInvite},
+    power_levels::RoomPowerLevelsEventContent,
+    third_party_invite::RoomThirdPartyInviteEventContent,
+};
 use serde::{
     de::{Error as _, IgnoredAny},
     Deserialize,
@@ -28,7 +25,7 @@ use crate::{
         deserialize_power_levels_content_invite, deserialize_power_levels_content_redact,
     },
     room_version::RoomVersion,
-    Error, Event, Result,
+    Error, Event, Result, StateEventType, TimelineEventType,
 };
 
 // FIXME: field extracting could be bundled for `content`
@@ -1009,7 +1006,7 @@ fn verify_third_party_invite(
 mod tests {
     use std::sync::Arc;
 
-    use ruma_common::events::{
+    use ruma_events::{
         room::{
             join_rules::{
                 AllowRule, JoinRule, Restricted, RoomJoinRulesEventContent, RoomMembership,

crates/ruma-state-res/src/lib.rs

@@ -7,12 +7,10 @@ use std::{
 
 use itertools::Itertools;
 use js_int::{int, Int};
-use ruma_common::{
-    events::{
-        room::member::{MembershipState, RoomMemberEventContent},
-        StateEventType, TimelineEventType,
-    },
-    EventId, MilliSecondsSinceUnixEpoch, RoomVersionId,
+use ruma_common::{EventId, MilliSecondsSinceUnixEpoch, RoomVersionId};
+use ruma_events::{
+    room::member::{MembershipState, RoomMemberEventContent},
+    StateEventType, TimelineEventType,
 };
 use serde_json::from_str as from_json_str;
 use tracing::{debug, info, trace, warn};
@@ -646,12 +644,10 @@ mod tests {
     use js_int::{int, uint};
     use maplit::{hashmap, hashset};
     use rand::seq::SliceRandom;
-    use ruma_common::{
-        events::{
-            room::join_rules::{JoinRule, RoomJoinRulesEventContent},
-            StateEventType, TimelineEventType,
-        },
-        MilliSecondsSinceUnixEpoch, OwnedEventId, RoomVersionId,
+    use ruma_common::{MilliSecondsSinceUnixEpoch, OwnedEventId, RoomVersionId};
+    use ruma_events::{
+        room::join_rules::{JoinRule, RoomJoinRulesEventContent},
+        StateEventType, TimelineEventType,
     };
     use serde_json::{json, value::to_raw_value as to_raw_json_value};
     use tracing::debug;

crates/ruma-state-res/src/power_levels.rs

@@ -2,11 +2,11 @@ use std::collections::BTreeMap;
 
 use js_int::Int;
 use ruma_common::{
-    events::{room::power_levels::RoomPowerLevelsEventContent, TimelineEventType},
     power_levels::{default_power_level, NotificationPowerLevels},
     serde::{btreemap_deserialize_v1_powerlevel_values, deserialize_v1_powerlevel},
     OwnedUserId,
 };
+use ruma_events::{room::power_levels::RoomPowerLevelsEventContent, TimelineEventType};
 use serde::Deserialize;
 use serde_json::{from_str as from_json_str, Error};
 use tracing::error;

crates/ruma-state-res/src/state_event.rs

@@ -5,7 +5,8 @@ use std::{
     sync::Arc,
 };
 
-use ruma_common::{events::TimelineEventType, EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId};
+use ruma_common::{EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId};
+use ruma_events::TimelineEventType;
 use serde_json::value::RawValue as RawJsonValue;
 
 /// Abstraction of a PDU so users can have their own PDU types.

crates/ruma-state-res/src/test_utils.rs

@@ -9,17 +9,16 @@ use std::{
 
 use js_int::{int, uint};
 use ruma_common::{
-    event_id,
-    events::{
-        pdu::{EventHash, Pdu, RoomV3Pdu},
-        room::{
-            join_rules::{JoinRule, RoomJoinRulesEventContent},
-            member::{MembershipState, RoomMemberEventContent},
-        },
-        TimelineEventType,
+    event_id, room_id, user_id, EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, RoomId,
+    RoomVersionId, UserId,
+};
+use ruma_events::{
+    pdu::{EventHash, Pdu, RoomV3Pdu},
+    room::{
+        join_rules::{JoinRule, RoomJoinRulesEventContent},
+        member::{MembershipState, RoomMemberEventContent},
     },
-    room_id, user_id, EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, RoomId, RoomVersionId,
-    UserId,
+    TimelineEventType,
 };
 use serde_json::{
     json,
@@ -547,10 +546,8 @@ pub(crate) fn INITIAL_EDGES() -> Vec<OwnedEventId> {
 }
 
 pub(crate) mod event {
-    use ruma_common::{
-        events::{pdu::Pdu, TimelineEventType},
-        MilliSecondsSinceUnixEpoch, OwnedEventId, RoomId, UserId,
-    };
+    use ruma_common::{MilliSecondsSinceUnixEpoch, OwnedEventId, RoomId, UserId};
+    use ruma_events::{pdu::Pdu, TimelineEventType};
     use serde::{Deserialize, Serialize};
     use serde_json::value::RawValue as RawJsonValue;