Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
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
Prev Previous commit
Next Next commit
Remove no-op value_parsers
  • Loading branch information
skunert committed Oct 5, 2022
commit d21239171c04767f4bc9072d020f400b74b47fdf
2 changes: 1 addition & 1 deletion client/cli/src/commands/export_blocks_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use std::{fmt::Debug, fs, io, path::PathBuf, str::FromStr, sync::Arc};
#[derive(Debug, Clone, Parser)]
pub struct ExportBlocksCmd {
/// Output file name or stdout if unspecified.
#[arg(value_parser)]
#[arg()]
pub output: Option<PathBuf>,

/// Specify starting block number.
Expand Down
2 changes: 1 addition & 1 deletion client/cli/src/commands/import_blocks_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ use std::{
#[derive(Debug, Parser)]
pub struct ImportBlocksCmd {
/// Input file or stdin if unspecified.
#[arg(value_parser)]
#[arg()]
pub input: Option<PathBuf>,

/// The default number of 64KB pages to ever allocate for Wasm execution.
Expand Down
2 changes: 1 addition & 1 deletion client/cli/src/params/import_params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pub struct ImportParams {
/// Specify the path where local WASM runtimes are stored.
///
/// These runtimes will override on-chain runtimes when the version matches.
#[arg(long, value_name = "PATH", value_parser)]
#[arg(long, value_name = "PATH")]
pub wasm_runtime_overrides: Option<PathBuf>,

#[allow(missing_docs)]
Expand Down
3 changes: 1 addition & 2 deletions client/cli/src/params/keystore_params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub struct KeystoreParams {
pub keystore_uri: Option<String>,

/// Specify custom keystore path.
#[arg(long, value_name = "PATH", value_parser)]
#[arg(long, value_name = "PATH")]
pub keystore_path: Option<PathBuf>,

/// Use interactive shell for entering the password used by the keystore.
Expand All @@ -56,7 +56,6 @@ pub struct KeystoreParams {
#[arg(
long,
value_name = "PATH",
value_parser,
conflicts_with_all = &["password_interactive", "password"]
)]
pub password_filename: Option<PathBuf>,
Expand Down
2 changes: 1 addition & 1 deletion client/cli/src/params/shared_params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub struct SharedParams {
pub dev: bool,

/// Specify custom base path.
#[arg(long, short = 'd', value_name = "PATH", value_parser)]
#[arg(long, short = 'd', value_name = "PATH")]
pub base_path: Option<PathBuf>,

/// Sets a custom logging filter. Syntax is <target>=<level>, e.g. -lsync=debug.
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/node-template-release/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ homepage = "https://substrate.io"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
clap = { version = "3.0", features = ["derive"] }
clap = { version = "4.0.9", features = ["derive", "deprecated"] }
flate2 = "1.0"
fs_extra = "1"
git2 = "0.8"
Expand Down
4 changes: 2 additions & 2 deletions scripts/ci/node-template-release/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ type CargoToml = HashMap<String, toml::Value>;
#[derive(Parser)]
struct Options {
/// The path to the `node-template` source.
#[arg(value_parser)]
#[arg()]
node_template: PathBuf,
/// The path where to output the generated `tar.gz` file.
#[arg(value_parser)]
#[arg()]
output: PathBuf,
}

Expand Down