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

refactor(derive): Remove unused Type for values

Browse source 
They have no type
This commit is contained in:
Ed Page 2022-09-05 19:55:13 -05:00
parent f571821670
commit 6648cf6009
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -202,7 +202,7 @@ pub fn gen_augment(
let kind = item.kind();
match &*kind {
Kind::Command(_)
| Kind::Value(_)
| Kind::Value
| Kind::Subcommand(_)
| Kind::Skip(_, _)
| Kind::FromGlobal(_)
@ -346,7 +346,7 @@ pub fn gen_constructor(fields: &[(&Field, Item)]) -> TokenStream {
let arg_matches = format_ident!("__clap_arg_matches");
match &*kind {
Kind::Command(_)
| Kind::Value(_)
| Kind::Value
| Kind::ExternalSubcommand => {
abort! { kind.span(),
"`{}` cannot be used with `arg`",
@ -417,7 +417,7 @@ pub fn gen_updater(fields: &[(&Field, Item)], use_self: bool) -> TokenStream {
match &*kind {
Kind::Command(_)
| Kind::Value(_)
| Kind::Value
| Kind::ExternalSubcommand => {
abort! { kind.span(),
"`{}` cannot be used with `arg`",

2
clap_derive/src/derives/value_enum.rs
View file

@ -42,7 +42,7 @@ pub fn derive_value_enum(input: &DeriveInput) -> TokenStream {
}
pub fn gen_for_enum(item: &Item, item_name: &Ident, variants: &[(&Variant, Item)]) -> TokenStream {
if !matches!(&*item.kind(), Kind::Value(_)) {
if !matches!(&*item.kind(), Kind::Value) {
abort! { item.kind().span(),
"`{}` cannot be used with `value`",
item.kind().name(),

16
clap_derive/src/item.rs
View file

@ -76,7 +76,7 @@ impl Item {
let attrs = &input.attrs;
let argument_casing = Sp::call_site(DEFAULT_CASING);
let env_casing = Sp::call_site(DEFAULT_ENV_CASING);
let kind = Sp::new(Kind::Value(Sp::new(Ty::Other, span)), span);
let kind = Sp::new(Kind::Value, span);
Self::from_struct(attrs, name, argument_casing, env_casing, kind)
}
@ -165,7 +165,7 @@ impl Item {
| Kind::FromGlobal(_)
| Kind::Skip(_, _)
| Kind::Command(_)
| Kind::Value(_)
| Kind::Value
| Kind::Arg(_) => (),
}
@ -178,7 +178,7 @@ impl Item {
env_casing: Sp<CasingStyle>,
) -> Self {
let span = variant.span();
let kind = Sp::new(Kind::Value(Sp::new(Ty::Other, span)), span);
let kind = Sp::new(Kind::Value, span);
let mut res = Self::new(
Name::Derived(variant.ident.clone()),
None,
@ -304,7 +304,7 @@ impl Item {
);
}
Kind::Command(_) | Kind::Value(_) | Kind::ExternalSubcommand => {}
Kind::Command(_) | Kind::Value | Kind::ExternalSubcommand => {}
}
res
@ -888,7 +888,7 @@ impl Item {
| (Kind::Command(_), Kind::Flatten)
| (Kind::Command(_), Kind::Skip(_, _))
| (Kind::Command(_), Kind::ExternalSubcommand)
| (Kind::Value(_), Kind::Skip(_, _)) => {
| (Kind::Value, Kind::Skip(_, _)) => {
self.kind = kind;
}
@ -1128,7 +1128,7 @@ fn default_action(field_type: &Type, span: Span) -> Method {
pub enum Kind {
Arg(Sp<Ty>),
Command(Sp<Ty>),
Value(Sp<Ty>),
Value,
FromGlobal(Sp<Ty>),
Subcommand(Sp<Ty>),
Flatten,
@ -1141,7 +1141,7 @@ impl Kind {
match self {
Self::Arg(_) => "arg",
Self::Command(_) => "command",
Self::Value(_) => "value",
Self::Value => "value",
Self::FromGlobal(_) => "from_global",
Self::Subcommand(_) => "subcommand",
Self::Flatten => "flatten",
@ -1154,7 +1154,7 @@ impl Kind {
match self {
Self::Arg(_) => AttrKind::Arg,
Self::Command(_) => AttrKind::Command,
Self::Value(_) => AttrKind::Value,
Self::Value => AttrKind::Value,
Self::FromGlobal(_) => AttrKind::Arg,
Self::Subcommand(_) => AttrKind::Command,
Self::Flatten => AttrKind::Command,