Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-14 06:42:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

wip: Complete update_subcommand

Browse source 
external subcommand updating is equivalent to replace it
This commit is contained in:
Luca Barbato 2020-07-07 13:31:43 +02:00
parent 646b3fe811
commit 8b6255057d
2 changed files with 11 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -301,7 +301,6 @@ fn gen_update_from_subcommand(
) -> TokenStream {
use syn::Fields::*;
let mut ext_subcmd = None;
let (flatten_variants, variants): (Vec<_>, Vec<_>) = variants
.iter()
.filter_map(|variant| {
@ -314,56 +313,6 @@ fn gen_update_from_subcommand(
);
if let Kind::ExternalSubcommand = &*attrs.kind() {
if ext_subcmd.is_some() {
abort!(
attrs.kind().span(),
"Only one variant can be marked with `external_subcommand`, \
this is the second"
);
}
let ty = match variant.fields {
Unnamed(ref fields) if fields.unnamed.len() == 1 => &fields.unnamed[0].ty,
_ => abort!(
variant,
"The enum variant marked with `external_attribute` must be \
a single-typed tuple, and the type must be either `Vec<String>` \
or `Vec<OsString>`."
),
};
let (span, str_ty, values_of) = match subty_if_name(ty, "Vec") {
Some(subty) => {
if is_simple_ty(subty, "String") {
(
subty.span(),
quote!(::std::string::String),
quote!(values_of),
)
} else if is_simple_ty(subty, "OsString") {
(
subty.span(),
quote!(::std::ffi::OsString),
quote!(values_of_os),
)
} else {
abort!(
ty.span(),
"The type must be either `Vec<String>` or `Vec<OsString>` \
to be used with `external_subcommand`."
)
}
}
None => abort!(
ty.span(),
"The type must be either `Vec<String>` or `Vec<OsString>` \
to be used with `external_subcommand`."
),
};
ext_subcmd = Some((span, &variant.ident, str_ty, values_of));
None
} else {
Some((variant, attrs))
@ -424,12 +373,15 @@ fn gen_update_from_subcommand(
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 => (
quote!((ref mut arg)),
quote! {
println!("child");
},
),
Unnamed(ref fields) if fields.unnamed.len() == 1 => {
let ty = &fields.unnamed[0];
(
quote!((ref mut arg)),
quote! {
<#ty as ::clap::Subcommand>::update_from_subcommand(arg, name, sub);
},
)
}
_ => abort!(
variant,
"`flatten` is usable only with single-typed tuple variants"
@ -440,19 +392,6 @@ fn gen_update_from_subcommand(
}
});
let external = if let Some((span, variant_name, str_ty, values_of)) = ext_subcmd {
quote_spanned! { span=>
(external, #name :: #variant_name (ref mut ext)) => {
if ext.len() == 0 {
ext.push(#str_ty::from(external));
ext.extend(matches.#values_of("").into_iter().flatten().map(#str_ty::from));
}
}
}
} else {
quote!()
};
quote! {
fn update_from_subcommand<'b>(
&mut self,
@ -463,7 +402,6 @@ fn gen_update_from_subcommand(
match (name, self) {
#( #subcommands ),*
#( #child_subcommands ),*
#external
(_, s) => if let Some(sub) = <Self as ::clap::Subcommand>::from_subcommand(name, sub) {
*s = sub;
}

5
src/derive.rs
View file

@ -126,9 +126,8 @@ pub trait Clap: FromArgMatches + IntoApp + Sized {
{
// TODO find a way to get partial matches
let matches = <Self as IntoApp>::into_app().try_get_matches_from(itr)?;
Ok(<Self as FromArgMatches>::update_from_arg_matches(
self, &matches,
))
<Self as FromArgMatches>::update_from_arg_matches(self, &matches);
Ok(())
}
}