Bump clap to 4.0.x and adjust to best practices (#12381)

* Bump clap to 3.2.22

* Replace `from_os_str` with `value_parser`

* Replace `from_str` and `try_from_str` with `value_parser`

* Move possible_values to the new format

* Remove unwanted print

* Add missing match branch

* Update clap to 4.0.9 and make it compile

* Replace deprecated `clap` macro with `command` and `value`

* Move remaining `clap` attributes to `arg`

* Remove no-op value_parsers

* Adjust value_parser for state_version

* Remove "deprecated" feature flag and bump to 4.0.11

* Improve range

Co-authored-by: Bastian Köcher <git@kchr.de>

* Apply suggestions

* Trigger CI

* Fix unused error warning

* Fix doc errors

* Fix ArgGroup naming conflict

* Change default_value to default_value_t

* Use 1.. instead of 0..

Co-authored-by: Bastian Köcher <git@kchr.de>
This commit is contained in:
Sebastian Kunert
2022-10-18 08:52:46 +02:00
committed by GitHub
parent ca15fe7e3d
commit f687db40f7
70 changed files with 434 additions and 443 deletions
+26 -34
View File
@@ -908,7 +908,7 @@ name = "chain-spec-builder"
version = "2.0.0"
dependencies = [
"ansi_term",
"clap 3.1.18",
"clap 4.0.11",
"node-cli",
"rand 0.8.5",
"sc-chain-spec",
@@ -979,41 +979,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
dependencies = [
"bitflags",
"textwrap 0.11.0",
"textwrap",
"unicode-width",
]
[[package]]
name = "clap"
version = "3.1.18"
version = "4.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b"
checksum = "4ed45cc2c62a3eff523e718d8576ba762c83a3146151093283ac62ae11933a73"
dependencies = [
"atty",
"bitflags",
"clap_derive",
"clap_lex",
"indexmap",
"lazy_static",
"once_cell",
"strsim",
"termcolor",
"textwrap 0.15.0",
]
[[package]]
name = "clap_complete"
version = "3.0.2"
version = "4.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a394f7ec0715b42a4e52b294984c27c9a61f77c8d82f7774c5198350be143f19"
checksum = "11cba7abac9b56dfe2f035098cdb3a43946f276e6db83b72c4e692343f9aab9a"
dependencies = [
"clap 3.1.18",
"clap 4.0.11",
]
[[package]]
name = "clap_derive"
version = "3.1.18"
version = "4.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c"
checksum = "db342ce9fda24fb191e2ed4e102055a4d381c1086a06630174cd8da8d5d917ce"
dependencies = [
"heck",
"proc-macro-error",
@@ -1024,9 +1022,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",
]
@@ -2127,7 +2125,7 @@ dependencies = [
"Inflector",
"array-bytes",
"chrono",
"clap 3.1.18",
"clap 4.0.11",
"comfy-table",
"frame-benchmarking",
"frame-support",
@@ -2208,7 +2206,7 @@ dependencies = [
name = "frame-election-solution-type-fuzzer"
version = "2.0.0-alpha.5"
dependencies = [
"clap 3.1.18",
"clap 4.0.11",
"frame-election-provider-solution-type",
"frame-election-provider-support",
"frame-support",
@@ -4441,7 +4439,7 @@ name = "node-bench"
version = "0.9.0-dev"
dependencies = [
"array-bytes",
"clap 3.1.18",
"clap 4.0.11",
"derive_more",
"fs_extra",
"futures",
@@ -4480,7 +4478,7 @@ dependencies = [
"array-bytes",
"assert_cmd",
"async-std",
"clap 3.1.18",
"clap 4.0.11",
"clap_complete",
"criterion",
"frame-benchmarking-cli",
@@ -4597,7 +4595,7 @@ dependencies = [
name = "node-inspect"
version = "0.9.0-dev"
dependencies = [
"clap 3.1.18",
"clap 4.0.11",
"parity-scale-codec",
"sc-cli",
"sc-client-api",
@@ -4656,7 +4654,7 @@ dependencies = [
name = "node-runtime-generate-bags"
version = "3.0.0"
dependencies = [
"clap 3.1.18",
"clap 4.0.11",
"generate-bags",
"kitchensink-runtime",
]
@@ -4665,7 +4663,7 @@ dependencies = [
name = "node-template"
version = "4.0.0-dev"
dependencies = [
"clap 3.1.18",
"clap 4.0.11",
"frame-benchmarking",
"frame-benchmarking-cli",
"frame-system",
@@ -6855,9 +6853,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
[[package]]
name = "proc-macro2"
version = "1.0.39"
version = "1.0.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
dependencies = [
"unicode-ident",
]
@@ -7653,7 +7651,7 @@ version = "0.10.0-dev"
dependencies = [
"array-bytes",
"chrono",
"clap 3.1.18",
"clap 4.0.11",
"fdlimit",
"futures",
"libp2p",
@@ -9762,7 +9760,7 @@ dependencies = [
name = "sp-npos-elections-fuzzer"
version = "2.0.0-alpha.5"
dependencies = [
"clap 3.1.18",
"clap 4.0.11",
"honggfuzz",
"parity-scale-codec",
"rand 0.8.5",
@@ -10259,7 +10257,7 @@ dependencies = [
name = "subkey"
version = "2.0.2"
dependencies = [
"clap 3.1.18",
"clap 4.0.11",
"sc-cli",
]
@@ -10287,7 +10285,7 @@ dependencies = [
name = "substrate-frame-cli"
version = "4.0.0-dev"
dependencies = [
"clap 3.1.18",
"clap 4.0.11",
"frame-support",
"frame-system",
"sc-cli",
@@ -10617,12 +10615,6 @@ dependencies = [
"unicode-width",
]
[[package]]
name = "textwrap"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
[[package]]
name = "thiserror"
version = "1.0.30"
@@ -11033,7 +11025,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
name = "try-runtime-cli"
version = "0.10.0-dev"
dependencies = [
"clap 3.1.18",
"clap 4.0.11",
"frame-try-runtime",
"jsonrpsee",
"log",