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
@@ -14,7 +14,7 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
clap = { version = "3.1.18", features = ["derive"] }
clap = { version = "4.0.9", features = ["derive"] }
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"] }
@@ -36,4 +36,4 @@ path = "src/phragmms_balancing.rs"
[[bin]]
name = "phragmen_pjr"
path = "src/phragmen_pjr.rs"
path = "src/phragmen_pjr.rs"
@@ -68,18 +68,18 @@ fn main() {
#[cfg(not(fuzzing))]
#[derive(Debug, Parser)]
#[clap(author, version, about)]
#[command(author, version, about)]
struct Opt {
/// How many candidates participate in this election
#[clap(short, long)]
#[arg(short, long)]
candidates: Option<usize>,
/// How many voters participate in this election
#[clap(short, long)]
#[arg(short, long)]
voters: Option<usize>,
/// Random seed to use in this election
#[clap(long)]
#[arg(long)]
seed: Option<u64>,
}
+11
View File
@@ -19,6 +19,8 @@
#![cfg_attr(not(feature = "std"), no_std)]
use core::fmt::Display;
#[cfg(feature = "std")]
use serde::{Deserialize, Serialize};
use sp_debug_derive::RuntimeDebug;
@@ -412,6 +414,15 @@ pub enum StateVersion {
V1 = 1,
}
impl Display for StateVersion {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
match self {
StateVersion::V0 => f.write_str("0"),
StateVersion::V1 => f.write_str("1"),
}
}
}
impl Default for StateVersion {
fn default() -> Self {
StateVersion::V1