chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common: Merge ruma-events into ruma-common

Browse Source
This commit is contained in:
Kévin Commaille
2022-03-04 12:45:07 +01:00
committed by GitHub
parent 588fe9c006
commit c3f9a3cb70
172 changed files with 416 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/ruma-state-res/benches/state_res_bench.rs
View File

@@ -21,14 +21,16 @@ use criterion::{criterion_group, criterion_main, Criterion};
use event::StateEvent;
use js_int::{int, uint};
use maplit::{btreemap, hashmap, hashset};
use ruma_common::MilliSecondsSinceUnixEpoch;
use ruma_events::{
pdu::{EventHash, Pdu, RoomV3Pdu},
room::{
join_rules::{JoinRule, RoomJoinRulesEventContent},
member::{MembershipState, RoomMemberEventContent},
use ruma_common::{
events::{
pdu::{EventHash, Pdu, RoomV3Pdu},
room::{
join_rules::{JoinRule, RoomJoinRulesEventContent},
member::{MembershipState, RoomMemberEventContent},
},
EventType,
},
EventType,
MilliSecondsSinceUnixEpoch,
};
use ruma_identifiers::{room_id, user_id, EventId, RoomId, RoomVersionId, UserId};
use ruma_state_res::{self as state_res, Error, Event, Result, StateMap};
@@ -534,8 +536,10 @@ fn BAN_STATE_SET() -> HashMap<Box<EventId>, Arc<StateEvent>> {
}
mod event {
use ruma_common::MilliSecondsSinceUnixEpoch;
use ruma_events::{pdu::Pdu, EventType};
use ruma_common::{
events::{pdu::Pdu, EventType},
MilliSecondsSinceUnixEpoch,
};
use ruma_identifiers::{EventId, RoomId, UserId};
use ruma_state_res::Event;
use serde::{Deserialize, Serialize};