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

events: Remove marker trait

Browse Source 
It was not used anywhere.
This commit is contained in:
Jonas Platte 2021-05-15 15:06:31 +02:00
parent 37899db3c5
commit ab850d8237
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
4 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ruma-events-macros/src/event_content.rs
View File

@ -306,14 +306,10 @@ fn generate_event_content_derives(
impl #ruma_events::EphemeralRoomEventContent for #ident {} impl #ruma_events::EphemeralRoomEventContent for #ident {}
}, },
EventKind::Message => quote! { EventKind::Message => quote! {
#[automatically_derived]
impl #ruma_events::RoomEventContent for #ident {}
#[automatically_derived] #[automatically_derived]
impl #ruma_events::MessageEventContent for #ident {} impl #ruma_events::MessageEventContent for #ident {}
}, },
EventKind::State => quote! { EventKind::State => quote! {
#[automatically_derived]
impl #ruma_events::RoomEventContent for #ident {}
#[automatically_derived] #[automatically_derived]
impl #ruma_events::StateEventContent for #ident {} impl #ruma_events::StateEventContent for #ident {}
}, },

4
crates/ruma-events-macros/src/event_enum.rs
View File

@ -712,14 +712,10 @@ fn marker_traits(kind: &EventKind, ruma_events: &TokenStream) -> TokenStream {
let ident = kind.to_content_enum(); let ident = kind.to_content_enum();
match kind { match kind {
EventKind::State => quote! { EventKind::State => quote! {
#[automatically_derived]
impl #ruma_events::RoomEventContent for #ident {}
#[automatically_derived] #[automatically_derived]
impl #ruma_events::StateEventContent for #ident {} impl #ruma_events::StateEventContent for #ident {}
}, },
EventKind::Message => quote! { EventKind::Message => quote! {
#[automatically_derived]
impl #ruma_events::RoomEventContent for #ident {}
#[automatically_derived] #[automatically_derived]
impl #ruma_events::MessageEventContent for #ident {} impl #ruma_events::MessageEventContent for #ident {}
}, },

4
crates/ruma-events/src/custom.rs
View File

@ -9,7 +9,7 @@ use serde_json::{value::RawValue as RawJsonValue, Value as JsonValue};
use crate::{ use crate::{
EphemeralRoomEventContent, EventContent, GlobalAccountDataEventContent, HasDeserializeFields, EphemeralRoomEventContent, EventContent, GlobalAccountDataEventContent, HasDeserializeFields,
MessageEventContent, RedactContent, RedactedEventContent, RedactedMessageEventContent, MessageEventContent, RedactContent, RedactedEventContent, RedactedMessageEventContent,
RedactedStateEventContent, RoomAccountDataEventContent, RoomEventContent, StateEventContent, RedactedStateEventContent, RoomAccountDataEventContent, StateEventContent,
ToDeviceEventContent, ToDeviceEventContent,
}; };
@ -46,8 +46,6 @@ impl EventContent for CustomEventContent {
// A custom event must satisfy all of the event content marker traits since // A custom event must satisfy all of the event content marker traits since
// they can be used for any event kind. // they can be used for any event kind.
impl RoomEventContent for CustomEventContent {}
impl GlobalAccountDataEventContent for CustomEventContent {} impl GlobalAccountDataEventContent for CustomEventContent {}
impl RoomAccountDataEventContent for CustomEventContent {} impl RoomAccountDataEventContent for CustomEventContent {}

7
crates/ruma-events/src/lib.rs
View File

@ -306,14 +306,11 @@ pub trait RoomAccountDataEventContent: EventContent {}
/// Marker trait for the content of a to device event. /// Marker trait for the content of a to device event.
pub trait ToDeviceEventContent: EventContent {} pub trait ToDeviceEventContent: EventContent {}
/// Marker trait for the content of a room event.
pub trait RoomEventContent: EventContent {}
/// Marker trait for the content of a message event. /// Marker trait for the content of a message event.
pub trait MessageEventContent: RoomEventContent {} pub trait MessageEventContent: EventContent {}
/// Marker trait for the content of a state event. /// Marker trait for the content of a state event.
pub trait StateEventContent: RoomEventContent {} pub trait StateEventContent: EventContent {}
/// The base trait that all redacted event content types implement. /// The base trait that all redacted event content types implement.
/// ///