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

events: Remove AsRef<str> requirement on EventContent::EventType

Browse Source 
… and use Display instead of AsRef<str> for Raw<T>::deserialize_content.
This commit is contained in:
Jonas Platte 2022-03-21 19:09:02 +01:00 committed by Jonas Platte
parent a860fdaa86
commit 316d1423e8
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/ruma-common/src/events.rs
View File

@ -126,6 +126,8 @@
//! type alias), allowing content to be converted to and from JSON independently of the surrounding //! type alias), allowing content to be converted to and from JSON independently of the surrounding
//! event structure, if needed. //! event structure, if needed.
use std::fmt;
use serde::{de::IgnoredAny, Deserialize, Serialize, Serializer}; use serde::{de::IgnoredAny, Deserialize, Serialize, Serializer};
use serde_json::value::RawValue as RawJsonValue; use serde_json::value::RawValue as RawJsonValue;
@ -201,7 +203,7 @@ pub use self::{
/// Use [`macros::EventContent`] to derive this traits. It is not meant to be implemented manually. /// Use [`macros::EventContent`] to derive this traits. It is not meant to be implemented manually.
pub trait EventContent: Sized + Serialize { pub trait EventContent: Sized + Serialize {
/// The Rust enum for the event kind's known types. /// The Rust enum for the event kind's known types.
type EventType: AsRef<str>; type EventType;
/// Get the event's type, like `m.room.message`. /// Get the event's type, like `m.room.message`.
fn event_type(&self) -> Self::EventType; fn event_type(&self) -> Self::EventType;
@ -237,10 +239,14 @@ pub trait RedactContent {
fn redact(self, version: &RoomVersionId) -> Self::Redacted; fn redact(self, version: &RoomVersionId) -> Self::Redacted;
} }
impl<T: EventContent> Raw<T> { impl<T> Raw<T>
where
T: EventContent,
T::EventType: fmt::Display,
{
/// Try to deserialize the JSON as an event's content. /// Try to deserialize the JSON as an event's content.
pub fn deserialize_content(&self, event_type: T::EventType) -> serde_json::Result<T> { pub fn deserialize_content(&self, event_type: T::EventType) -> serde_json::Result<T> {
T::from_parts(event_type.as_ref(), self.json()) T::from_parts(&event_type.to_string(), self.json())
} }
} }