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

Re-run cargo fmt

Browse Source
This commit is contained in:
Jonas Platte 2021-05-15 15:41:23 +02:00
parent 67deaeb0fc
commit 9e9696f091
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -603,10 +603,7 @@ pub mod event {
} }
impl StateEvent { impl StateEvent {
pub fn from_id_value( pub fn from_id_value(id: EventId, json: serde_json::Value) -> serde_json::Result<Self> {
id: EventId,
json: serde_json::Value,
) -> serde_json::Result<Self> {
Ok(Self { event_id: id, rest: Pdu::RoomV3Pdu(serde_json::from_value(json)?) }) Ok(Self { event_id: id, rest: Pdu::RoomV3Pdu(serde_json::from_value(json)?) })
} }
@ -646,9 +643,7 @@ pub mod event {
} }
} }
pub fn deserialize_content<C: serde::de::DeserializeOwned>( pub fn deserialize_content<C: serde::de::DeserializeOwned>(&self) -> serde_json::Result<C> {
&self,
) -> serde_json::Result<C> {
match &self.rest { match &self.rest {
Pdu::RoomV1Pdu(ev) => serde_json::from_value(ev.content.clone()), Pdu::RoomV1Pdu(ev) => serde_json::from_value(ev.content.clone()),
Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()), Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()),

9
crates/ruma-state-res/tests/utils.rs
View File

@ -564,10 +564,7 @@ pub mod event {
} }
impl StateEvent { impl StateEvent {
pub fn from_id_value( pub fn from_id_value(id: EventId, json: serde_json::Value) -> serde_json::Result<Self> {
id: EventId,
json: serde_json::Value,
) -> serde_json::Result<Self> {
Ok(Self { event_id: id, rest: Pdu::RoomV3Pdu(serde_json::from_value(json)?) }) Ok(Self { event_id: id, rest: Pdu::RoomV3Pdu(serde_json::from_value(json)?) })
} }
@ -609,9 +606,7 @@ pub mod event {
Pdu::RoomV3Pdu(event) => event.state_key == Some("".into()), Pdu::RoomV3Pdu(event) => event.state_key == Some("".into()),
} }
} }
pub fn deserialize_content<C: serde::de::DeserializeOwned>( pub fn deserialize_content<C: serde::de::DeserializeOwned>(&self) -> serde_json::Result<C> {
&self,
) -> serde_json::Result<C> {
match &self.rest { match &self.rest {
Pdu::RoomV1Pdu(ev) => serde_json::from_value(ev.content.clone()), Pdu::RoomV1Pdu(ev) => serde_json::from_value(ev.content.clone()),
Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()), Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()),