Slightly simplify generated code

This commit is contained in:
Lukas Kalbertodt
2022-10-17 14:50:53 +02:00
parent 52cea84028
commit 075078ac89
2 changed files with 16 additions and 12 deletions

View File

@@ -30,9 +30,10 @@ fn gen_config_impl(input: &ir::Input) -> TokenStream {
match f.kind {
FieldKind::Nested { .. } => {
quote! {
confique::Config::from_partial(partial.#field_name).map_err(|e| {
confique::internal::prepend_missing_value_error(e, #path)
})?
confique::internal::map_err_prefix_path(
confique::Config::from_partial(partial.#field_name),
#path,
)?
}
}
FieldKind::Leaf { kind: LeafKind::Optional { .. }, .. } => {
@@ -40,8 +41,7 @@ fn gen_config_impl(input: &ir::Input) -> TokenStream {
}
FieldKind::Leaf { kind: LeafKind::Required { .. }, .. } => {
quote! {
partial.#field_name
.ok_or(confique::internal::missing_value_error(#path.into()))?
confique::internal::unwrap_or_missing_value_err(partial.#field_name, #path)?
}
}
}