[internal] Bump clap from 2.33.3 to 3.1.6 in /src/rust/engine (#14745)

* Bump clap from 2.33.3 to 3.1.6 in /src/rust/engine

Bumps [clap](https://github.com/clap-rs/clap) from 2.33.3 to 3.1.6.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](clap-rs/clap@v2.33.3...v3.1.6)

src/rust/engine/fs/brfs/Cargo.toml

@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 protos = { path = "../../protos" }
-clap = "2"
+clap = "3"
 dirs-next = "2"
 env_logger = "0.5.4"
 errno = "0.2.8"

src/rust/engine/fs/brfs/src/main.rs

@@ -34,7 +34,7 @@ use std::sync::mpsc::{channel, Receiver, Sender};
 use std::sync::Arc;
 use std::time;
 
-use clap::{value_t, App, Arg};
+use clap::{Arg, Command};
 use futures::future::FutureExt;
 use grpc_util::tls;
 use hashing::{Digest, Fingerprint};
@@ -679,49 +679,49 @@ async fn main() {
 
   let default_store_path = Store::default_path();
 
-  let args = App::new("brfs")
+  let args = Command::new("brfs")
     .arg(
-      Arg::with_name("local-store-path")
+      Arg::new("local-store-path")
         .takes_value(true)
         .long("local-store-path")
         .default_value_os(default_store_path.as_ref())
         .required(false),
     ).arg(
-      Arg::with_name("server-address")
+      Arg::new("server-address")
         .takes_value(true)
         .long("server-address")
         .required(false),
     ).arg(
-      Arg::with_name("remote-instance-name")
+      Arg::new("remote-instance-name")
         .takes_value(true)
         .long("remote-instance-name")
         .required(false),
     ).arg(
-      Arg::with_name("root-ca-cert-file")
+      Arg::new("root-ca-cert-file")
         .help("Path to file containing root certificate authority certificates. If not set, TLS will not be used when connecting to the remote.")
         .takes_value(true)
         .long("root-ca-cert-file")
         .required(false)
     ).arg(
-      Arg::with_name("oauth-bearer-token-file")
+      Arg::new("oauth-bearer-token-file")
         .help("Path to file containing oauth bearer token. If not set, no authorization will be provided to remote servers.")
         .takes_value(true)
         .long("oauth-bearer-token-file")
         .required(false)
     ).arg(
-      Arg::with_name("mount-path")
+      Arg::new("mount-path")
         .required(true)
         .takes_value(true),
     )
     .arg(
-      Arg::with_name("rpc-concurrency-limit")
+      Arg::new("rpc-concurrency-limit")
           .help("Maximum concurrenct RPCs to the service.")
           .takes_value(true)
           .long("rpc-concurrency-limit")
           .required(false)
           .default_value("128")
     ).arg(
-    Arg::with_name("batch-api-size-limit")
+    Arg::new("batch-api-size-limit")
         .help("Maximum total size of blobs allowed to be sent in a single batch API call to the remote store.")
         .takes_value(true)
         .long("batch-api-size-limit")
@@ -769,10 +769,12 @@ async fn main() {
         4 * 1024 * 1024,
         std::time::Duration::from_secs(5 * 60),
         1,
-        value_t!(args.value_of("rpc-concurrency-limit"), usize)
+        args
+          .value_of_t::<usize>("rpc-concurrency-limit")
           .expect("Bad rpc-concurrency-limit flag"),
         None,
-        value_t!(args.value_of("batch-api-size-limit"), usize)
+        args
+          .value_of_t::<usize>("batch-api-size-limit")
           .expect("Bad batch-api-size-limit flag"),
       )
       .expect("Error making remote store"),

src/rust/engine/fs/fs_util/Cargo.toml

@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 protos = { path = "../../protos" }
 bytes = "1.0"
-clap = "2"
+clap = "3"
 env_logger = "0.5.4"
 grpc_util = { path = "../../grpc_util" }
 fs = { path = ".." }