diff --git a/crates/ruma-client-api/src/r0/session/get_login_types.rs b/crates/ruma-client-api/src/r0/session/get_login_types.rs index 6c411f23..8a9baaff 100644 --- a/crates/ruma-client-api/src/r0/session/get_login_types.rs +++ b/crates/ruma-client-api/src/r0/session/get_login_types.rs @@ -5,13 +5,12 @@ use std::borrow::Cow; use ruma_api::ruma_api; #[cfg(feature = "unstable-pre-spec")] use ruma_identifiers::MxcUri; +use ruma_serde::JsonObject; #[cfg(feature = "unstable-pre-spec")] use ruma_serde::StringEnum; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde_json::Value as JsonValue; -type JsonObject = serde_json::Map; - ruma_api! { metadata: { description: "Gets the homeserver's supported login types to authenticate users. Clients should pick one of these and supply it as the type when logging in.", diff --git a/crates/ruma-events/src/room/message.rs b/crates/ruma-events/src/room/message.rs index 8197835b..2b8f509f 100644 --- a/crates/ruma-events/src/room/message.rs +++ b/crates/ruma-events/src/room/message.rs @@ -8,7 +8,7 @@ use ruma_events_macros::EventContent; #[cfg(feature = "unstable-pre-spec")] use ruma_identifiers::{DeviceIdBox, UserId}; use ruma_identifiers::{EventId, MxcUri}; -use ruma_serde::StringEnum; +use ruma_serde::{JsonObject, StringEnum}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde_json::Value as JsonValue; @@ -20,8 +20,6 @@ mod content_serde; pub mod feedback; mod relation_serde; -type JsonObject = serde_json::Map; - /// This event is used when sending messages in a room. /// /// Messages are not limited to be text. diff --git a/crates/ruma-serde/src/lib.rs b/crates/ruma-serde/src/lib.rs index 7b9fc68c..dd20bee4 100644 --- a/crates/ruma-serde/src/lib.rs +++ b/crates/ruma-serde/src/lib.rs @@ -4,6 +4,8 @@ #![warn(missing_docs)] +use serde_json::Value as JsonValue; + mod buf; pub mod can_be_empty; mod canonical_json; @@ -32,6 +34,9 @@ pub use strings::{ none_as_empty_string, }; +/// The inner type of [`serde_json::Value:::Object`]. +pub type JsonObject = serde_json::Map; + /// Check whether a value is equal to its default value. pub fn is_default(val: &T) -> bool { *val == T::default()