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

events-macros: Further re-organize enum codegen

Browse Source
This commit is contained in:
Jonas Platte 2021-10-06 22:54:29 +02:00
parent f699a52983
commit 4229adfc05
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,8 @@ pub fn expand_event_enums(input: &EventEnumDecl) -> syn::Result<TokenStream> {
if matches!(kind, EventKind::Ephemeral | EventKind::Message | EventKind::State) { if matches!(kind, EventKind::Ephemeral | EventKind::Message | EventKind::State) {
res.extend(expand_event_enum(kind, &events, attrs, &variants, V::Sync, &ruma_events)); res.extend(expand_event_enum(kind, &events, attrs, &variants, V::Sync, &ruma_events));
res.extend(expand_from_full_event(kind, V::Full, &variants));
res.extend(expand_into_full_event(kind, V::Sync, &variants, &ruma_events));
} }
if matches!(kind, EventKind::State) { if matches!(kind, EventKind::State) {
@ -70,6 +72,8 @@ pub fn expand_event_enums(input: &EventEnumDecl) -> syn::Result<TokenStream> {
if matches!(kind, EventKind::Message | EventKind::State) { if matches!(kind, EventKind::Message | EventKind::State) {
res.extend(expand_redacted_event_enum(kind, &events, attrs, &variants, &ruma_events)); res.extend(expand_redacted_event_enum(kind, &events, attrs, &variants, &ruma_events));
res.extend(expand_from_full_event(kind, V::Redacted, &variants));
res.extend(expand_into_full_event(kind, V::RedactedSync, &variants, &ruma_events));
} }
Ok(res) Ok(res)
@ -144,7 +148,6 @@ fn expand_event_enum(
} }
}; };
let event_enum_to_from_sync = expand_conversion_impl(kind, var, variants, ruma_events);
let redacted_enum = expand_redacted_enum(kind, var, ruma_events); let redacted_enum = expand_redacted_enum(kind, var, ruma_events);
let field_accessor_impl = accessor_methods(kind, var, variants, ruma_events); let field_accessor_impl = accessor_methods(kind, var, variants, ruma_events);
let redact_impl = expand_redact(&ident, kind, var, variants, ruma_events); let redact_impl = expand_redact(&ident, kind, var, variants, ruma_events);
@ -152,7 +155,6 @@ fn expand_event_enum(
quote! { quote! {
#event_enum #event_enum
#event_enum_to_from_sync
#field_accessor_impl #field_accessor_impl
#redact_impl #redact_impl
#event_deserialize_impl #event_deserialize_impl
@ -184,22 +186,18 @@ fn expand_from_impl(
quote! { #( #from_impls )* } quote! { #( #from_impls )* }
} }
fn expand_conversion_impl( fn expand_from_full_event(
kind: EventKind, kind: EventKind,
var: EventKindVariation, var: EventKindVariation,
variants: &[EventEnumVariant], variants: &[EventEnumVariant],
ruma_events: &TokenStream, ) -> TokenStream {
) -> Option<TokenStream> { let ident = kind.to_event_enum_ident(var).unwrap();
let ruma_identifiers = quote! { #ruma_events::exports::ruma_identifiers }; let sync = kind.to_event_enum_ident(var.to_sync().unwrap()).unwrap();
let ident = kind.to_event_enum_ident(var)?;
match var {
EventKindVariation::Full | EventKindVariation::Redacted => {
let sync = kind.to_event_enum_ident(var.to_sync().unwrap())?;
let ident_variants = variants.iter().map(|v| v.match_arm(&ident)); let ident_variants = variants.iter().map(|v| v.match_arm(&ident));
let self_variants = variants.iter().map(|v| v.ctor(quote! { Self })); let self_variants = variants.iter().map(|v| v.ctor(quote! { Self }));
Some(quote! { quote! {
#[automatically_derived] #[automatically_derived]
impl ::std::convert::From<#ident> for #sync { impl ::std::convert::From<#ident> for #sync {
fn from(event: #ident) -> Self { fn from(event: #ident) -> Self {
@ -215,14 +213,24 @@ fn expand_conversion_impl(
} }
} }
} }
})
} }
EventKindVariation::Sync | EventKindVariation::RedactedSync => { }
let full = kind.to_event_enum_ident(var.to_full().unwrap())?;
fn expand_into_full_event(
kind: EventKind,
var: EventKindVariation,
variants: &[EventEnumVariant],
ruma_events: &TokenStream,
) -> TokenStream {
let ruma_identifiers = quote! { #ruma_events::exports::ruma_identifiers };
let ident = kind.to_event_enum_ident(var).unwrap();
let full = kind.to_event_enum_ident(var.to_full().unwrap()).unwrap();
let self_variants = variants.iter().map(|v| v.match_arm(quote! { Self })); let self_variants = variants.iter().map(|v| v.match_arm(quote! { Self }));
let full_variants = variants.iter().map(|v| v.ctor(&full)); let full_variants = variants.iter().map(|v| v.ctor(&full));
Some(quote! { quote! {
#[automatically_derived] #[automatically_derived]
impl #ident { impl #ident {
/// Convert this sync event into a full event (one with a `room_id` field). /// Convert this sync event into a full event (one with a `room_id` field).
@ -242,9 +250,6 @@ fn expand_conversion_impl(
} }
} }
} }
})
}
_ => None,
} }
} }