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

common: Merge ruma-identifiers into ruma-common

Browse Source
This commit is contained in:
Kévin Commaille
2022-03-09 18:46:51 +01:00
committed by GitHub
parent ac2d2f634d
commit 088d1872b7
309 changed files with 638 additions and 1151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,9 +30,8 @@ use ruma_common::{
},
EventType,
},
MilliSecondsSinceUnixEpoch,
room_id, user_id, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, UserId,
};
use ruma_identifiers::{room_id, user_id, EventId, RoomId, RoomVersionId, UserId};
use ruma_state_res::{self as state_res, Error, Event, Result, StateMap};
use serde_json::{
json,
@@ -538,9 +537,8 @@ fn BAN_STATE_SET() -> HashMap<Box<EventId>, Arc<StateEvent>> {
mod event {
use ruma_common::{
events::{pdu::Pdu, EventType},
MilliSecondsSinceUnixEpoch,
EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId,
};
use ruma_identifiers::{EventId, RoomId, UserId};
use ruma_state_res::Event;
use serde::{Deserialize, Serialize};
use serde_json::value::RawValue as RawJsonValue;