diff --git a/crates/ruma-events-macros/src/event_enum.rs b/crates/ruma-events-macros/src/event_enum.rs index fa95114a..b1829a0e 100644 --- a/crates/ruma-events-macros/src/event_enum.rs +++ b/crates/ruma-events-macros/src/event_enum.rs @@ -44,6 +44,8 @@ const EVENT_FIELDS: &[(&str, EventKindFn)] = &[ /// Create a content enum from `EventEnumInput`. pub fn expand_event_enums(input: &EventEnumDecl) -> syn::Result { + use EventKindVariation as V; + let ruma_events = crate::import_ruma_events(); let name = &input.name; @@ -52,30 +54,13 @@ pub fn expand_event_enums(input: &EventEnumDecl) -> syn::Result { let variants: Vec<_> = input.events.iter().map(EventEnumEntry::to_variant).collect::>()?; - let event_enum = - expand_event_enum(name, &events, attrs, &variants, &EventKindVariation::Full, &ruma_events); - + let event_enum = expand_event_enum(name, &events, attrs, &variants, &V::Full, &ruma_events); let sync_event_enum = - expand_event_enum(name, &events, attrs, &variants, &EventKindVariation::Sync, &ruma_events); - - let stripped_event_enum = expand_event_enum( - name, - &events, - attrs, - &variants, - &EventKindVariation::Stripped, - &ruma_events, - ); - - let initial_event_enum = expand_event_enum( - name, - &events, - attrs, - &variants, - &EventKindVariation::Initial, - &ruma_events, - ); - + expand_event_enum(name, &events, attrs, &variants, &V::Sync, &ruma_events); + let stripped_event_enum = + expand_event_enum(name, &events, attrs, &variants, &V::Stripped, &ruma_events); + let initial_event_enum = + expand_event_enum(name, &events, attrs, &variants, &V::Initial, &ruma_events); let redacted_event_enums = expand_redacted_event_enum(name, &events, attrs, &variants, &ruma_events); let event_content_enum = expand_content_enum(name, &events, attrs, &variants, &ruma_events);