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

events: Remove RedactedEventContent trait

Browse Source
This commit is contained in:
Jonas Platte 2023-01-03 15:08:53 +01:00
parent 1d8ea75f6f
commit 68a596dbc3
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
5 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ruma-common/src/events/_custom.rs
View File

@ -5,9 +5,9 @@ use super::{
EphemeralRoomEventContent, EphemeralRoomEventType, EventContent, EventContentFromType, EphemeralRoomEventContent, EphemeralRoomEventType, EventContent, EventContentFromType,
GlobalAccountDataEventContent, GlobalAccountDataEventType, MessageLikeEventContent, GlobalAccountDataEventContent, GlobalAccountDataEventType, MessageLikeEventContent,
MessageLikeEventType, MessageLikeUnsigned, OriginalStateEventContent, RedactContent, MessageLikeEventType, MessageLikeUnsigned, OriginalStateEventContent, RedactContent,
RedactedEventContent, RedactedMessageLikeEventContent, RedactedStateEventContent, RedactedMessageLikeEventContent, RedactedStateEventContent, RoomAccountDataEventContent,
RoomAccountDataEventContent, RoomAccountDataEventType, StateEventContent, StateEventType, RoomAccountDataEventType, StateEventContent, StateEventType, ToDeviceEventContent,
ToDeviceEventContent, ToDeviceEventType, ToDeviceEventType,
}; };
use crate::RoomVersionId; use crate::RoomVersionId;
@ -50,8 +50,6 @@ macro_rules! custom_room_event_content {
self self
} }
} }
impl RedactedEventContent for $i {}
}; };
} }

13
crates/ruma-common/src/events/content.rs
View File

@ -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. /// 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 /// … 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<EventType = EphemeralRoomEvent
pub trait MessageLikeEventContent: EventContent<EventType = MessageLikeEventType> {} pub trait MessageLikeEventContent: EventContent<EventType = MessageLikeEventType> {}
/// Content of a redacted message-like event. /// Content of a redacted message-like event.
pub trait RedactedMessageLikeEventContent: MessageLikeEventContent + RedactedEventContent {} pub trait RedactedMessageLikeEventContent: MessageLikeEventContent {}
/// Content of a state event. /// Content of a state event.
pub trait StateEventContent: EventContent<EventType = StateEventType> { pub trait StateEventContent: EventContent<EventType = StateEventType> {
@ -132,7 +123,7 @@ pub trait OriginalStateEventContent: StateEventContent + RedactContent {
} }
/// Content of a redacted state event. /// Content of a redacted state event.
pub trait RedactedStateEventContent: StateEventContent + RedactedEventContent {} pub trait RedactedStateEventContent: StateEventContent {}
/// Content of a to-device event. /// Content of a to-device event.
pub trait ToDeviceEventContent: EventContent<EventType = ToDeviceEventType> {} pub trait ToDeviceEventContent: EventContent<EventType = ToDeviceEventType> {}

7
crates/ruma-common/src/events/room/aliases.rs
View File

@ -5,8 +5,7 @@ use serde::{Deserialize, Serialize};
use crate::{ use crate::{
events::{ events::{
EventContent, RedactContent, RedactedEventContent, RedactedStateEventContent, EventContent, RedactContent, RedactedStateEventContent, StateEventContent, StateEventType,
StateEventContent, StateEventType,
}, },
OwnedRoomAliasId, OwnedServerName, RoomVersionId, OwnedRoomAliasId, OwnedServerName, RoomVersionId,
}; };
@ -89,7 +88,3 @@ impl StateEventContent for RedactedRoomAliasesEventContent {
} }
impl RedactedStateEventContent 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 {}

6
crates/ruma-common/src/events/room/member.rs
View File

@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
use crate::{ use crate::{
events::{ events::{
AnyStrippedStateEvent, BundledRelations, EventContent, RedactContent, RedactedEventContent, AnyStrippedStateEvent, BundledRelations, EventContent, RedactContent,
RedactedStateEventContent, StateEventContent, StateEventType, RedactedStateEventContent, StateEventContent, StateEventType,
}, },
serde::{CanBeEmpty, Raw, StringEnum}, serde::{CanBeEmpty, Raw, StringEnum},
@ -250,10 +250,6 @@ impl StateEventContent for RedactedRoomMemberEventContent {
impl RedactedStateEventContent 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 { impl RoomMemberEvent {
/// Obtain the membership state, regardless of whether this event is redacted. /// Obtain the membership state, regardless of whether this event is redacted.
pub fn membership(&self) -> &MembershipState { pub fn membership(&self) -> &MembershipState {

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

@ -479,9 +479,6 @@ fn generate_redacted_event_content<'a>(
#redacted_event_content #redacted_event_content
#[automatically_derived]
impl #ruma_common::events::RedactedEventContent for #redacted_ident {}
#[automatically_derived] #[automatically_derived]
impl #ruma_common::events::#sub_trait_name for #redacted_ident {} impl #ruma_common::events::#sub_trait_name for #redacted_ident {}