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

events: Improve variable names in macro code

Browse Source
This commit is contained in:
Jonas Platte 2021-05-10 11:21:41 +02:00
parent 8adc9a0eb6
commit c648f83cb6
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -450,7 +450,7 @@ fn expand_redact(
if let EventKindVariation::Full | EventKindVariation::Sync | EventKindVariation::Stripped = var if let EventKindVariation::Full | EventKindVariation::Sync | EventKindVariation::Stripped = var
{ {
let (param, redaction_type, redaction_enum) = match var { let (redaction_type, redacted_type, redacted_enum) = match var {
EventKindVariation::Full => { EventKindVariation::Full => {
let struct_id = kind.to_event_ident(&EventKindVariation::Redacted)?; let struct_id = kind.to_event_ident(&EventKindVariation::Redacted)?;
( (
@ -479,7 +479,7 @@ fn expand_redact(
}; };
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 redaction_variants = variants.iter().map(|v| v.ctor(&redaction_enum)); let redaction_variants = variants.iter().map(|v| v.ctor(&redacted_enum));
let fields = EVENT_FIELDS.iter().map(|(name, has_field)| { let fields = EVENT_FIELDS.iter().map(|(name, has_field)| {
generate_redacted_fields(name, kind, var, *has_field, ruma_events) generate_redacted_fields(name, kind, var, *has_field, ruma_events)
@ -493,14 +493,14 @@ fn expand_redact(
/// Redacts `Self` given a valid `Redaction[Sync]Event`. /// Redacts `Self` given a valid `Redaction[Sync]Event`.
pub fn redact( pub fn redact(
self, self,
redaction: #param, redaction: #redaction_type,
version: #ruma_identifiers::RoomVersionId, version: #ruma_identifiers::RoomVersionId,
) -> #redaction_enum { ) -> #redacted_enum {
match self { match self {
#( #(
#self_variants(event) => { #self_variants(event) => {
let content = event.content.redact(version); let content = event.content.redact(version);
#redaction_variants(#redaction_type { #redaction_variants(#redacted_type {
content, content,
#fields #fields
}) })
@ -508,7 +508,7 @@ fn expand_redact(
)* )*
Self::Custom(event) => { Self::Custom(event) => {
let content = event.content.redact(version); let content = event.content.redact(version);
#redaction_enum::Custom(#redaction_type { #redacted_enum::Custom(#redacted_type {
content, content,
#fields #fields
}) })
@ -591,14 +591,14 @@ fn generate_redacted_fields(
let name = Ident::new(name, Span::call_site()); let name = Ident::new(name, Span::call_site());
if name == "unsigned" { if name == "unsigned" {
let redaction_type = if let EventKindVariation::Sync = var { let redacted_type = if let EventKindVariation::Sync = var {
quote! { RedactedSyncUnsigned } quote! { RedactedSyncUnsigned }
} else { } else {
quote! { RedactedUnsigned } quote! { RedactedUnsigned }
}; };
quote! { quote! {
unsigned: #ruma_events::#redaction_type { unsigned: #ruma_events::#redacted_type {
redacted_because: Some(::std::boxed::Box::new(redaction)), redacted_because: Some(::std::boxed::Box::new(redaction)),
}, },
} }