From 5ad8224a2a06580f2100e70e41bc33a1ccde6e97 Mon Sep 17 00:00:00 2001
From: klykov <lykov.kirill@gmail.com>
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 de2867b144..9b37f80c41 100644
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 
 [dependencies]
 crossbeam-channel = "0.5"
-clap = "3.1.5"
+clap = { version = "3.1.5", features = ["cargo"] }
 solana-streamer = { path = "../streamer", version = "=1.10.1" }
 solana-net-utils = { path = "../net-utils", version = "=1.10.1" }
 solana-version = { path = "../version", version = "=1.10.1" }
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<AtomicBool>, rvs: Arc<AtomicUsize>, 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));