Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-11-14 00:27:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor(derive): Give more control to the derive

Browse source
This commit is contained in:
Ed Page 2022-09-06 10:35:19 -05:00
parent 71b9209a34
commit eece51fe04
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
clap_derive/src/item.rs
View file

@ -59,7 +59,14 @@ impl Item {
let argument_casing = Sp::new(DEFAULT_CASING, span); let argument_casing = Sp::new(DEFAULT_CASING, span);
let env_casing = Sp::new(DEFAULT_ENV_CASING, span); let env_casing = Sp::new(DEFAULT_ENV_CASING, span);
let kind = Sp::new(Kind::Command(Sp::new(Ty::Other, span)), span); let kind = Sp::new(Kind::Command(Sp::new(Ty::Other, span)), span);
Self::from_struct(attrs, name, argument_casing, env_casing, kind)
let mut res = Self::new(name, None, argument_casing, env_casing, kind);
let parsed_attrs = ClapAttr::parse_all(attrs);
res.infer_kind(&parsed_attrs);
res.push_attrs(&parsed_attrs);
res.push_doc_comment(attrs, "about");
res
} }
pub fn from_subcommand_enum(input: &DeriveInput, name: Name) -> Self { pub fn from_subcommand_enum(input: &DeriveInput, name: Name) -> Self {
@ -68,7 +75,14 @@ impl Item {
let argument_casing = Sp::new(DEFAULT_CASING, span); let argument_casing = Sp::new(DEFAULT_CASING, span);
let env_casing = Sp::new(DEFAULT_ENV_CASING, span); let env_casing = Sp::new(DEFAULT_ENV_CASING, span);
let kind = Sp::new(Kind::Command(Sp::new(Ty::Other, span)), span); let kind = Sp::new(Kind::Command(Sp::new(Ty::Other, span)), span);
Self::from_struct(attrs, name, argument_casing, env_casing, kind)
let mut res = Self::new(name, None, argument_casing, env_casing, kind);
let parsed_attrs = ClapAttr::parse_all(attrs);
res.infer_kind(&parsed_attrs);
res.push_attrs(&parsed_attrs);
res.push_doc_comment(attrs, "about");
res
} }
pub fn from_value_enum(input: &DeriveInput, name: Name) -> Self { pub fn from_value_enum(input: &DeriveInput, name: Name) -> Self {
@ -77,16 +91,7 @@ impl Item {
let argument_casing = Sp::new(DEFAULT_CASING, span); let argument_casing = Sp::new(DEFAULT_CASING, span);
let env_casing = Sp::new(DEFAULT_ENV_CASING, span); let env_casing = Sp::new(DEFAULT_ENV_CASING, span);
let kind = Sp::new(Kind::Value, span); let kind = Sp::new(Kind::Value, span);
Self::from_struct(attrs, name, argument_casing, env_casing, kind)
}
fn from_struct(
attrs: &[Attribute],
name: Name,
argument_casing: Sp<CasingStyle>,
env_casing: Sp<CasingStyle>,
kind: Sp<Kind>,
) -> Self {
let mut res = Self::new(name, None, argument_casing, env_casing, kind); let mut res = Self::new(name, None, argument_casing, env_casing, kind);
let parsed_attrs = ClapAttr::parse_all(attrs); let parsed_attrs = ClapAttr::parse_all(attrs);
res.infer_kind(&parsed_attrs); res.infer_kind(&parsed_attrs);