From 9e9696f0910c8620a321caa91b757e247c0240b7 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 15 May 2021 15:41:23 +0200 Subject: [PATCH] Re-run cargo fmt --- crates/ruma-state-res/benches/state_res_bench.rs | 9 ++------- crates/ruma-state-res/tests/utils.rs | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/crates/ruma-state-res/benches/state_res_bench.rs b/crates/ruma-state-res/benches/state_res_bench.rs index d101154b..c918bda2 100644 --- a/crates/ruma-state-res/benches/state_res_bench.rs +++ b/crates/ruma-state-res/benches/state_res_bench.rs @@ -603,10 +603,7 @@ pub mod event { } impl StateEvent { - pub fn from_id_value( - id: EventId, - json: serde_json::Value, - ) -> serde_json::Result { + pub fn from_id_value(id: EventId, json: serde_json::Value) -> serde_json::Result { Ok(Self { event_id: id, rest: Pdu::RoomV3Pdu(serde_json::from_value(json)?) }) } @@ -646,9 +643,7 @@ pub mod event { } } - pub fn deserialize_content( - &self, - ) -> serde_json::Result { + pub fn deserialize_content(&self) -> serde_json::Result { match &self.rest { Pdu::RoomV1Pdu(ev) => serde_json::from_value(ev.content.clone()), Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()), diff --git a/crates/ruma-state-res/tests/utils.rs b/crates/ruma-state-res/tests/utils.rs index 34175cab..5bb04c64 100644 --- a/crates/ruma-state-res/tests/utils.rs +++ b/crates/ruma-state-res/tests/utils.rs @@ -564,10 +564,7 @@ pub mod event { } impl StateEvent { - pub fn from_id_value( - id: EventId, - json: serde_json::Value, - ) -> serde_json::Result { + pub fn from_id_value(id: EventId, json: serde_json::Value) -> serde_json::Result { 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()), } } - pub fn deserialize_content( - &self, - ) -> serde_json::Result { + pub fn deserialize_content(&self) -> serde_json::Result { match &self.rest { Pdu::RoomV1Pdu(ev) => serde_json::from_value(ev.content.clone()), Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()),