Skip to content

refactor: use for loop instead of map/collect/fold #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaniPopes merged 1 commit into from
Feb 1, 2026
Merged

refactor: use for loop instead of map/collect/fold #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 70 additions & 92 deletions src/expand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,54 +28,43 @@ pub(crate) fn derive(node: &DeriveInput) -> Result<proc_macro2::TokenStream> {

let register_and_describe = match &metrics_attr.scope {
MetricsScope::Static(scope) => {
let (field_inits, describes): (Vec<_>, Vec<_>) = metric_fields
.iter()
.map(|metric| {
let field_name = &metric.field().ident;
match metric {
MetricField::Included(metric) => {
let metric_name = format!(
"{}{}{}",
scope.value(),
metrics_attr.separator(),
metric.name()
let mut field_inits = Vec::with_capacity(metric_fields.len());
let mut describes = Vec::with_capacity(metric_fields.len());

for metric in &metric_fields {
let field_name = &metric.field().ident;
match metric {
MetricField::Included(metric) => {
let metric_name = format!(
"{}{}{}",
scope.value(),
metrics_attr.separator(),
metric.name()
);
let register_method = metric.register_method()?;
let describe_method = metric.describe_method()?;
let description = &metric.description;
field_inits.push(quote! {
#field_name: __recorder.#register_method(
&::metrics::Key::from_parts(#metric_name, __labels.clone()),
__metadata,
),
});
describes.push(quote! {
__recorder.#describe_method(
::core::convert::Into::into(#metric_name),
::core::option::Option::None,
::core::convert::Into::into(#description),
);
let register_method = metric.register_method()?;
let describe_method = metric.describe_method()?;
let description = &metric.description;
Ok((
quote! {
#field_name: __recorder.#register_method(
&::metrics::Key::from_parts(#metric_name, __labels.clone()),
__metadata,
),
},
Some(quote! {
__recorder.#describe_method(
::core::convert::Into::into(#metric_name),
::core::option::Option::None,
::core::convert::Into::into(#description),
);
}),
))
}
MetricField::Skipped(_) => Ok((
quote! {
#field_name: Default::default(),
},
None,
)),
});
}
})
.collect::<Result<Vec<_>>>()?
.into_iter()
.fold((vec![], vec![]), |mut acc, x| {
acc.0.push(x.0);
if let Some(describe) = x.1 {
acc.1.push(describe);
MetricField::Skipped(_) => {
field_inits.push(quote! {
#field_name: Default::default(),
});
}
acc
});
}
}

quote! {
impl Default for #ty {
Expand Down Expand Up @@ -140,55 +129,44 @@ pub(crate) fn derive(node: &DeriveInput) -> Result<proc_macro2::TokenStream> {
}
}
MetricsScope::Dynamic => {
let (field_inits, describes): (Vec<_>, Vec<_>) = metric_fields
.iter()
.map(|metric| {
let field_name = &metric.field().ident;
match metric {
MetricField::Included(metric) => {
let name = metric.name();
let separator = metrics_attr.separator();

let register_method = metric.register_method()?;
let describe_method = metric.describe_method()?;
let description = &metric.description;

Ok((
quote! {
#field_name: __recorder.#register_method(
&::metrics::Key::from_parts(
format!("{}{}{}", __scope, #separator, #name),
__labels.clone(),
),
__metadata,
),
},
Some(quote! {
__recorder.#describe_method(
::core::convert::Into::into(format!("{}{}{}", __scope, #separator, #name)),
::core::option::Option::None,
::core::convert::Into::into(#description),
);
}),
))
}
MetricField::Skipped(_) => Ok((
quote! {
#field_name: Default::default(),
},
None,
)),
let mut field_inits = Vec::with_capacity(metric_fields.len());
let mut describes = Vec::with_capacity(metric_fields.len());

for metric in &metric_fields {
let field_name = &metric.field().ident;
match metric {
MetricField::Included(metric) => {
let name = metric.name();
let separator = metrics_attr.separator();

let register_method = metric.register_method()?;
let describe_method = metric.describe_method()?;
let description = &metric.description;

field_inits.push(quote! {
#field_name: __recorder.#register_method(
&::metrics::Key::from_parts(
format!("{}{}{}", __scope, #separator, #name),
__labels.clone(),
),
__metadata,
),
});
describes.push(quote! {
__recorder.#describe_method(
::core::convert::Into::into(format!("{}{}{}", __scope, #separator, #name)),
::core::option::Option::None,
::core::convert::Into::into(#description),
);
});
}
})
.collect::<Result<Vec<_>>>()?
.into_iter()
.fold((vec![], vec![]), |mut acc, x| {
acc.0.push(x.0);
if let Some(describe) = x.1 {
acc.1.push(describe);
MetricField::Skipped(_) => {
field_inits.push(quote! {
#field_name: Default::default(),
});
}
acc
});
}
}

quote! {
impl #ty {
Expand Down