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

Bump ruma to same rev as conduit federation-p2p branch

Browse Source
This commit is contained in:
Devin Ragotzy 2020-08-11 23:22:20 -04:00
parent 185047918a
commit 9a388fc813
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -23,8 +23,8 @@ thiserror = "1.0.20"
tracing-subscriber = "0.2.8" tracing-subscriber = "0.2.8"
[dependencies.ruma] [dependencies.ruma]
git = "https://github.com/DevinR528/ruma" git = "https://github.com/ruma/ruma"
branch = "pdu-deserialize" rev = "d5d2d1d893fa12d27960e4c58d6c09b215d06e95"
features = ["client-api", "federation-api", "appservice-api"] features = ["client-api", "federation-api", "appservice-api"]
[dev-dependencies] [dev-dependencies]

4
src/state_event.rs
View File

@ -173,7 +173,7 @@ impl StateEvent {
pub fn prev_event_ids(&self) -> Vec<EventId> { pub fn prev_event_ids(&self) -> Vec<EventId> {
match self { match self {
Self::Full(ev) => match ev { Self::Full(ev) => match ev {
Pdu::RoomV1Pdu(ev) => ev.prev_events.to_vec(), Pdu::RoomV1Pdu(ev) => ev.prev_events.iter().map(|(id, _)| id).cloned().collect(),
Pdu::RoomV3Pdu(ev) => ev.prev_events.clone(), Pdu::RoomV3Pdu(ev) => ev.prev_events.clone(),
}, },
Self::Sync(ev) => match ev { Self::Sync(ev) => match ev {
@ -188,7 +188,7 @@ impl StateEvent {
pub fn auth_events(&self) -> Vec<EventId> { pub fn auth_events(&self) -> Vec<EventId> {
match self { match self {
Self::Full(ev) => match ev { Self::Full(ev) => match ev {
Pdu::RoomV1Pdu(ev) => ev.auth_events.to_vec(), Pdu::RoomV1Pdu(ev) => ev.auth_events.iter().map(|(id, _)| id).cloned().collect(),
Pdu::RoomV3Pdu(ev) => ev.auth_events.to_vec(), Pdu::RoomV3Pdu(ev) => ev.auth_events.to_vec(),
}, },
Self::Sync(ev) => match ev { Self::Sync(ev) => match ev {