Port to Clap 3.0

Author: vorot93

Cargo.lock

@@ -13,7 +13,7 @@ authors = [
 ansi_term = "0.11"
 atty = "0.2.8"
 blooms-db = { path = "util/blooms-db" }
-clap = "2"
+clap = { git = "https://github.com/clap-rs/clap" }
 cli-signer= { path = "cli-signer" }
 client-traits = { path = "ethcore/client-traits" }
 common-types = { path = "ethcore/types" }
@@ -75,7 +75,6 @@ serde_derive = "1.0"
 serde_json = "1.0"
 snapshot = { path = "ethcore/snapshot" }
 spec = { path = "ethcore/spec" }
-structopt = "~0.3"
 term_size = "0.3"
 textwrap = "0.11.0"
 toml = "0.5.6"

Cargo.toml

@@ -8,12 +8,12 @@ authors = ["Parity Technologies <[email protected]>"]
 serde = "1"
 serde_json = "1"
 serde_derive = "1"
-ethereum-types = "0.9.0"
+ethereum-types = "0.9"
 ethjson = { path = "../../../json" }
 vm = { path = "../../vm" }
 wasm = { path = "../" }
-clap = "2.24"
-env_logger = "0.5"
+clap = { git = "https://github.com/clap-rs/clap" }
+env_logger = "0.7"
 rustc-hex = "2.1.0"
 
 [features]

ethcore/wasm/run/Cargo.toml

@@ -29,24 +29,30 @@ mod fixture;
 mod runner;
 
 use fixture::Fixture;
-use clap::{App, Arg};
+use clap::Clap;
 use std::fs;
 
+#[derive(Clap)]
+#[clap(
+    name = "pwasm-run-test",
+)]
+struct Options {
+	#[clap(
+		required = true,
+		name = "target",
+		min_values = 1,
+		about = "JSON fixture",
+	)]
+	pub target: Vec<String>
+}
+
 fn main() {
 	::env_logger::init();
 
-	let matches = App::new("pwasm-run-test")
-		.arg(Arg::with_name("target")
-			.index(1)
-			.required(true)
-			.multiple(true)
-			.help("JSON fixture"))
-		.get_matches();
-
 	let mut exit_code = 0;
 
-	for target in matches.values_of("target").expect("No target parameter") {
-		let mut f = fs::File::open(target).expect("Failed to open file");
+	for target in Options::parse().target {
+		let mut f = fs::File::open(&target).expect("Failed to open file");
 		let fixtures: Vec<Fixture> = serde_json::from_reader(&mut f).expect("Failed to deserialize json");
 
 		for fixture in fixtures.into_iter() {

ethcore/wasm/run/src/main.rs

@@ -1,9 +1,9 @@
+use clap::Clap;
 use cli::config::get_config;
 use cli::globals::{Globals, IPCOptions};
 use cli::parse_cli::*;
 use cli::subcommands::*;
 use std::fs;
-use structopt::StructOpt;
 
 #[derive(Debug, PartialEq)]
 pub enum ArgsError {
@@ -216,8 +216,6 @@ pub struct Args {
 	pub arg_max_round_blocks_to_import: usize,
 	pub flag_can_restart: bool,
 	pub flag_no_color: bool,
-	// NOTE: This is auto handled by structopt
-	// pub flag_version: bool,
 	pub flag_no_config: bool,
 	pub arg_logging: Option<String>,
 	pub arg_log_file: Option<String>,
@@ -247,7 +245,7 @@ impl Args {
 	pub fn parse() -> Result<Self, ArgsError> {
 		let mut args: Args = Default::default();
 
-		let mut raw_input = ArgsInput::from_args();
+		let mut raw_input = ArgsInput::parse();
 
 		Args::save_current_config(&mut raw_input.globals)?;