chore: Migrate all canisters to clap 4 (#2013)

Migrated as per instructions [here](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md#400---2022-09-28)
dfinity · Oct 18, 2024 · ee61d50 · ee61d50
1 parent 4bed17b
commit ee61d50
Show file tree

Hide file tree

Showing 74 changed files with 188 additions and 193 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rs/backup/BUILD.bazel b/rs/backup/BUILD.bazel
@@ -13,7 +13,7 @@ DEPENDENCIES = [
     "//rs/types/types",
     "@crate_index//:anyhow",
     "@crate_index//:chrono",
-    "@crate_index//:clap_3_2_25",
+    "@crate_index//:clap",
     "@crate_index//:rand",
     "@crate_index//:reqwest",
     "@crate_index//:serde",

diff --git a/rs/backup/Cargo.toml b/rs/backup/Cargo.toml
@@ -9,7 +9,7 @@ documentation.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 chrono = { workspace = true }
-clap = { version = "3.2.25", features = ["derive"] }
+clap = { workspace = true }
 ic-config = { path = "../config" }
 ic-crypto-utils-threshold-sig-der = { path = "../crypto/utils/threshold_sig_der" }
 ic-logger = { path = "../monitoring/logger" }

diff --git a/rs/backup/src/cmd.rs b/rs/backup/src/cmd.rs
@@ -2,6 +2,7 @@ use clap::Parser;
 use ic_types::{PrincipalId, SubnetId};
 use std::path::PathBuf;
 
+#[derive(Clone)]
 pub struct ClapSubnetId(pub SubnetId);
 
 impl std::str::FromStr for ClapSubnetId {

diff --git a/rs/bitcoin/adapter/BUILD.bazel b/rs/bitcoin/adapter/BUILD.bazel
@@ -12,7 +12,7 @@ DEPENDENCIES = [
     "//rs/monitoring/logger",
     "//rs/monitoring/metrics",
     "@crate_index//:bitcoin",
-    "@crate_index//:clap_3_2_25",
+    "@crate_index//:clap",
     "@crate_index//:futures",
     "@crate_index//:hashlink",
     "@crate_index//:hex",

diff --git a/rs/bitcoin/adapter/Cargo.toml b/rs/bitcoin/adapter/Cargo.toml
@@ -8,7 +8,7 @@ documentation.workspace = true
 
 [dependencies]
 bitcoin = { workspace = true }
-clap = { version = "3.2.25", features = ["derive"] }
+clap = { workspace = true }
 futures = { workspace = true }
 hashlink = "0.8.0"
 hex = { workspace = true }

diff --git a/rs/boundary_node/systemd_journal_gatewayd_shim/BUILD.bazel b/rs/boundary_node/systemd_journal_gatewayd_shim/BUILD.bazel
@@ -5,7 +5,7 @@ DEPENDENCIES = [
     "//rs/async_utils",
     "@crate_index//:anyhow",
     "@crate_index//:axum",
-    "@crate_index//:clap_3_2_25",
+    "@crate_index//:clap",
     "@crate_index//:http",
     "@crate_index//:itertools",
     "@crate_index//:reqwest",

diff --git a/rs/https_outcalls/adapter/BUILD.bazel b/rs/https_outcalls/adapter/BUILD.bazel
@@ -10,7 +10,7 @@ DEPENDENCIES = [
     "//rs/monitoring/logger",
     "//rs/monitoring/metrics",
     "@crate_index//:byte-unit",
-    "@crate_index//:clap_3_2_25",
+    "@crate_index//:clap",
     "@crate_index//:futures",
     "@crate_index//:http",
     "@crate_index//:http-body-util",

diff --git a/rs/https_outcalls/adapter/Cargo.toml b/rs/https_outcalls/adapter/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 byte-unit = "4.0.14"
-clap = { version = "3.2.25", features = ["derive"] }
+clap = { workspace = true }
 futures = { workspace = true }
 http = { workspace = true }
 http-body-util = { workspace = true }

diff --git a/rs/ic_os/dev_test_tools/launch-single-vm/BUILD.bazel b/rs/ic_os/dev_test_tools/launch-single-vm/BUILD.bazel
@@ -8,7 +8,7 @@ DEPENDENCIES = [
     "//rs/registry/subnet_type",
     "//rs/tests/driver:ic-system-test-driver",
     "//rs/types/types",
-    "@crate_index//:clap_3_2_25",
+    "@crate_index//:clap",
     "@crate_index//:reqwest",
     "@crate_index//:serde",
     "@crate_index//:slog",

diff --git a/rs/ic_os/dev_test_tools/launch-single-vm/Cargo.toml b/rs/ic_os/dev_test_tools/launch-single-vm/Cargo.toml
@@ -11,7 +11,7 @@ ic-registry-subnet-type = { path = "../../../registry/subnet_type" }
 ic-system-test-driver = { path = "../../../tests/driver" }
 ic-types = { path = "../../../types/types" }
 
-clap = { version = "3.2.25", features = ["derive"] }
+clap = { workspace = true }
 reqwest = { workspace = true }
 serde = { workspace = true }
 slog-async = { workspace = true }

diff --git a/rs/ic_os/nss_icos/BUILD.bazel b/rs/ic_os/nss_icos/BUILD.bazel
@@ -5,7 +5,6 @@ package(default_visibility = ["//rs:ic-os-pkg"])
 DEPENDENCIES = [
     # Keep sorted.
     "@crate_index//:base64",
-    "@crate_index//:clap_3_2_25",
     "@crate_index//:lazy_static",
     "@crate_index//:libc",
     "@crate_index//:libnss",

diff --git a/rs/ic_os/vsock/guest/BUILD.bazel b/rs/ic_os/vsock/guest/BUILD.bazel
@@ -5,7 +5,7 @@ package(default_visibility = ["//rs:ic-os-pkg"])
 DEPENDENCIES = [
     # Keep sorted.
     "//rs/ic_os/vsock/vsock_lib:vsock_lib",
-    "@crate_index//:clap_3_2_25",
+    "@crate_index//:clap",
 ]
 
 MACRO_DEPENDENCIES = []

diff --git a/rs/ic_os/vsock/guest/Cargo.toml b/rs/ic_os/vsock/guest/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [target.'cfg(target_os = "linux")'.dependencies]
-clap = { version = "3.2.25", features = ["derive"] }
+clap = { workspace = true }
 vsock_lib = { path = "../vsock_lib" }
diff --git a/rs/nns/inspector/BUILD.bazel b/rs/nns/inspector/BUILD.bazel
@@ -11,7 +11,7 @@ DEPENDENCIES = [
     "//rs/nns/gtc",
     "//rs/rust_canisters/stable_reader",
     "//rs/types/base_types",
-    "@crate_index//:clap_3_2_25",
+    "@crate_index//:clap",
     "@crate_index//:csv",
     "@crate_index//:hex",
     "@crate_index//:prost",

diff --git a/rs/nns/inspector/Cargo.toml b/rs/nns/inspector/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 
 [dependencies]
-clap = { version = "3.2.25", features = ["derive"] }
+clap = { workspace = true }
 csv = "1.1"
 hex = { workspace = true }
 ic-base-types = { path = "../../types/base_types" }

diff --git a/rs/nns/inspector/src/main.rs b/rs/nns/inspector/src/main.rs
@@ -27,14 +27,13 @@ use std::{
 )]
 struct CliArgs {
     /// Path to stable the `canister_states` directory
-    #[clap(parse(from_os_str))]
     input: PathBuf,
 
-    #[clap(parse(from_os_str), default_value = ".")]
+    #[clap(default_value = ".")]
     output: PathBuf,
 
     /// The location of the "rs" directory. Used to find .proto files.
-    #[clap(long, parse(from_os_str), default_value = ".")]
+    #[clap(long, default_value = ".")]
     rs: PathBuf,
 }
 

diff --git a/rs/orchestrator/BUILD.bazel b/rs/orchestrator/BUILD.bazel
@@ -46,7 +46,7 @@ rust_library(
         "//rs/types/types",
         "@crate_index//:backoff",
         "@crate_index//:candid",
-        "@crate_index//:clap_3_2_25",
+        "@crate_index//:clap",
         "@crate_index//:exec",
         "@crate_index//:get_if_addrs",
         "@crate_index//:hex",
@@ -78,7 +78,7 @@ rust_binary(
         # Keep sorted.
         ":lib",
         "//rs/async_utils",
-        "@crate_index//:clap_3_2_25",
+        "@crate_index//:clap",
         "@crate_index//:tokio",
     ],
 )

diff --git a/rs/orchestrator/Cargo.toml b/rs/orchestrator/Cargo.toml
@@ -10,7 +10,7 @@ documentation.workspace = true
 async-trait = { workspace = true }
 backoff = { workspace = true }
 candid = { workspace = true }
-clap = { version = "3.2.25", features = ["derive"] }
+clap = { workspace = true }
 exec = "0.3.1"
 get_if_addrs = "0.5.3"
 hex = { workspace = true }

diff --git a/rs/orchestrator/registry_replicator/BUILD.bazel b/rs/orchestrator/registry_replicator/BUILD.bazel
@@ -18,7 +18,7 @@ DEPENDENCIES = [
     "//rs/registry/nns_data_provider",
     "//rs/registry/routing_table",
     "//rs/types/types",
-    "@crate_index//:clap_3_2_25",
+    "@crate_index//:clap",
     "@crate_index//:prometheus",
     "@crate_index//:prost",
     "@crate_index//:slog",