diff --git a/crates/ruma-common/src/events/_custom.rs b/crates/ruma-common/src/events/_custom.rs index 4023e48f..29aea840 100644 --- a/crates/ruma-common/src/events/_custom.rs +++ b/crates/ruma-common/src/events/_custom.rs @@ -5,9 +5,9 @@ use super::{ EphemeralRoomEventContent, EphemeralRoomEventType, EventContent, EventContentFromType, GlobalAccountDataEventContent, GlobalAccountDataEventType, MessageLikeEventContent, MessageLikeEventType, MessageLikeUnsigned, OriginalStateEventContent, RedactContent, - RedactedEventContent, RedactedMessageLikeEventContent, RedactedStateEventContent, - RoomAccountDataEventContent, RoomAccountDataEventType, StateEventContent, StateEventType, - ToDeviceEventContent, ToDeviceEventType, + RedactedMessageLikeEventContent, RedactedStateEventContent, RoomAccountDataEventContent, + RoomAccountDataEventType, StateEventContent, StateEventType, ToDeviceEventContent, + ToDeviceEventType, }; use crate::RoomVersionId; @@ -50,8 +50,6 @@ macro_rules! custom_room_event_content { self } } - - impl RedactedEventContent for $i {} }; } diff --git a/crates/ruma-common/src/events/content.rs b/crates/ruma-common/src/events/content.rs index 18e19e11..e210272c 100644 --- a/crates/ruma-common/src/events/content.rs +++ b/crates/ruma-common/src/events/content.rs @@ -34,15 +34,6 @@ where } } -/// The base trait that all redacted event content types implement. -/// -/// This trait's associated functions and methods should not be used to build -/// redacted events, prefer the `redact` method on `AnyStateEvent` and -/// `AnyMessageLikeEvent` and their "sync" and "stripped" counterparts. -/// The `RedactedEventContent` trait is an implementation detail, ruma makes no -/// API guarantees. -pub trait RedactedEventContent: EventContent {} - /// Trait for abstracting over event content structs. /// /// … but *not* enums which don't always have an event type and kind (e.g. message vs state) that's @@ -114,7 +105,7 @@ pub trait EphemeralRoomEventContent: EventContent {} /// Content of a redacted message-like event. -pub trait RedactedMessageLikeEventContent: MessageLikeEventContent + RedactedEventContent {} +pub trait RedactedMessageLikeEventContent: MessageLikeEventContent {} /// Content of a state event. pub trait StateEventContent: EventContent { @@ -132,7 +123,7 @@ pub trait OriginalStateEventContent: StateEventContent + RedactContent { } /// Content of a redacted state event. -pub trait RedactedStateEventContent: StateEventContent + RedactedEventContent {} +pub trait RedactedStateEventContent: StateEventContent {} /// Content of a to-device event. pub trait ToDeviceEventContent: EventContent {} diff --git a/crates/ruma-common/src/events/room/aliases.rs b/crates/ruma-common/src/events/room/aliases.rs index d31c9539..9176af88 100644 --- a/crates/ruma-common/src/events/room/aliases.rs +++ b/crates/ruma-common/src/events/room/aliases.rs @@ -5,8 +5,7 @@ use serde::{Deserialize, Serialize}; use crate::{ events::{ - EventContent, RedactContent, RedactedEventContent, RedactedStateEventContent, - StateEventContent, StateEventType, + EventContent, RedactContent, RedactedStateEventContent, StateEventContent, StateEventType, }, OwnedRoomAliasId, OwnedServerName, RoomVersionId, }; @@ -89,7 +88,3 @@ impl StateEventContent for RedactedRoomAliasesEventContent { } impl RedactedStateEventContent for RedactedRoomAliasesEventContent {} - -// Since this redacted event has fields we leave the default `empty` method -// that will error if called. -impl RedactedEventContent for RedactedRoomAliasesEventContent {} diff --git a/crates/ruma-common/src/events/room/member.rs b/crates/ruma-common/src/events/room/member.rs index 33569452..0f9c170f 100644 --- a/crates/ruma-common/src/events/room/member.rs +++ b/crates/ruma-common/src/events/room/member.rs @@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize}; use crate::{ events::{ - AnyStrippedStateEvent, BundledRelations, EventContent, RedactContent, RedactedEventContent, + AnyStrippedStateEvent, BundledRelations, EventContent, RedactContent, RedactedStateEventContent, StateEventContent, StateEventType, }, serde::{CanBeEmpty, Raw, StringEnum}, @@ -250,10 +250,6 @@ impl StateEventContent for RedactedRoomMemberEventContent { impl RedactedStateEventContent for RedactedRoomMemberEventContent {} -// Since this redacted event has fields we leave the default `empty` method -// that will error if called. -impl RedactedEventContent for RedactedRoomMemberEventContent {} - impl RoomMemberEvent { /// Obtain the membership state, regardless of whether this event is redacted. pub fn membership(&self) -> &MembershipState { diff --git a/crates/ruma-macros/src/events/event_content.rs b/crates/ruma-macros/src/events/event_content.rs index 583c05d3..09cfb8b8 100644 --- a/crates/ruma-macros/src/events/event_content.rs +++ b/crates/ruma-macros/src/events/event_content.rs @@ -479,9 +479,6 @@ fn generate_redacted_event_content<'a>( #redacted_event_content - #[automatically_derived] - impl #ruma_common::events::RedactedEventContent for #redacted_ident {} - #[automatically_derived] impl #ruma_common::events::#sub_trait_name for #redacted_ident {}