From 85de4ebc1c450cfa0db15c7b0456f438795c6ffe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 22:58:14 +0000
Subject: [PATCH] build(deps): bump clap from 3.2.20 to 4.0.15

Bumps [clap](https://github.com/clap-rs/clap) from 3.2.20 to 4.0.15.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/v3.2.20...v4.0.15)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                             | 133 +++++++++++++++++++------
 src/billing-demo/Cargo.toml            |   2 +-
 src/compute/Cargo.toml                 |   2 +-
 src/environmentd/Cargo.toml            |   2 +-
 src/kafka-util/Cargo.toml              |   2 +-
 src/mz/Cargo.toml                      |   2 +-
 src/orchestrator-kubernetes/Cargo.toml |   2 +-
 src/orchestrator-tracing/Cargo.toml    |   2 +-
 src/ore/Cargo.toml                     |   2 +-
 src/persist-client/Cargo.toml          |   2 +-
 src/pgtest/Cargo.toml                  |   2 +-
 src/s3-datagen/Cargo.toml              |   2 +-
 src/service/Cargo.toml                 |   2 +-
 src/sqllogictest/Cargo.toml            |   2 +-
 src/storaged/Cargo.toml                |   2 +-
 src/testdrive/Cargo.toml               |   2 +-
 test/perf-kinesis/Cargo.toml           |   2 +-
 17 files changed, 119 insertions(+), 46 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index af052c0051394..c9ba5f95c7f85 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -999,27 +999,37 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.20"
+version = "3.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd"
+checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
+dependencies = [
+ "bitflags",
+ "clap_lex 0.2.2",
+ "indexmap",
+ "textwrap",
+]
+
+[[package]]
+name = "clap"
+version = "4.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bf8832993da70a4c6d13c581f4463c2bdda27b9bf1c5498dc4365543abe6d6f"
 dependencies = [
  "atty",
  "bitflags",
  "clap_derive",
- "clap_lex",
- "indexmap",
+ "clap_lex 0.3.0",
  "once_cell",
  "strsim",
  "termcolor",
- "terminal_size",
- "textwrap",
+ "terminal_size 0.2.1",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.2.18"
+version = "4.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "c42f169caba89a7d512b5418b09864543eeb4d497416c917d7137863bd2076ad"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -1037,6 +1047,15 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "clap_lex"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
+dependencies = [
+ "os_str_bytes",
+]
+
 [[package]]
 name = "cmake"
 version = "0.1.48"
@@ -1103,7 +1122,7 @@ dependencies = [
  "encode_unicode",
  "libc",
  "once_cell",
- "terminal_size",
+ "terminal_size 0.1.17",
  "unicode-width",
  "winapi",
 ]
@@ -1233,7 +1252,7 @@ dependencies = [
  "atty",
  "cast",
  "ciborium",
- "clap",
+ "clap 3.2.22",
  "criterion-plot",
  "futures",
  "itertools",
@@ -1768,6 +1787,27 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "ethnum"
 version = "1.3.0"
@@ -2436,6 +2476,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06"
+
 [[package]]
 name = "ipnet"
 version = "2.5.0"
@@ -2785,6 +2831,12 @@ dependencies = [
  "linked-hash-map",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.0.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+
 [[package]]
 name = "lock_api"
 version = "0.4.6"
@@ -2995,7 +3047,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "axum",
- "clap",
+ "clap 4.0.15",
  "dirs",
  "indicatif",
  "mz-ore",
@@ -3120,7 +3172,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "chrono",
- "clap",
+ "clap 4.0.15",
  "hex",
  "mz-ore",
  "mz-test-util",
@@ -3173,7 +3225,7 @@ dependencies = [
  "async-trait",
  "axum",
  "bytesize",
- "clap",
+ "clap 4.0.15",
  "crossbeam-channel",
  "dec",
  "differential-dataflow",
@@ -3275,7 +3327,7 @@ dependencies = [
  "bytes",
  "cc",
  "chrono",
- "clap",
+ "clap 4.0.15",
  "datadriven",
  "fail",
  "fallible-iterator",
@@ -3479,7 +3531,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "chrono",
- "clap",
+ "clap 4.0.15",
  "crossbeam",
  "mz-avro",
  "mz-ccsr",
@@ -3590,7 +3642,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "chrono",
- "clap",
+ "clap 4.0.15",
  "futures",
  "k8s-openapi",
  "kube",
@@ -3631,7 +3683,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap",
+ "clap 4.0.15",
  "futures-core",
  "http",
  "humantime",
@@ -3652,7 +3704,7 @@ dependencies = [
  "atty",
  "bytes",
  "chrono",
- "clap",
+ "clap 4.0.15",
  "console-subscriber",
  "ctor",
  "either",
@@ -3692,7 +3744,7 @@ dependencies = [
  "aws-sdk-kinesis",
  "aws-types",
  "bytes",
- "clap",
+ "clap 4.0.15",
  "futures",
  "mz-kinesis-util",
  "mz-ore",
@@ -3755,7 +3807,7 @@ dependencies = [
  "async-trait",
  "axum",
  "bytes",
- "clap",
+ "clap 4.0.15",
  "criterion",
  "datadriven",
  "differential-dataflow",
@@ -3825,7 +3877,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "bytes",
- "clap",
+ "clap 4.0.15",
  "datadriven",
  "fallible-iterator",
  "mz-ore",
@@ -4000,7 +4052,7 @@ dependencies = [
  "aws-config",
  "aws-sdk-s3",
  "bytefmt",
- "clap",
+ "clap 4.0.15",
  "futures",
  "indicatif",
  "mz-ore",
@@ -4037,7 +4089,7 @@ dependencies = [
  "anyhow",
  "async-stream",
  "async-trait",
- "clap",
+ "clap 4.0.15",
  "crossbeam-channel",
  "futures",
  "http",
@@ -4129,7 +4181,7 @@ dependencies = [
  "anyhow",
  "bytes",
  "chrono",
- "clap",
+ "clap 4.0.15",
  "fallible-iterator",
  "futures",
  "junit-report",
@@ -4263,7 +4315,7 @@ version = "0.28.0-dev"
 dependencies = [
  "anyhow",
  "axum",
- "clap",
+ "clap 4.0.15",
  "fail",
  "mz-build-info",
  "mz-http-util",
@@ -4314,7 +4366,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "chrono",
- "clap",
+ "clap 4.0.15",
  "flate2",
  "futures",
  "globset",
@@ -5721,6 +5773,20 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.35.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.11"
@@ -6276,14 +6342,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "textwrap"
-version = "0.15.0"
+name = "terminal_size"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+checksum = "8440c860cf79def6164e4a0a983bcc2305d82419177a0e0c71930d049e3ac5a1"
 dependencies = [
- "terminal_size",
+ "rustix",
+ "windows-sys",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16"
+
 [[package]]
 name = "thiserror"
 version = "1.0.37"
diff --git a/src/billing-demo/Cargo.toml b/src/billing-demo/Cargo.toml
index d8749e84be860..660d77b2c5b01 100644
--- a/src/billing-demo/Cargo.toml
+++ b/src/billing-demo/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.65"
 chrono = { version = "0.4.22", default-features = false, features = ["clock", "std"] }
-clap = { version = "3.2.20", features = ["derive"] }
+clap = { version = "4.0.15", features = ["derive"] }
 hex = "0.4.3"
 mz-ore = { path = "../../src/ore", features = ["task"] }
 mz-test-util = { path = "../../test/test-util" }
diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml
index 01dd5f7af1aeb..8adcc1b1e794d 100644
--- a/src/compute/Cargo.toml
+++ b/src/compute/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = "1.0.65"
 async-trait = "0.1.56"
 axum = "0.5.16"
 bytesize = "1.1.0"
-clap = { version = "3.2.20", features = ["derive", "env"] }
+clap = { version = "4.0.15", features = ["derive", "env"] }
 crossbeam-channel = "0.5.6"
 dec = { version = "0.4.8", features = ["serde"] }
 differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" }
diff --git a/src/environmentd/Cargo.toml b/src/environmentd/Cargo.toml
index 5b3e2988c12bf..2eb7630f2fe13 100644
--- a/src/environmentd/Cargo.toml
+++ b/src/environmentd/Cargo.toml
@@ -16,7 +16,7 @@ axum = { version = "0.5.16", features = ["headers"] }
 base64 = "0.13.0"
 bytes = "1.2.1"
 chrono = { version = "0.4.22", default-features = false, features = ["std"] }
-clap = { version = "3.2.20", features = ["wrap_help", "env", "derive"] }
+clap = { version = "4.0.15", features = ["wrap_help", "env", "derive"] }
 fail = { version = "0.5.1", features = ["failpoints"] }
 futures = "0.3.24"
 headers = "0.3.7"
diff --git a/src/kafka-util/Cargo.toml b/src/kafka-util/Cargo.toml
index 471241e7ab51f..4412018a23ce1 100644
--- a/src/kafka-util/Cargo.toml
+++ b/src/kafka-util/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.65"
 chrono = { version = "0.4.22", default-features = false, features = ["clock", "std"] }
-clap = { version = "3.2.20", features = ["derive"] }
+clap = { version = "4.0.15", features = ["derive"] }
 crossbeam = "0.8.2"
 mz-avro = { path = "../avro" }
 mz-ccsr = { path = "../ccsr" }
diff --git a/src/mz/Cargo.toml b/src/mz/Cargo.toml
index 6789162203d20..76e60763b55eb 100644
--- a/src/mz/Cargo.toml
+++ b/src/mz/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 
 [dependencies]
 serde = { version = "1.0.145", features = ["derive"] }
-clap = { version = "3.2.20", features = [ "derive" ] }
+clap = { version = "4.0.15", features = [ "derive" ] }
 tokio = { version = "1.20.2", features = ["full"] }
 open = "3.0.3"
 axum = "0.5.16"
diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml
index cb47e64a9a839..7068a5f30c952 100644
--- a/src/orchestrator-kubernetes/Cargo.toml
+++ b/src/orchestrator-kubernetes/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 anyhow = "1.0.65"
 async-trait = "0.1.57"
 chrono = { version = "0.4.22", default-features = false }
-clap = { version = "3.2.20", features = ["derive"] }
+clap = { version = "4.0.15", features = ["derive"] }
 futures = "0.3.24"
 maplit = "1.0.2"
 mz-orchestrator = { path = "../orchestrator" }
diff --git a/src/orchestrator-tracing/Cargo.toml b/src/orchestrator-tracing/Cargo.toml
index 0af29019e99e2..b8ba69b5d8dd6 100644
--- a/src/orchestrator-tracing/Cargo.toml
+++ b/src/orchestrator-tracing/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.65"
 async-trait = "0.1.57"
-clap = { version = "3.2.20", features = ["env", "derive"] }
+clap = { version = "4.0.15", features = ["env", "derive"] }
 futures-core = "0.3.21"
 http = "0.2.8"
 humantime = "2.1.0"
diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml
index 3a185ba35b5c7..d0d6c8a65112a 100644
--- a/src/ore/Cargo.toml
+++ b/src/ore/Cargo.toml
@@ -18,7 +18,7 @@ anyhow = { version = "1.0.65", optional = true }
 async-trait = { version = "0.1.57", optional = true }
 bytes = { version = "1.2.1", optional = true }
 chrono = { version = "0.4.22", default-features = false, features = ["std"], optional = true }
-clap = { version = "3.2.20", features = ["env"], optional = true }
+clap = { version = "4.0.15", features = ["env"], optional = true }
 ctor = { version = "0.1.23", optional = true }
 either = "1.8.0"
 futures = { version = "0.3.24", optional = true }
diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml
index fd7f1fd8f3791..418f4e93cd0f0 100644
--- a/src/persist-client/Cargo.toml
+++ b/src/persist-client/Cargo.toml
@@ -59,7 +59,7 @@ tokio-console = ["mz-ore/tokio-console"]
 [dev-dependencies]
 async-trait = "0.1.57"
 axum = "0.5.16"
-clap = { version = "3.2.20", features = ["derive", "env"] }
+clap = { version = "4.0.15", features = ["derive", "env"] }
 criterion = { version = "0.4.0", features = ["html_reports"] }
 datadriven = { version = "0.6.0", features = ["async"] }
 futures-task = "0.3.21"
diff --git a/src/pgtest/Cargo.toml b/src/pgtest/Cargo.toml
index e9037579f431a..9f9e4205bf899 100644
--- a/src/pgtest/Cargo.toml
+++ b/src/pgtest/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.65"
 bytes = "1.2.1"
-clap = { version = "3.2.20", features = ["derive"] }
+clap = { version = "4.0.15", features = ["derive"] }
 datadriven = "0.6.0"
 fallible-iterator = "0.2.0"
 mz-ore = { path = "../ore" }
diff --git a/src/s3-datagen/Cargo.toml b/src/s3-datagen/Cargo.toml
index b44f5096b4c89..788e9c45ca538 100644
--- a/src/s3-datagen/Cargo.toml
+++ b/src/s3-datagen/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = "1.0.65"
 aws-config = { version = "0.49.0", default-features = false, features = ["native-tls"] }
 aws-sdk-s3 = { version = "0.19.0", default-features = false, features = ["native-tls", "rt-tokio"] }
 bytefmt = "0.1.7"
-clap = { version = "3.2.20", features = ["derive"] }
+clap = { version = "4.0.15", features = ["derive"] }
 futures = "0.3.24"
 indicatif = "0.17.1"
 mz-ore = { path = "../ore" }
diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml
index 056534947a3b1..fa308ad8fb54f 100644
--- a/src/service/Cargo.toml
+++ b/src/service/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 anyhow = "1.0.65"
 async-stream = "0.3.3"
 async-trait = "0.1.57"
-clap = { version = "3.2.20", features = ["env", "derive"] }
+clap = { version = "4.0.15", features = ["env", "derive"] }
 crossbeam-channel = "0.5.6"
 futures = "0.3.24"
 http = "0.2.8"
diff --git a/src/sqllogictest/Cargo.toml b/src/sqllogictest/Cargo.toml
index bb5c860cc778f..d17a0af090743 100644
--- a/src/sqllogictest/Cargo.toml
+++ b/src/sqllogictest/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 anyhow = "1.0.65"
 bytes = "1.2.1"
 chrono = { version = "0.4.22", default-features = false, features = ["clock", "std"] }
-clap = { version = "3.2.20", features = ["derive"] }
+clap = { version = "4.0.15", features = ["derive"] }
 fallible-iterator = "0.2.0"
 futures = "0.3.24"
 junit-report = "0.7.1"
diff --git a/src/storaged/Cargo.toml b/src/storaged/Cargo.toml
index 07cf3077ece76..24378dc390e04 100644
--- a/src/storaged/Cargo.toml
+++ b/src/storaged/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.65"
 axum = "0.5.16"
-clap = { version = "3.2.20", features = ["derive", "env"] }
+clap = { version = "4.0.15", features = ["derive", "env"] }
 fail = { version = "0.5.1", features = ["failpoints"] }
 mz-build-info = { path = "../build-info" }
 mz-http-util = { path = "../http-util" }
diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml
index d49ca1f15d8e8..354d9e4ebc9a6 100644
--- a/src/testdrive/Cargo.toml
+++ b/src/testdrive/Cargo.toml
@@ -21,7 +21,7 @@ aws-types = { version = "0.49.0", features = ["hardcoded-credentials"] }
 byteorder = "1.4.3"
 bytes = "1.2.1"
 chrono = { version = "0.4.22", default-features = false, features = ["std"] }
-clap = { version = "3.2.20", features = ["derive"] }
+clap = { version = "4.0.15", features = ["derive"] }
 flate2 = "1.0.24"
 futures = "0.3.24"
 globset = "0.4.9"
diff --git a/test/perf-kinesis/Cargo.toml b/test/perf-kinesis/Cargo.toml
index 69dfac84a046e..ad0e87f4c5968 100644
--- a/test/perf-kinesis/Cargo.toml
+++ b/test/perf-kinesis/Cargo.toml
@@ -12,7 +12,7 @@ aws-config = { version = "0.49.0", default-features = false, features = ["native
 aws-sdk-kinesis = { version = "0.19.0", default-features = false, features = ["native-tls", "rt-tokio"] }
 aws-types = "0.49.0"
 bytes = "1.2.1"
-clap = { version = "3.2.20", features = ["derive"] }
+clap = { version = "4.0.15", features = ["derive"] }
 futures = "0.3.24"
 mz-kinesis-util = { path = "../../src/kinesis-util" }
 mz-ore = { path = "../../src/ore", features = ["task"] }