Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

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

Merged
paritytech-processbot merged 26 commits into from
Oct 18, 2022
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5c05eed
Bump clap to 3.2.22
skunert Sep 23, 2022
722c344
Replace `from_os_str` with `value_parser`
skunert Sep 23, 2022
4c9000a
Replace `from_str` and `try_from_str` with `value_parser`
skunert Sep 23, 2022
a2074da
Move possible_values to the new format
skunert Sep 27, 2022
00fd209
Merge branch 'master' into skunert/clap-3222
skunert Sep 28, 2022
e688996
Remove unwanted print
skunert Sep 28, 2022
f6fa5bc
Add missing match branch
skunert Sep 29, 2022
0cd4921
Update clap to 4.0.9 and make it compile
skunert Oct 5, 2022
ba302c4
Replace deprecated `clap` macro with `command` and `value`
skunert Oct 5, 2022
7342dfd
Move remaining `clap` attributes to `arg`
skunert Oct 5, 2022
d212391
Remove no-op value_parsers
skunert Oct 5, 2022
a1a27d1
Merge branch 'master' into skunert/clap-3222
skunert Oct 5, 2022
1627561
Merge branch 'master' into skunert/clap-3222
skunert Oct 6, 2022
a6181b6
Adjust value_parser for state_version
skunert Oct 7, 2022
5c929dd
Remove "deprecated" feature flag and bump to 4.0.11
skunert Oct 9, 2022
a91d5aa
Merge branch 'master' into skunert/clap-3222
skunert Oct 9, 2022
a84300b
Improve range
skunert Oct 10, 2022
cb3fe5d
Apply suggestions
skunert Oct 10, 2022
a6491a2
Trigger CI
skunert Oct 10, 2022
35ec929
Fix unused error warning
skunert Oct 11, 2022
aa1299f
Merge remote-tracking branch 'origin/master' into skunert/clap-3222
skunert Oct 11, 2022
9381446
Fix doc errors
skunert Oct 11, 2022
2b80749
Fix ArgGroup naming conflict
skunert Oct 11, 2022
6661fa8
Merge branch 'master' into skunert/clap-3222
skunert Oct 17, 2022
fed8da7
Change default_value to default_value_t
skunert Oct 17, 2022
4f614e7
Use 1.. instead of 0..
skunert Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Bump clap to 3.2.22
  • Loading branch information
@skunert
skunert committed Sep 23, 2022
commit 5c05eed5e38f0856e9cb75d76a0b51dbb2983302
50 changes: 25 additions & 25 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/node-template/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
name = "node-template"

[dependencies]
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }

sc-cli = { version = "0.10.0-dev", path = "../../../client/cli", features = ["wasmtime"] }
sp-core = { version = "6.0.0", path = "../../../primitives/core" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repository = "https://github.com/paritytech/substrate/"

[dependencies]
array-bytes = "4.1"
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }
log = "0.4.17"
node-primitives = { version = "2.0.0", path = "../primitives" }
node-testing = { version = "3.0.0-dev", path = "../testing" }
Expand Down
4 changes: 2 additions & 2 deletions bin/node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
# third-party dependencies
array-bytes = "4.1"
clap = { version = "3.1.18", features = ["derive"], optional = true }
clap = { version = "3.2.22", features = ["derive", "deprecated"], optional = true }
codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0.136", features = ["derive"] }
jsonrpsee = { version = "0.15.1", features = ["server"] }
Expand Down Expand Up @@ -136,7 +136,7 @@ remote-externalities = { path = "../../../utils/frame/remote-externalities" }
pallet-timestamp = { version = "4.0.0-dev", path = "../../../frame/timestamp" }

[build-dependencies]
clap = { version = "3.1.18", optional = true }
clap = { version = "3.2.22", optional = true }
clap_complete = { version = "3.0", optional = true }
node-inspect = { version = "0.9.0-dev", optional = true, path = "../inspect" }
frame-benchmarking-cli = { version = "4.0.0-dev", optional = true, path = "../../../utils/frame/benchmarking-cli" }
Expand Down
2 changes: 1 addition & 1 deletion bin/utils/chain-spec-builder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
ansi_term = "0.12.1"
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }
rand = "0.8"
node-cli = { version = "3.0.0-dev", path = "../../node/cli" }
sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" }
Expand Down
2 changes: 1 addition & 1 deletion bin/utils/subkey/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ path = "src/main.rs"
name = "subkey"

[dependencies]
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }
sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
2 changes: 1 addition & 1 deletion client/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
array-bytes = "4.1"
chrono = "0.4.10"
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }
fdlimit = "0.2.1"
futures = "0.3.21"
libp2p = "0.46.1"
Expand Down
2 changes: 1 addition & 1 deletion frame/election-provider-support/solution-type/fuzzer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }
honggfuzz = "0.5"
rand = { version = "0.8", features = ["std", "small_rng"] }

Expand Down
4 changes: 2 additions & 2 deletions primitives/npos-elections/fuzzer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
honggfuzz = "0.5"
rand = { version = "0.8", features = ["std", "small_rng"] }
Expand All @@ -36,4 +36,4 @@ path = "src/phragmms_balancing.rs"

[[bin]]
name = "phragmen_pjr"
path = "src/phragmen_pjr.rs"
path = "src/phragmen_pjr.rs"
2 changes: 1 addition & 1 deletion utils/frame/benchmarking-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
array-bytes = "4.1"
chrono = "0.4"
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }
codec = { package = "parity-scale-codec", version = "3.0.0" }
comfy-table = { version = "6.0.0", default-features = false }
handlebars = "4.2.2"
Expand Down
2 changes: 1 addition & 1 deletion utils/frame/frame-utilities-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ documentation = "https://docs.rs/substrate-frame-cli"
readme = "README.md"

[dependencies]
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }
frame-support = { version = "4.0.0-dev", path = "../../../frame/support" }
frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
Expand Down
2 changes: 1 addition & 1 deletion utils/frame/generate-bags/node-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ kitchensink-runtime = { version = "3.0.0-dev", path = "../../../../bin/node/runt
generate-bags = { version = "4.0.0-dev", path = "../" }

# third-party
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }
2 changes: 1 addition & 1 deletion utils/frame/try-runtime/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "3.2.22", features = ["derive", "deprecated"] }
log = "0.4.17"
parity-scale-codec = "3.0.0"
serde = "1.0.136"
Expand Down