From 22404ca1fc9a1e0a00d86baf17ba83de94f06a7e Mon Sep 17 00:00:00 2001 From: klykov Date: Mon, 7 Mar 2022 18:12:57 +0100 Subject: [PATCH] update clap to v3: bench-streamer --- bench-streamer/Cargo.toml | 2 +- bench-streamer/src/main.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml index 8e1f904c56..157d329c99 100644 --- a/bench-streamer/Cargo.toml +++ b/bench-streamer/Cargo.toml @@ -9,8 +9,8 @@ homepage = "https://solana.com/" publish = false [dependencies] -clap = "2.33.1" crossbeam-channel = "0.5" +clap = { version = "3.1.5", features = ["cargo"] } solana-net-utils = { path = "../net-utils", version = "=1.11.0" } solana-streamer = { path = "../streamer", version = "=1.11.0" } solana-version = { path = "../version", version = "=1.11.0" } diff --git a/bench-streamer/src/main.rs b/bench-streamer/src/main.rs index 99435dd920..bf9e92cbd2 100644 --- a/bench-streamer/src/main.rs +++ b/bench-streamer/src/main.rs @@ -1,6 +1,6 @@ #![allow(clippy::integer_arithmetic)] use { - clap::{crate_description, crate_name, value_t, App, Arg}, + clap::{crate_description, crate_name, Arg, Command}, crossbeam_channel::unbounded, solana_streamer::{ packet::{Packet, PacketBatch, PacketBatchRecycler, PACKET_DATA_SIZE}, @@ -57,18 +57,18 @@ fn sink(exit: Arc, rvs: Arc, r: PacketBatchReceiver) -> fn main() -> Result<()> { let mut num_sockets = 1usize; - let matches = App::new(crate_name!()) + let matches = Command::new(crate_name!()) .about(crate_description!()) .version(solana_version::version!()) .arg( - Arg::with_name("num-recv-sockets") + Arg::new("num-recv-sockets") .long("num-recv-sockets") .value_name("NUM") .takes_value(true) .help("Use NUM receive sockets"), ) .arg( - Arg::with_name("num-producers") + Arg::new("num-producers") .long("num-producers") .value_name("NUM") .takes_value(true) @@ -80,7 +80,7 @@ fn main() -> Result<()> { num_sockets = max(num_sockets, n.to_string().parse().expect("integer")); } - let num_producers = value_t!(matches, "num_producers", u64).unwrap_or(4); + let num_producers: u64 = matches.value_of_t("num_producers").unwrap_or(4); let port = 0; let ip_addr = IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0));