diff --git a/crates/ruma-events-macros/src/event_enum.rs b/crates/ruma-events-macros/src/event_enum.rs index b1829a0e..5a913d28 100644 --- a/crates/ruma-events-macros/src/event_enum.rs +++ b/crates/ruma-events-macros/src/event_enum.rs @@ -48,22 +48,22 @@ pub fn expand_event_enums(input: &EventEnumDecl) -> syn::Result { let ruma_events = crate::import_ruma_events(); - let name = &input.name; + let kind = &input.kind; let attrs = &input.attrs; let events: Vec<_> = input.events.iter().map(|entry| entry.ev_type.clone()).collect(); let variants: Vec<_> = input.events.iter().map(EventEnumEntry::to_variant).collect::>()?; - let event_enum = expand_event_enum(name, &events, attrs, &variants, &V::Full, &ruma_events); + let event_enum = expand_event_enum(kind, &events, attrs, &variants, &V::Full, &ruma_events); let sync_event_enum = - expand_event_enum(name, &events, attrs, &variants, &V::Sync, &ruma_events); + expand_event_enum(kind, &events, attrs, &variants, &V::Sync, &ruma_events); let stripped_event_enum = - expand_event_enum(name, &events, attrs, &variants, &V::Stripped, &ruma_events); + expand_event_enum(kind, &events, attrs, &variants, &V::Stripped, &ruma_events); let initial_event_enum = - expand_event_enum(name, &events, attrs, &variants, &V::Initial, &ruma_events); + expand_event_enum(kind, &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); + expand_redacted_event_enum(kind, &events, attrs, &variants, &ruma_events); + let event_content_enum = expand_content_enum(kind, &events, attrs, &variants, &ruma_events); Ok(quote! { #event_enum diff --git a/crates/ruma-events-macros/src/event_parse.rs b/crates/ruma-events-macros/src/event_parse.rs index b83cdc73..23aeab6d 100644 --- a/crates/ruma-events-macros/src/event_parse.rs +++ b/crates/ruma-events-macros/src/event_parse.rs @@ -229,8 +229,8 @@ pub struct EventEnumDecl { /// Outer attributes on the field, such as a docstring. pub attrs: Vec, - /// The name of the event. - pub name: EventKind, + /// The event kind. + pub kind: EventKind, /// An array of valid matrix event types. /// @@ -253,13 +253,13 @@ impl Parse for EventEnumInput { let attrs = input.call(Attribute::parse_outer)?; let _: Token![enum] = input.parse()?; - let name: EventKind = input.parse()?; + let kind: EventKind = input.parse()?; let content; braced!(content in input); let events = content.parse_terminated::<_, Token![,]>(EventEnumEntry::parse)?; let events = events.into_iter().collect(); - enums.push(EventEnumDecl { attrs, name, events }); + enums.push(EventEnumDecl { attrs, kind, events }); } Ok(EventEnumInput { enums }) } diff --git a/crates/ruma-events-macros/src/event_type.rs b/crates/ruma-events-macros/src/event_type.rs index b0d6ea83..cd062cc9 100644 --- a/crates/ruma-events-macros/src/event_type.rs +++ b/crates/ruma-events-macros/src/event_type.rs @@ -18,7 +18,7 @@ pub fn expand_event_type_enum( let mut global_account: Vec<&Vec> = vec![]; let mut to_device: Vec<&Vec> = vec![]; for event in &input.enums { - match event.name { + match event.kind { EventKind::GlobalAccountData => global_account.push(&event.events), EventKind::RoomAccountData => room_account.push(&event.events), EventKind::Ephemeral => ephemeral.push(&event.events),