mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-15 09:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

simplify and avoid duplication

Browse source
This commit is contained in:
Bernardo Uriarte 2022-09-04 19:08:10 +02:00
parent 3f74f36418
commit bed692e50e
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
components/salsa-2022-macros/src/salsa_struct.rs
View file

@ -319,8 +319,7 @@ impl<A: AllowedOptions> SalsaStruct<A> {
let field_getter = field.get_name();
let field_ty = field.ty();
if self.is_identity_field(field) {
parse_quote_spanned! {field.field.span() =>
let field_debug = quote_spanned! { field.field.span() =>
debug_struct = debug_struct.field(
#field_name_string,
&::salsa::debug::helper::SalsaDebug::<#field_ty, #db_type>::salsa_debug(
@ -330,23 +329,19 @@ impl<A: AllowedOptions> SalsaStruct<A> {
_include_all_fields
)
);
};
if self.is_identity_field(field) {
quote_spanned! { field.field.span() =>
#field_debug
}
} else {
parse_quote_spanned! {field.field.span() =>
quote_spanned! { field.field.span() =>
if _include_all_fields {
debug_struct = debug_struct.field(
#field_name_string,
&::salsa::debug::helper::SalsaDebug::<#field_ty, #db_type>::salsa_debug(
#[allow(clippy::needless_borrow)]
&self.#field_getter(_db),
_db,
true
)
);
#field_debug
}
}
}
})
.collect::<TokenStream>();