Merge clap-rs#2888

2888: refactor(derive): Simplify 'error' handling r=pksunkara a=epage Co-authored-by: Ed Page <[email protected]>
epage · Oct 15, 2021 · 2795ccd · 2795ccd
2 parents bfd6f8d + 7b56184
commit 2795ccd
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/clap_derive/src/derives/subcommand.rs b/clap_derive/src/derives/subcommand.rs
@@ -451,7 +451,8 @@ fn gen_from_arg_matches(
             Unnamed(ref fields) if fields.unnamed.len() == 1 => {
                 let ty = &fields.unnamed[0];
                 quote! {
-                    if let Some(res) = <#ty as clap::FromArgMatches>::from_arg_matches(arg_matches) {
+                    if <#ty as clap::Subcommand>::has_subcommand(name) {
+                        let res = <#ty as clap::FromArgMatches>::from_arg_matches(arg_matches).unwrap();
                         return Some(#name :: #variant_name (res));
                     }
                 }
@@ -600,9 +601,7 @@ fn gen_update_from_arg_matches(
                     #( #subcommands ),*
                     s => {
                         #( #child_subcommands )*
-                        if let Some(sub) = <Self as clap::FromArgMatches>::from_arg_matches(arg_matches) {
-                            *s = sub;
-                        }
+                        *s = <Self as clap::FromArgMatches>::from_arg_matches(arg_matches).unwrap();
                     }
                 }
             }