[deps] Update clap dependency to be consistent across crates (aptos-l…

…abs#9605)
aalok-thakkar · Aug 13, 2023 · 8ccb5e7 · 8ccb5e7
1 parent 4a1dd8f
commit 8ccb5e7
Show file tree

Hide file tree

Showing 21 changed files with 100 additions and 108 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -448,7 +448,7 @@ chrono = { version = "0.4.19", features = ["clock", "serde"] }
 cfg_block = "0.1.1"
 cfg-if = "1.0.0"
 claims = "0.7"
-clap = { version = "4.3.5", features = ["derive", "unstable-styles"] }
+clap = { version = "4.3.9", features = ["derive", "unstable-styles"] }
 clap_complete = "4.3.1"
 cloud-storage = { version = "0.11.1", features = ["global-client"] }
 codespan-reporting = "0.11.1"

diff --git a/third_party/move/documentation/examples/diem-framework/crates/cli/Cargo.toml b/third_party/move/documentation/examples/diem-framework/crates/cli/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 
 bcs = "0.1.4"
 move-cli = { path = "../../../../../tools/move-cli" }

diff --git a/third_party/move/evm/extract-ethereum-abi/Cargo.toml b/third_party/move/evm/extract-ethereum-abi/Cargo.toml
@@ -16,7 +16,7 @@ move-to-yul = { path = "../move-to-yul" }
 # external dependencies
 anyhow = "1.0.38"
 atty = "0.2.14"
-clap = { version = "4.3.5", features = ["derive", "env"] }
+clap = { version = "4.3.9", features = ["derive", "env"] }
 codespan = "0.11.1"
 codespan-reporting = "0.11.1"
 ethabi = "17.0.0"

diff --git a/third_party/move/evm/move-to-yul/Cargo.toml b/third_party/move/evm/move-to-yul/Cargo.toml
@@ -22,7 +22,7 @@ move-stackless-bytecode = { path = "../../move-prover/bytecode" }
 # external dependencies
 anyhow = "1.0.38"
 atty = "0.2.14"
-clap = { version = "4.3.5", features = ["derive", "env"] }
+clap = { version = "4.3.9", features = ["derive", "env"] }
 codespan = "0.11.1"
 codespan-reporting = "0.11.1"
 ethnum = "1.0.4"

diff --git a/third_party/move/move-analyzer/Cargo.toml b/third_party/move/move-analyzer/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 codespan-reporting = "0.11.1"
 crossbeam = "0.8"
 derivative = "2.2.0"

diff --git a/third_party/move/move-compiler-v2/Cargo.toml b/third_party/move/move-compiler-v2/Cargo.toml
@@ -17,7 +17,7 @@ move-model = { path = "../move-model" }
 move-stackless-bytecode = { path = "../move-prover/bytecode" }
 
 bcs = { workspace = true }
-clap = { version = "3.2.23", features = ["derive", "env"] }
+clap = { version = "4.3.9", features = ["derive", "env"] }
 codespan = "0.11.1"
 codespan-reporting = { version = "0.11.1", features = ["serde", "serialization"] }
 ethnum = "1.0.4"

diff --git a/third_party/move/move-compiler-v2/src/options.rs b/third_party/move/move-compiler-v2/src/options.rs
@@ -12,22 +12,17 @@ pub struct Options {
     /// Directories where to lookup dependencies.
     #[clap(
         short,
-        takes_value(true),
-        multiple_values(true),
-        multiple_occurrences(true)
+        num_args = 0..
     )]
     pub dependencies: Vec<String>,
     /// Named address mapping.
     #[clap(
         short,
-        takes_value(true),
-        multiple_values(true),
-        multiple_occurrences(true)
+        num_args = 0..
     )]
     pub named_address_mapping: Vec<String>,
     /// Output directory.
-    #[clap(short)]
-    #[clap(long, default_value = "")]
+    #[clap(short, long, default_value = "")]
     pub output_dir: String,
     /// Whether to dump intermediate bytecode for debugging.
     #[clap(long = "dump-bytecode")]
@@ -41,9 +36,7 @@ pub struct Options {
     #[clap(short)]
     #[clap(
         long = "experiment",
-        takes_value(true),
-        multiple_values(true),
-        multiple_occurrences(true)
+        num_args = 0..
     )]
     pub experiments: Vec<String>,
     /// Sources to compile (positional arg, therefore last)

diff --git a/third_party/move/move-compiler/Cargo.toml b/third_party/move/move-compiler/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 
 [dependencies]
 anyhow = "1.0.52"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 codespan-reporting = "0.11.1"
 difference = "2.0.0"
 hex = "0.4.3"

diff --git a/third_party/move/move-ir-compiler/Cargo.toml b/third_party/move/move-ir-compiler/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 move-binary-format = { path = "../move-binary-format" }
 move-bytecode-source-map = { path = "move-bytecode-source-map" }
 move-bytecode-verifier = { path = "../move-bytecode-verifier" }

diff --git a/third_party/move/move-prover/Cargo.toml b/third_party/move/move-prover/Cargo.toml
@@ -24,7 +24,7 @@ move-stackless-bytecode = { path = "bytecode" }
 # external dependencies
 async-trait = "0.1.42"
 atty = "0.2.14"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 codespan = "0.11.1"
 codespan-reporting = "0.11.1"
 futures = "0.3.12"

diff --git a/third_party/move/move-prover/lab/Cargo.toml b/third_party/move/move-prover/lab/Cargo.toml
@@ -20,7 +20,7 @@ z3tracer = "0.8.0"
 # external dependencies
 anyhow = "1.0.52"
 chrono = "0.4.19"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 codespan-reporting = "0.11.1"
 hex = "0.4.3"
 itertools = "0.10.0"

diff --git a/third_party/move/testing-infra/test-generation/Cargo.toml b/third_party/move/testing-infra/test-generation/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 edition = "2021"
 
 [dependencies]
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 crossbeam-channel = "0.5.0"
 getrandom = "0.2.2"
 hex = "0.4.3"

diff --git a/third_party/move/testing-infra/transactional-test-runner/Cargo.toml b/third_party/move/testing-infra/transactional-test-runner/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 colored = "2.0.0"
 move-binary-format = { path = "../../move-binary-format" }
 move-bytecode-source-map = { path = "../../move-ir-compiler/move-bytecode-source-map" }

diff --git a/third_party/move/tools/move-bytecode-viewer/Cargo.toml b/third_party/move/tools/move-bytecode-viewer/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 crossterm = "0.26.1"
 move-binary-format = { path = "../../move-binary-format" }
 move-bytecode-source-map = { path = "../../move-ir-compiler/move-bytecode-source-map" }

diff --git a/third_party/move/tools/move-cli/Cargo.toml b/third_party/move/tools/move-cli/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 codespan-reporting = "0.11.1"
 colored = "2.0.0"
 difference = "2.0.0"

diff --git a/third_party/move/tools/move-coverage/Cargo.toml b/third_party/move/tools/move-coverage/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 codespan = { version = "0.11.1", features = ["serialization"] }
 colored = "2.0.0"
 once_cell = "1.7.2"

diff --git a/third_party/move/tools/move-disassembler/Cargo.toml b/third_party/move/tools/move-disassembler/Cargo.toml
@@ -20,7 +20,7 @@ move-core-types = { path = "../../move-core/types" }
 move-coverage = { path = "../move-coverage" }
 move-ir-types = { path = "../../move-ir/types" }
 
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 
 [features]
 default = []
diff --git a/third_party/move/tools/move-explain/Cargo.toml b/third_party/move/tools/move-explain/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 edition = "2021"
 
 [dependencies]
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 move-command-line-common = { path = "../../move-command-line-common" }
 move-core-types = { path = "../../move-core/types" }
 

diff --git a/third_party/move/tools/move-package/Cargo.toml b/third_party/move/tools/move-package/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.52"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 colored = "2.0.0"
 dirs-next = "2.0.0"
 itertools = "0.10.0"

diff --git a/third_party/move/tools/move-unit-test/Cargo.toml b/third_party/move/tools/move-unit-test/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.52"
 better_any = "0.1.1"
-clap = { version = "4.3.5", features = ["derive"] }
+clap = { version = "4.3.9", features = ["derive"] }
 codespan-reporting = "0.11.1"
 colored = "2.0.0"
 evm-exec-utils = { path = "../../evm/exec-utils", optional = true }