Emit unwrap_or_default when appropriate for default fields

novafacing · May 30, 2024 · 91bc421 · 91bc421
1 parent 05113d1
commit 91bc421
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/core/src/codegen/field.rs b/core/src/codegen/field.rs
@@ -224,11 +224,15 @@ impl<'a> ToTokens for Initializer<'a> {
                 quote!(#ident: #ident)
             }
         } else if let Some(ref expr) = field.default_expression {
-            quote_spanned!(expr.span()=> #ident: if let Some(__val) = #ident.1 {
-                __val
+            if matches!(expr, DefaultExpression::Trait { .. }) {
+                quote_spanned!(expr.span()=> #ident: #ident.1.unwrap_or_default())
             } else {
-                #expr
-            })
+                quote_spanned!(expr.span()=> #ident: if let Some(__val) = #ident.1 {
+                    __val
+                } else {
+                    #expr
+                })
+            }
         } else {
             quote!(#ident: #ident.1.expect("Uninitialized fields without defaults were already checked"))
         });