diff --git a/Cargo.lock b/Cargo.lock index 4b984cc..c957c0f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -69,26 +69,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.1.18" +version = "4.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b" dependencies = [ "atty", "bitflags", "clap_derive", "clap_lex", - "indexmap", - "lazy_static", + "once_cell", "strsim", "termcolor", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.1.18" +version = "4.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" +checksum = "16a1b0f6422af32d5da0c58e2703320f379216ee70198241c84173a8c5ac28f3" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -99,9 +97,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" dependencies = [ "os_str_bytes", ] @@ -191,12 +189,6 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - [[package]] name = "heck" version = "0.3.3" @@ -227,16 +219,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" -[[package]] -name = "indexmap" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" -dependencies = [ - "autocfg", - "hashbrown", -] - [[package]] name = "instant" version = "0.1.12" @@ -308,9 +290,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.9.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "os_str_bytes" @@ -356,11 +338,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -507,12 +489,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" - [[package]] name = "thread_local" version = "1.1.4" @@ -576,6 +552,12 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "unicode-ident" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" + [[package]] name = "unicode-segmentation" version = "1.8.0" diff --git a/Cargo.toml b/Cargo.toml index 03a674b..206074d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ interactive_clap_derive = { path = "interactive_clap_derive" } [dev-dependencies] shell-words = "1.0.0" -clap = { version = "3.1.17", features = ["derive"] } +clap = { version = "4.0.18", features = ["derive"] } strum = { git = "https://github.com/frol/strum", branch = "feat/discriminants-pass-through-attributes", features = ["derive"] } strum_macros = "0.20" diff --git a/interactive_clap_derive/src/derives/interactive_clap/mod.rs b/interactive_clap_derive/src/derives/interactive_clap/mod.rs index 492b813..3769c94 100644 --- a/interactive_clap_derive/src/derives/interactive_clap/mod.rs +++ b/interactive_clap_derive/src/derives/interactive_clap/mod.rs @@ -39,7 +39,7 @@ pub fn impl_interactive_clap(ast: &syn::DeriveInput) -> TokenStream { match attr_token { proc_macro2::TokenTree::Group(group) => { if group.stream().to_string().contains("subcommand") - | group.stream().to_string().contains("arg_enum") + | group.stream().to_string().contains("value_enum") | group.stream().to_string().contains("long") | (group.stream().to_string() == "skip".to_string()) { diff --git a/interactive_clap_derive/src/derives/to_cli_args/methods/interactive_clap_attrs_cli_field.rs b/interactive_clap_derive/src/derives/to_cli_args/methods/interactive_clap_attrs_cli_field.rs index a3b7bc5..cf57c55 100644 --- a/interactive_clap_derive/src/derives/to_cli_args/methods/interactive_clap_attrs_cli_field.rs +++ b/interactive_clap_derive/src/derives/to_cli_args/methods/interactive_clap_attrs_cli_field.rs @@ -47,7 +47,7 @@ impl InteractiveClapAttrsCliField { .map(|subcommand| subcommand.to_cli_args()) .unwrap_or_default(); }; - } else if "arg_enum".to_string() == ident.to_string() { + } else if "value_enum".to_string() == ident.to_string() { args_without_attrs = quote! { if let Some(arg) = &self.#ident_field { args.push_front(arg.to_string())