From b879fd18783511489b969a560f1eb4b7e165d126 Mon Sep 17 00:00:00 2001
From: Javier Goday <jgoday@gmail.com>
Date: Mon, 3 Oct 2022 21:44:12 +0200
Subject: [PATCH] #2817: Update to clap 4

---
 integration-testing/Cargo.toml                                | 2 +-
 integration-testing/src/bin/arrow-json-integration-test.rs    | 4 ++--
 integration-testing/src/bin/flight-test-integration-client.rs | 4 ++--
 integration-testing/src/bin/flight-test-integration-server.rs | 4 ++--
 parquet/Cargo.toml                                            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/integration-testing/Cargo.toml b/integration-testing/Cargo.toml
index 687e91ac4df..99eda6f087a 100644
--- a/integration-testing/Cargo.toml
+++ b/integration-testing/Cargo.toml
@@ -34,7 +34,7 @@ logging = ["tracing-subscriber"]
 arrow = { path = "../arrow", default-features = false, features = ["test_utils", "ipc", "ipc_compression", "json"] }
 arrow-flight = { path = "../arrow-flight", default-features = false }
 async-trait = { version = "0.1.41", default-features = false }
-clap = { version = "3", default-features = false, features = ["std", "derive"] }
+clap = { version = "4", default-features = false, features = ["std", "derive"] }
 futures = { version = "0.3", default-features = false }
 hex = { version = "0.4", default-features = false, features = ["std"] }
 prost = { version = "0.11", default-features = false }
diff --git a/integration-testing/src/bin/arrow-json-integration-test.rs b/integration-testing/src/bin/arrow-json-integration-test.rs
index a7d7cf6ee7c..b84680f6f4b 100644
--- a/integration-testing/src/bin/arrow-json-integration-test.rs
+++ b/integration-testing/src/bin/arrow-json-integration-test.rs
@@ -24,7 +24,7 @@ use arrow_integration_testing::{read_json_file, util::*};
 use clap::Parser;
 use std::fs::File;
 
-#[derive(clap::ArgEnum, Debug, Clone)]
+#[derive(clap::ValueEnum, Debug, Clone)]
 #[clap(rename_all = "SCREAMING_SNAKE_CASE")]
 enum Mode {
     ArrowToJson,
@@ -41,7 +41,7 @@ struct Args {
     arrow: String,
     #[clap(short, long, help("Path to JSON file"))]
     json: String,
-    #[clap(arg_enum, short, long, default_value_t = Mode::Validate, help="Mode of integration testing tool")]
+    #[clap(value_enum, short, long, default_value_t = Mode::Validate, help="Mode of integration testing tool")]
     mode: Mode,
     #[clap(short, long)]
     verbose: bool,
diff --git a/integration-testing/src/bin/flight-test-integration-client.rs b/integration-testing/src/bin/flight-test-integration-client.rs
index fa99b424e37..d46b4fac759 100644
--- a/integration-testing/src/bin/flight-test-integration-client.rs
+++ b/integration-testing/src/bin/flight-test-integration-client.rs
@@ -20,7 +20,7 @@ use clap::Parser;
 type Error = Box<dyn std::error::Error + Send + Sync + 'static>;
 type Result<T = (), E = Error> = std::result::Result<T, E>;
 
-#[derive(clap::ArgEnum, Debug, Clone)]
+#[derive(clap::ValueEnum, Debug, Clone)]
 enum Scenario {
     Middleware,
     #[clap(name = "auth:basic_proto")]
@@ -40,7 +40,7 @@ struct Args {
         help = "path to the descriptor file, only used when scenario is not provided. See https://arrow.apache.org/docs/format/Integration.html#json-test-data-format"
     )]
     path: Option<String>,
-    #[clap(long, arg_enum)]
+    #[clap(long, value_enum)]
     scenario: Option<Scenario>,
 }
 
diff --git a/integration-testing/src/bin/flight-test-integration-server.rs b/integration-testing/src/bin/flight-test-integration-server.rs
index 6ed22ad81d9..5310d07d4f8 100644
--- a/integration-testing/src/bin/flight-test-integration-server.rs
+++ b/integration-testing/src/bin/flight-test-integration-server.rs
@@ -21,7 +21,7 @@ use clap::Parser;
 type Error = Box<dyn std::error::Error + Send + Sync + 'static>;
 type Result<T = (), E = Error> = std::result::Result<T, E>;
 
-#[derive(clap::ArgEnum, Debug, Clone)]
+#[derive(clap::ValueEnum, Debug, Clone)]
 enum Scenario {
     Middleware,
     #[clap(name = "auth:basic_proto")]
@@ -33,7 +33,7 @@ enum Scenario {
 struct Args {
     #[clap(long)]
     port: u16,
-    #[clap(long, arg_enum)]
+    #[clap(long, value_enum)]
     scenario: Option<Scenario>,
 }
 
diff --git a/parquet/Cargo.toml b/parquet/Cargo.toml
index e1593e4b9c9..0f959b17a89 100644
--- a/parquet/Cargo.toml
+++ b/parquet/Cargo.toml
@@ -43,7 +43,7 @@ num = { version = "0.4", default-features = false }
 num-bigint = { version = "0.4", default-features = false }
 arrow = { path = "../arrow", version = "24.0.0", optional = true, default-features = false, features = ["ipc"] }
 base64 = { version = "0.13", default-features = false, features = ["std"], optional = true }
-clap = { version = "3", default-features = false, features = ["std", "derive", "env"], optional = true }
+clap = { version = "4", default-features = false, features = ["std", "derive", "env"], optional = true }
 serde_json = { version = "1.0", default-features = false, features = ["std"], optional = true }
 seq-macro = { version = "0.3", default-features = false }
 rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }