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

refactor(derive): Clarify functions role

Browse source
This commit is contained in:
Ed Page 2022-06-02 14:58:38 -05:00
parent cccc88bcc2
commit ebf9c16a23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clap_derive/src/attrs.rs
View file

@ -721,7 +721,7 @@ impl Attrs {
.unwrap_or_else(|| self.parser(field_type).value_parser()) .unwrap_or_else(|| self.parser(field_type).value_parser())
} }
pub fn custom_value_parser(&self) -> bool { pub fn ignore_parser(&self) -> bool {
self.value_parser.is_some() self.value_parser.is_some()
} }

8
clap_derive/src/derives/args.rs
View file

@ -251,7 +251,7 @@ pub fn gen_augment(
let func = &parser.func; let func = &parser.func;
let validator = match *parser.kind { let validator = match *parser.kind {
_ if attrs.custom_value_parser() || attrs.is_enum() => quote!(), _ if attrs.ignore_parser() || attrs.is_enum() => quote!(),
ParserKind::TryFromStr => quote_spanned! { func.span()=> ParserKind::TryFromStr => quote_spanned! { func.span()=>
.validator(|s| { .validator(|s| {
#func(s) #func(s)
@ -268,7 +268,7 @@ pub fn gen_augment(
}; };
let value_name = attrs.value_name(); let value_name = attrs.value_name();
let possible_values = if attrs.is_enum() && !attrs.custom_value_parser() { let possible_values = if attrs.is_enum() && !attrs.ignore_parser() {
gen_arg_enum_possible_values(convert_type) gen_arg_enum_possible_values(convert_type)
} else { } else {
quote!() quote!()
@ -537,7 +537,7 @@ fn gen_parsers(
quote!(|s| ::std::ops::Deref::deref(s)), quote!(|s| ::std::ops::Deref::deref(s)),
func.clone(), func.clone(),
), ),
_ if attrs.custom_value_parser() => ( _ if attrs.ignore_parser() => (
quote_spanned!(span=> remove_one::<#convert_type>), quote_spanned!(span=> remove_one::<#convert_type>),
quote_spanned!(span=> remove_many::<#convert_type>), quote_spanned!(span=> remove_many::<#convert_type>),
quote!(|s| s), quote!(|s| s),
@ -568,7 +568,7 @@ fn gen_parsers(
quote_spanned!(func.span()=> |s| #func(s).map_err(|err| clap::Error::raw(clap::ErrorKind::ValueValidation, format!("Invalid value for {}: {}", #id, err)))), quote_spanned!(func.span()=> |s| #func(s).map_err(|err| clap::Error::raw(clap::ErrorKind::ValueValidation, format!("Invalid value for {}: {}", #id, err)))),
), ),
}; };
if attrs.is_enum() && !attrs.custom_value_parser() { if attrs.is_enum() && !attrs.ignore_parser() {
let ci = attrs.ignore_case(); let ci = attrs.ignore_case();
parse = quote_spanned! { convert_type.span()=> parse = quote_spanned! { convert_type.span()=>