Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2025-03-04 23:37:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(derive): Don't generate dead code

Browse source 
When debugging #2586, I noticed we were developing match cases for
variant names that were flattened.  At minimum, this is dead code and at
worst this could cause the wrong behavior if a user does an update with
one of those names.

Depends on #2587

Fixes #2588
This commit is contained in:
Ed Page 2021-07-14 13:05:28 -05:00
parent fbd8e6d742
commit a8ba4c3b73
1 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
clap_derive/src/derives/subcommand.rs
View file

@ -374,7 +374,7 @@ fn gen_update_from_arg_matches(
) -> TokenStream {
use syn::Fields::*;
let (flatten_variants, variants): (Vec<_>, Vec<_>) = variants
let variants: Vec<_> = variants
.iter()
.filter_map(|variant| {
let attrs = Attrs::from_variant(
@ -383,16 +383,13 @@ fn gen_update_from_arg_matches(
parent_attribute.env_casing(),
);
if let Kind::ExternalSubcommand = &*attrs.kind() {
None
} else {
Some((variant, attrs))
match &*attrs.kind() {
// Fallback to `from_arg_matches`
Kind::ExternalSubcommand | Kind::Flatten => None,
_ => Some((variant, attrs)),
}
})
.partition(|(_, attrs)| {
let kind = attrs.kind();
matches!(&*kind, Kind::Flatten)
});
.collect();
let subcommands = variants.iter().map(|(variant, attrs)| {
let sub_name = attrs.cased_name();
@ -441,29 +438,6 @@ fn gen_update_from_arg_matches(
}
});
let child_subcommands = flatten_variants.iter().map(|(variant, attrs)| {
let sub_name = attrs.cased_name();
let variant_name = &variant.ident;
let (pattern, updater) = match variant.fields {
Unnamed(ref fields) if fields.unnamed.len() == 1 => {
let ty = &fields.unnamed[0];
(
quote!((ref mut arg)),
quote! {
<#ty as clap::FromArgMatches>::update_from_arg_matches(arg, sub_arg_matches);
},
)
}
_ => abort!(
variant,
"`flatten` is usable only with single-typed tuple variants"
),
};
quote! {
(#sub_name, #name :: #variant_name #pattern) => { #updater }
}
});
quote! {
fn update_from_arg_matches<'b>(
&mut self,
@ -472,7 +446,6 @@ fn gen_update_from_arg_matches(
if let Some((name, sub_arg_matches)) = arg_matches.subcommand() {
match (name, self) {
#( #subcommands ),*
#( #child_subcommands ),*
(other_name, s) => {
if let Some(sub) = <Self as clap::FromArgMatches>::from_arg_matches(arg_matches) {
*s = sub;