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

Use serde_json::Result alias

Browse Source
This commit is contained in:
Jonas Platte
2021-05-15 14:16:33 +02:00
parent 4edaf5a638
commit 60d4ea027f
11 changed files with 24 additions and 27 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

@@ -606,14 +606,14 @@ pub mod event {
pub fn from_id_value(
id: EventId,
json: serde_json::Value,
) -> Result<Self, serde_json::Error> {
) -> serde_json::Result<Self> {
Ok(Self { event_id: id, rest: Pdu::RoomV3Pdu(serde_json::from_value(json)?) })
}
pub fn from_id_canon_obj(
id: EventId,
json: CanonicalJsonObject,
) -> Result<Self, serde_json::Error> {
) -> serde_json::Result<Self> {
Ok(Self {
event_id: id,
// TODO: this is unfortunate (from_value(to_value(json)))...
@@ -648,7 +648,7 @@ pub mod event {
pub fn deserialize_content<C: serde::de::DeserializeOwned>(
&self,
) -> Result<C, serde_json::Error> {
) -> serde_json::Result<C> {
match &self.rest {
Pdu::RoomV1Pdu(ev) => serde_json::from_value(ev.content.clone()),
Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()),

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

@@ -567,14 +567,14 @@ pub mod event {
pub fn from_id_value(
id: EventId,
json: serde_json::Value,
) -> Result<Self, serde_json::Error> {
) -> serde_json::Result<Self> {
Ok(Self { event_id: id, rest: Pdu::RoomV3Pdu(serde_json::from_value(json)?) })
}
pub fn from_id_canon_obj(
id: EventId,
json: CanonicalJsonObject,
) -> Result<Self, serde_json::Error> {
) -> serde_json::Result<Self> {
Ok(Self {
event_id: id,
// TODO: this is unfortunate (from_value(to_value(json)))...
@@ -611,7 +611,7 @@ pub mod event {
}
pub fn deserialize_content<C: serde::de::DeserializeOwned>(
&self,
) -> Result<C, serde_json::Error> {
) -> serde_json::Result<C> {
match &self.rest {
Pdu::RoomV1Pdu(ev) => serde_json::from_value(ev.content.clone()),
Pdu::RoomV3Pdu(ev) => serde_json::from_value(ev.content.clone()),