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

common: Merge ruma-serde into ruma-common

Browse Source
This commit is contained in:
Kévin Commaille
2022-03-10 12:11:00 +01:00
committed by GitHub
parent bdd54d1dd3
commit bdcf07be87
226 changed files with 441 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/ruma-state-res/Cargo.toml
View File

@@ -24,7 +24,6 @@ __ci = ["ruma-common/unstable-pre-spec"]
itertools = "0.10.0"
js_int = "0.2.0"
ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["events"] }
ruma-serde = { version = "0.6.0", path = "../ruma-serde" }
serde = { version = "1.0.118", features = ["derive"] }
serde_json = "1.0.60"
thiserror = "1.0.26"

2
crates/ruma-state-res/src/event_auth.rs
View File

@@ -12,9 +12,9 @@ use ruma_common::{
},
EventType,
},
serde::{Base64, Raw},
RoomVersionId, UserId,
};
use ruma_serde::{Base64, Raw};
use serde::{de::IgnoredAny, Deserialize};
use serde_json::{from_str as from_json_str, value::RawValue as RawJsonValue};
use tracing::{debug, error, info, warn};

6
crates/ruma-state-res/src/lib.rs
View File

@@ -339,16 +339,16 @@ where
struct PowerLevelsContentFields {
#[cfg_attr(
feature = "compat",
serde(deserialize_with = "ruma_serde::btreemap_deserialize_v1_powerlevel_values")
serde(deserialize_with = "ruma_common::serde::btreemap_deserialize_v1_powerlevel_values")
)]
#[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
users: BTreeMap<Box<UserId>, Int>,
#[cfg_attr(
feature = "compat",
serde(deserialize_with = "ruma_serde::deserialize_v1_powerlevel")
serde(deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel")
)]
#[serde(default, skip_serializing_if = "ruma_serde::is_default")]
#[serde(default, skip_serializing_if = "ruma_common::serde::is_default")]
users_default: Int,
}