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

Return owned value for origin_server_ts accessors

Browse Source
This commit is contained in:
Naman Sandilya 2022-04-27 16:00:24 +05:30 committed by GitHub
parent cc72ddb689
commit 0cdd6a7b0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ruma-common/src/events/enums.rs
View File

@ -152,7 +152,7 @@ pub enum AnyRoomEvent {
} }
impl AnyRoomEvent { impl AnyRoomEvent {
room_ev_accessor!(origin_server_ts: &MilliSecondsSinceUnixEpoch); room_ev_accessor!(origin_server_ts: MilliSecondsSinceUnixEpoch);
room_ev_accessor!(room_id: &RoomId); room_ev_accessor!(room_id: &RoomId);
room_ev_accessor!(event_id: &EventId); room_ev_accessor!(event_id: &EventId);
room_ev_accessor!(sender: &UserId); room_ev_accessor!(sender: &UserId);
@ -180,7 +180,7 @@ pub enum AnySyncRoomEvent {
} }
impl AnySyncRoomEvent { impl AnySyncRoomEvent {
room_ev_accessor!(origin_server_ts: &MilliSecondsSinceUnixEpoch); room_ev_accessor!(origin_server_ts: MilliSecondsSinceUnixEpoch);
room_ev_accessor!(event_id: &EventId); room_ev_accessor!(event_id: &EventId);
room_ev_accessor!(sender: &UserId); room_ev_accessor!(sender: &UserId);

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

@ -446,10 +446,10 @@ macro_rules! impl_possibly_redacted_event {
} }
/// Returns this event's `origin_server_ts` field. /// Returns this event's `origin_server_ts` field.
pub fn origin_server_ts(&self) -> &MilliSecondsSinceUnixEpoch { pub fn origin_server_ts(&self) -> MilliSecondsSinceUnixEpoch {
match self { match self {
Self::Original(ev) => &ev.origin_server_ts, Self::Original(ev) => ev.origin_server_ts,
Self::Redacted(ev) => &ev.origin_server_ts, Self::Redacted(ev) => ev.origin_server_ts,
} }
} }

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

@ -216,10 +216,10 @@ impl RoomRedactionEvent {
} }
/// Returns this event's `origin_server_ts` field. /// Returns this event's `origin_server_ts` field.
pub fn origin_server_ts(&self) -> &MilliSecondsSinceUnixEpoch { pub fn origin_server_ts(&self) -> MilliSecondsSinceUnixEpoch {
match self { match self {
Self::Original(ev) => &ev.origin_server_ts, Self::Original(ev) => ev.origin_server_ts,
Self::Redacted(ev) => &ev.origin_server_ts, Self::Redacted(ev) => ev.origin_server_ts,
} }
} }
@ -293,10 +293,10 @@ impl SyncRoomRedactionEvent {
} }
/// Returns this event's `origin_server_ts` field. /// Returns this event's `origin_server_ts` field.
pub fn origin_server_ts(&self) -> &MilliSecondsSinceUnixEpoch { pub fn origin_server_ts(&self) -> MilliSecondsSinceUnixEpoch {
match self { match self {
Self::Original(ev) => &ev.origin_server_ts, Self::Original(ev) => ev.origin_server_ts,
Self::Redacted(ev) => &ev.origin_server_ts, Self::Redacted(ev) => ev.origin_server_ts,
} }
} }

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

@ -470,13 +470,14 @@ fn expand_accessor_methods(
let field_type = field_return_type(name, ruma_common); let field_type = field_return_type(name, ruma_common);
let variants = variants.iter().map(|v| v.match_arm(quote! { Self })); let variants = variants.iter().map(|v| v.match_arm(quote! { Self }));
let call_parens = maybe_redacted.then(|| quote! { () }); let call_parens = maybe_redacted.then(|| quote! { () });
let ampersand = (*name != "origin_server_ts").then(|| quote! { & });
quote! { quote! {
#[doc = #docs] #[doc = #docs]
pub fn #ident(&self) -> &#field_type { pub fn #ident(&self) -> #field_type {
match self { match self {
#( #variants(event) => &event.#ident #call_parens, )* #( #variants(event) => #ampersand event.#ident #call_parens, )*
Self::_Custom(event) => &event.#ident #call_parens, Self::_Custom(event) => #ampersand event.#ident #call_parens,
} }
} }
} }
@ -584,9 +585,9 @@ fn event_module_path(name: &LitStr) -> Vec<Ident> {
fn field_return_type(name: &str, ruma_common: &TokenStream) -> TokenStream { fn field_return_type(name: &str, ruma_common: &TokenStream) -> TokenStream {
match name { match name {
"origin_server_ts" => quote! { #ruma_common::MilliSecondsSinceUnixEpoch }, "origin_server_ts" => quote! { #ruma_common::MilliSecondsSinceUnixEpoch },
"room_id" => quote! { #ruma_common::RoomId }, "room_id" => quote! { &#ruma_common::RoomId },
"event_id" => quote! { #ruma_common::EventId }, "event_id" => quote! { &#ruma_common::EventId },
"sender" => quote! { #ruma_common::UserId }, "sender" => quote! { &#ruma_common::UserId },
_ => panic!("the `ruma_macros::event_enum::EVENT_FIELD` const was changed"), _ => panic!("the `ruma_macros::event_enum::EVENT_FIELD` const was changed"),
} }
} }