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

events-macros: Rename name => kind for clarity

Browse Source
This commit is contained in:
Jonas Platte 2021-10-06 21:11:17 +02:00
parent 653f03325b
commit be549e4000
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,22 +48,22 @@ pub fn expand_event_enums(input: &EventEnumDecl) -> syn::Result<TokenStream> {
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::<syn::Result<_>>()?;
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

8
crates/ruma-events-macros/src/event_parse.rs
View File

@ -229,8 +229,8 @@ pub struct EventEnumDecl {
/// Outer attributes on the field, such as a docstring.
pub attrs: Vec<Attribute>,
/// 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 })
}

2
crates/ruma-events-macros/src/event_type.rs
View File

@ -18,7 +18,7 @@ pub fn expand_event_type_enum(
let mut global_account: Vec<&Vec<EventEnumEntry>> = vec![];
let mut to_device: Vec<&Vec<EventEnumEntry>> = 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),