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

client-api: Don't import serde_json::Error

Browse Source
This commit is contained in:
Jonas Platte 2021-02-15 15:30:44 +01:00
parent f9eefaf02b
commit 918701dbff
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruma-client-api/src/r0/capabilities/get_capabilities.rs
View File

@ -7,9 +7,7 @@ use ruma_api::ruma_api;
use ruma_identifiers::RoomVersionId; use ruma_identifiers::RoomVersionId;
use ruma_serde::StringEnum; use ruma_serde::StringEnum;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::{ use serde_json::{from_value as from_json_value, to_value as to_json_value, Value as JsonValue};
from_value as from_json_value, to_value as to_json_value, Error, Value as JsonValue,
};
ruma_api! { ruma_api! {
metadata: { metadata: {
@ -85,7 +83,7 @@ impl Capabilities {
} }
/// Returns value of the given capability. /// Returns value of the given capability.
pub fn get(&self, capability: &str) -> Result<Option<Cow<'_, JsonValue>>, Error> { pub fn get(&self, capability: &str) -> serde_json::Result<Option<Cow<'_, JsonValue>>> {
let value = match capability { let value = match capability {
"m.change_password" => Some(Cow::Owned(to_json_value(&self.change_password)?)), "m.change_password" => Some(Cow::Owned(to_json_value(&self.change_password)?)),
"m.room_versions" => Some(Cow::Owned(to_json_value(&self.room_versions)?)), "m.room_versions" => Some(Cow::Owned(to_json_value(&self.room_versions)?)),
@ -98,7 +96,7 @@ impl Capabilities {
} }
/// Sets the given value to a capability. /// Sets the given value to a capability.
pub fn set(&mut self, capability_label: &str, capability: JsonValue) -> Result<(), Error> { pub fn set(&mut self, capability_label: &str, capability: JsonValue) -> serde_json::Result<()> {
match capability_label { match capability_label {
"m.change_password" => self.change_password = from_json_value(capability)?, "m.change_password" => self.change_password = from_json_value(capability)?,
"m.room_versions" => self.room_versions = from_json_value(capability)?, "m.room_versions" => self.room_versions = from_json_value(capability)?,