refactor(derive): Make flatten's update prepped for Option

epage · Oct 5, 2022 · 33db640 · 33db640
1 parent f121a8b
commit 33db640
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/clap_derive/src/derives/args.rs b/clap_derive/src/derives/args.rs
@@ -522,9 +522,18 @@ pub fn gen_updater(fields: &[(&Field, Item)], use_self: bool) -> TokenStream {
                 }
             }
 
-            Kind::Flatten(_) => quote_spanned! { kind.span()=> {
-                    #access
-                    clap::FromArgMatches::update_from_arg_matches_mut(#field_name, #arg_matches)?;
+            Kind::Flatten(_) => {
+                let updater = quote_spanned! { kind.span()=> {
+                        #access
+                        clap::FromArgMatches::update_from_arg_matches_mut(#field_name, #arg_matches)?;
+                    }
+                };
+
+                quote_spanned! { kind.span()=>
+                    {
+                        #access
+                        #updater
+                    }
                 }
             },