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

Import-rename serde_json::Value to JsonValue

Browse Source
This commit is contained in:
Jonas Platte 2020-05-02 23:33:47 +02:00
parent b8eafc3f59
commit b29263fe85
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/collections/raw/all.rs
View File

@ -2,7 +2,7 @@
//! the trait of the same name.
use serde::{de::Error as _, Deserialize, Deserializer};
use serde_json::Value;
use serde_json::Value as JsonValue;
use super::only;
use crate::{
@ -346,7 +346,7 @@ impl<'de> Deserialize<'de> for Event {
use crate::util::try_variant_from_value as from_value;
use EventType::*;
let value = Value::deserialize(deserializer)?;
let value = JsonValue::deserialize(deserializer)?;
let event_type = get_field(&value, "type")?;
match event_type {
@ -417,7 +417,7 @@ impl<'de> Deserialize<'de> for RoomEvent {
use crate::util::try_variant_from_value as from_value;
use EventType::*;
let value = Value::deserialize(deserializer)?;
let value = JsonValue::deserialize(deserializer)?;
let event_type = get_field(&value, "type")?;
match event_type {
@ -483,7 +483,7 @@ impl<'de> Deserialize<'de> for StateEvent {
use crate::util::try_variant_from_value as from_value;
use EventType::*;
let value = Value::deserialize(deserializer)?;
let value = JsonValue::deserialize(deserializer)?;
let event_type = get_field(&value, "type")?;
match event_type {

6
src/collections/raw/only.rs
View File

@ -2,7 +2,7 @@
//! most" the trait of the same name.
use serde::{de::Error as _, Deserialize, Deserializer};
use serde_json::Value;
use serde_json::Value as JsonValue;
pub use super::all::StateEvent;
use crate::{
@ -142,7 +142,7 @@ impl<'de> Deserialize<'de> for Event {
use crate::util::try_variant_from_value as from_value;
use EventType::*;
let value = Value::deserialize(deserializer)?;
let value = JsonValue::deserialize(deserializer)?;
let event_type = get_field(&value, "type")?;
match event_type {
@ -202,7 +202,7 @@ impl<'de> Deserialize<'de> for RoomEvent {
use crate::util::try_variant_from_value as from_value;
use EventType::*;
let value = Value::deserialize(deserializer)?;
let value = JsonValue::deserialize(deserializer)?;
let event_type = get_field(&value, "type")?;
match event_type {

5
src/push_rules.rs
View File

@ -4,7 +4,7 @@ use ruma_events_macros::ruma_event;
use serde::{
de::Error, ser::SerializeStruct as _, Deserialize, Deserializer, Serialize, Serializer,
};
use serde_json::{from_value, Value};
use serde_json::{from_value, Value as JsonValue};
ruma_event! {
/// Describes all push rules for a user.
@ -148,12 +148,13 @@ impl Serialize for PushCondition {
}
}
// TODO: Derive
impl<'de> Deserialize<'de> for PushCondition {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
let value: Value = Deserialize::deserialize(deserializer)?;
let value: JsonValue = Deserialize::deserialize(deserializer)?;
let kind_value = match value.get("kind") {
Some(value) => value.clone(),

8
src/stripped.rs
View File

@ -7,7 +7,7 @@
use ruma_identifiers::UserId;
use serde::{de::DeserializeOwned, Deserialize, Deserializer, Serialize};
use serde_json::Value;
use serde_json::Value as JsonValue;
use crate::{
room::{
@ -169,7 +169,7 @@ where
D: Deserializer<'de>,
{
// TODO: Optimize
let value = Value::deserialize(deserializer)?;
let value = JsonValue::deserialize(deserializer)?;
Ok(Self {
content: get_field(&value, "content")?,
@ -182,7 +182,7 @@ where
mod raw {
use serde::{Deserialize, Deserializer};
use serde_json::Value;
use serde_json::Value as JsonValue;
use super::StrippedStateEvent;
use crate::{
@ -284,7 +284,7 @@ mod raw {
use serde::de::Error as _;
// TODO: Optimize
let value = Value::deserialize(deserializer)?;
let value = JsonValue::deserialize(deserializer)?;
let event_type = get_field(&value, "type")?;
match event_type {

8
src/to_device.rs
View File

@ -6,7 +6,7 @@
use ruma_identifiers::UserId;
use serde::{de::DeserializeOwned, Deserialize, Deserializer, Serialize};
use serde_json::Value;
use serde_json::Value as JsonValue;
use crate::{
dummy::DummyEventContent,
@ -142,7 +142,7 @@ where
{
// TODO: Optimize, what should be optimized here? Can we expand this
// comment?
let value = Value::deserialize(deserializer)?;
let value = JsonValue::deserialize(deserializer)?;
Ok(Self {
content: get_field(&value, "content")?,
@ -153,7 +153,7 @@ where
mod raw {
use serde::{Deserialize, Deserializer};
use serde_json::Value;
use serde_json::Value as JsonValue;
use super::ToDeviceEvent;
use crate::{
@ -231,7 +231,7 @@ mod raw {
// TODO: Optimize, what should be optimized here? Can we expand this
// comment?
let value = Value::deserialize(deserializer)?;
let value = JsonValue::deserialize(deserializer)?;
let event_type = get_field(&value, "type")?;
match event_type {

6
src/util.rs
View File

@ -1,5 +1,5 @@
use serde::de::DeserializeOwned;
use serde_json::Value;
use serde_json::Value as JsonValue;
use crate::TryFromRaw;
@ -12,7 +12,7 @@ pub fn try_convert_variant<Enum: TryFromRaw, Content: TryFromRaw>(
.map_err(|err| err.to_string())
}
pub fn try_variant_from_value<T, U, E>(value: Value, variant: fn(T) -> U) -> Result<U, E>
pub fn try_variant_from_value<T, U, E>(value: JsonValue, variant: fn(T) -> U) -> Result<U, E>
where
T: DeserializeOwned,
E: serde::de::Error,
@ -26,7 +26,7 @@ pub fn serde_json_error_to_generic_de_error<E: serde::de::Error>(error: serde_js
E::custom(error.to_string())
}
pub fn get_field<T, E>(value: &Value, field: &'static str) -> Result<T, E>
pub fn get_field<T, E>(value: &JsonValue, field: &'static str) -> Result<T, E>
where
T: DeserializeOwned,
E: serde::de::Error,