From ab850d8237693ca9903095e4e0adf538a772cad9 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 15 May 2021 15:06:31 +0200 Subject: [PATCH] events: Remove marker trait It was not used anywhere. --- crates/ruma-events-macros/src/event_content.rs | 4 ---- crates/ruma-events-macros/src/event_enum.rs | 4 ---- crates/ruma-events/src/custom.rs | 4 +--- crates/ruma-events/src/lib.rs | 7 ++----- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/crates/ruma-events-macros/src/event_content.rs b/crates/ruma-events-macros/src/event_content.rs index 8a1c4639..7275d2b9 100644 --- a/crates/ruma-events-macros/src/event_content.rs +++ b/crates/ruma-events-macros/src/event_content.rs @@ -306,14 +306,10 @@ fn generate_event_content_derives( impl #ruma_events::EphemeralRoomEventContent for #ident {} }, EventKind::Message => quote! { - #[automatically_derived] - impl #ruma_events::RoomEventContent for #ident {} #[automatically_derived] impl #ruma_events::MessageEventContent for #ident {} }, EventKind::State => quote! { - #[automatically_derived] - impl #ruma_events::RoomEventContent for #ident {} #[automatically_derived] impl #ruma_events::StateEventContent for #ident {} }, diff --git a/crates/ruma-events-macros/src/event_enum.rs b/crates/ruma-events-macros/src/event_enum.rs index a95dec1b..be4a2205 100644 --- a/crates/ruma-events-macros/src/event_enum.rs +++ b/crates/ruma-events-macros/src/event_enum.rs @@ -712,14 +712,10 @@ fn marker_traits(kind: &EventKind, ruma_events: &TokenStream) -> TokenStream { let ident = kind.to_content_enum(); match kind { EventKind::State => quote! { - #[automatically_derived] - impl #ruma_events::RoomEventContent for #ident {} #[automatically_derived] impl #ruma_events::StateEventContent for #ident {} }, EventKind::Message => quote! { - #[automatically_derived] - impl #ruma_events::RoomEventContent for #ident {} #[automatically_derived] impl #ruma_events::MessageEventContent for #ident {} }, diff --git a/crates/ruma-events/src/custom.rs b/crates/ruma-events/src/custom.rs index 98215a4e..307afbff 100644 --- a/crates/ruma-events/src/custom.rs +++ b/crates/ruma-events/src/custom.rs @@ -9,7 +9,7 @@ use serde_json::{value::RawValue as RawJsonValue, Value as JsonValue}; use crate::{ EphemeralRoomEventContent, EventContent, GlobalAccountDataEventContent, HasDeserializeFields, MessageEventContent, RedactContent, RedactedEventContent, RedactedMessageEventContent, - RedactedStateEventContent, RoomAccountDataEventContent, RoomEventContent, StateEventContent, + RedactedStateEventContent, RoomAccountDataEventContent, StateEventContent, ToDeviceEventContent, }; @@ -46,8 +46,6 @@ impl EventContent for CustomEventContent { // A custom event must satisfy all of the event content marker traits since // they can be used for any event kind. -impl RoomEventContent for CustomEventContent {} - impl GlobalAccountDataEventContent for CustomEventContent {} impl RoomAccountDataEventContent for CustomEventContent {} diff --git a/crates/ruma-events/src/lib.rs b/crates/ruma-events/src/lib.rs index 78855e8d..25d24b81 100644 --- a/crates/ruma-events/src/lib.rs +++ b/crates/ruma-events/src/lib.rs @@ -306,14 +306,11 @@ pub trait RoomAccountDataEventContent: EventContent {} /// Marker trait for the content of a to device event. 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. -pub trait MessageEventContent: RoomEventContent {} +pub trait MessageEventContent: EventContent {} /// 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. ///