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

identifiers: Make RoomId a DST

Browse Source
This commit is contained in:
Jonas Platte
2021-09-19 19:34:14 +02:00
parent b0db5e94e1
commit 2d4dbfe42f
64 changed files with 177 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ use ruma_events::{
},
EventType,
};
use ruma_identifiers::{EventId, RoomId, RoomVersionId, UserId};
use ruma_identifiers::{room_id, EventId, RoomId, RoomVersionId, UserId};
use ruma_state_res::{self as state_res, Error, Event, Result, StateMap};
use serde_json::{
json,
@@ -71,7 +71,7 @@ fn resolution_shallow_auth_chain(c: &mut Criterion) {
state_sets
.iter()
.map(|map| {
store.auth_event_ids(&room_id(), map.values().cloned().collect()).unwrap()
store.auth_event_ids(room_id(), map.values().cloned().collect()).unwrap()
})
.collect(),
|id| ev_map.get(id).map(Arc::clone),
@@ -135,7 +135,7 @@ fn resolve_deeper_event_set(c: &mut Criterion) {
state_sets
.iter()
.map(|map| {
store.auth_event_ids(&room_id(), map.values().cloned().collect()).unwrap()
store.auth_event_ids(room_id(), map.values().cloned().collect()).unwrap()
})
.collect(),
|id| inner.get(id).map(Arc::clone),
@@ -355,8 +355,8 @@ fn ella() -> UserId {
UserId::try_from("@ella:foo").unwrap()
}
fn room_id() -> RoomId {
RoomId::try_from("!test:foo").unwrap()
fn room_id() -> &'static RoomId {
room_id!("!test:foo")
}
fn member_content_ban() -> Box<RawJsonValue> {
@@ -390,7 +390,7 @@ where
Arc::new(StateEvent {
event_id: id.try_into().unwrap(),
rest: Pdu::RoomV3Pdu(RoomV3Pdu {
room_id: room_id(),
room_id: room_id().to_owned(),
sender,
origin_server_ts: MilliSecondsSinceUnixEpoch(ts.try_into().unwrap()),
state_key,

4
crates/ruma-state-res/src/lib.rs
View File

@@ -1044,7 +1044,7 @@ mod tests {
state_sets
.iter()
.map(|map| {
store.auth_event_ids(&room_id(), map.values().cloned().collect()).unwrap()
store.auth_event_ids(room_id(), map.values().cloned().collect()).unwrap()
})
.collect(),
|id| ev_map.get(id).map(Arc::clone),
@@ -1148,7 +1148,7 @@ mod tests {
state_sets
.iter()
.map(|map| {
store.auth_event_ids(&room_id(), map.values().cloned().collect()).unwrap()
store.auth_event_ids(room_id(), map.values().cloned().collect()).unwrap()
})
.collect(),
|id| ev_map.get(id).map(Arc::clone),

8
crates/ruma-state-res/src/test_utils.rs
View File

@@ -112,7 +112,7 @@ pub fn do_check(
let auth_chain_sets = state_sets
.iter()
.map(|map| {
store.auth_event_ids(&room_id(), map.values().cloned().collect()).unwrap()
store.auth_event_ids(room_id(), map.values().cloned().collect()).unwrap()
})
.collect();
@@ -367,7 +367,7 @@ pub fn zara() -> UserId {
user_id!("@zara:foo")
}
pub fn room_id() -> RoomId {
pub fn room_id() -> &'static RoomId {
room_id!("!test:foo")
}
@@ -393,7 +393,7 @@ pub fn to_init_pdu_event(
Arc::new(StateEvent {
event_id: id.try_into().unwrap(),
rest: Pdu::RoomV3Pdu(RoomV3Pdu {
room_id: room_id(),
room_id: room_id().to_owned(),
sender,
origin_server_ts: MilliSecondsSinceUnixEpoch(ts.try_into().unwrap()),
state_key,
@@ -433,7 +433,7 @@ where
Arc::new(StateEvent {
event_id: id.try_into().unwrap(),
rest: Pdu::RoomV3Pdu(RoomV3Pdu {
room_id: room_id(),
room_id: room_id().to_owned(),
sender,
origin_server_ts: MilliSecondsSinceUnixEpoch(ts.try_into().unwrap()),
state_key,