From 9f3536e1d73e247c71dcbed0c5c3c3ba81cd55c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 23 Oct 2022 22:09:21 +0000
Subject: [PATCH] build(deps): bump clap from 3.2.17 to 4.0.18

Bumps [clap](https://github.com/clap-rs/clap) from 3.2.17 to 4.0.18.
- [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.17...v4.0.18)

---
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                             | 131 +++++++++++++++++++------
 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, 118 insertions(+), 45 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 313e3c3344c8f..dac646f6b10c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1008,27 +1008,37 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.17"
+version = "3.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b"
+checksum = "1ed5341b2301a26ab80be5cbdced622e80ed808483c52e45e3310a877d3b37d7"
+dependencies = [
+ "bitflags",
+ "clap_lex 0.2.2",
+ "indexmap",
+ "textwrap",
+]
+
+[[package]]
+name = "clap"
+version = "4.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b"
 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.17"
+version = "4.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa"
+checksum = "16a1b0f6422af32d5da0c58e2703320f379216ee70198241c84173a8c5ac28f3"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -1046,6 +1056,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"
@@ -1112,7 +1131,7 @@ dependencies = [
  "encode_unicode",
  "libc",
  "once_cell",
- "terminal_size",
+ "terminal_size 0.1.17",
  "unicode-width",
  "winapi",
 ]
@@ -1241,7 +1260,7 @@ dependencies = [
  "atty",
  "cast",
  "ciborium",
- "clap",
+ "clap 3.2.21",
  "criterion-plot",
  "futures",
  "itertools",
@@ -1781,6 +1800,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 = "fail"
 version = "0.5.0"
@@ -2441,6 +2481,12 @@ dependencies = [
  "futures-util",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e481ccbe3dea62107216d0d1138bb8ad8e5e5c43009a098bd1990272c497b0"
+
 [[package]]
 name = "ipnet"
 version = "2.5.0"
@@ -2803,6 +2849,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"
@@ -3012,7 +3064,7 @@ name = "mz"
 version = "0.0.0"
 dependencies = [
  "axum",
- "clap",
+ "clap 4.0.18",
  "dirs",
  "indicatif",
  "mz-ore",
@@ -3131,7 +3183,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "chrono",
- "clap",
+ "clap 4.0.18",
  "hex",
  "mz-ore",
  "mz-test-util",
@@ -3182,7 +3234,7 @@ version = "0.26.1-dev"
 dependencies = [
  "anyhow",
  "axum",
- "clap",
+ "clap 4.0.18",
  "crossbeam-channel",
  "dec",
  "differential-dataflow",
@@ -3287,7 +3339,7 @@ dependencies = [
  "bytes",
  "cc",
  "chrono",
- "clap",
+ "clap 4.0.18",
  "datadriven",
  "fail",
  "fallible-iterator",
@@ -3487,7 +3539,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "chrono",
- "clap",
+ "clap 4.0.18",
  "crossbeam",
  "mz-avro",
  "mz-ccsr",
@@ -3593,7 +3645,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "chrono",
- "clap",
+ "clap 4.0.18",
  "futures",
  "k8s-openapi",
  "kube",
@@ -3634,7 +3686,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap",
+ "clap 4.0.18",
  "futures-core",
  "http",
  "mz-orchestrator",
@@ -3654,7 +3706,7 @@ dependencies = [
  "atty",
  "bytes",
  "chrono",
- "clap",
+ "clap 4.0.18",
  "console-subscriber",
  "ctor",
  "either",
@@ -3693,7 +3745,7 @@ dependencies = [
  "aws-sdk-kinesis",
  "aws-types",
  "bytes",
- "clap",
+ "clap 4.0.18",
  "futures",
  "mz-kinesis-util",
  "mz-ore",
@@ -3755,7 +3807,7 @@ dependencies = [
  "async-trait",
  "axum",
  "bytes",
- "clap",
+ "clap 4.0.18",
  "criterion",
  "datadriven",
  "differential-dataflow",
@@ -3824,7 +3876,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "bytes",
- "clap",
+ "clap 4.0.18",
  "datadriven",
  "fallible-iterator",
  "mz-ore",
@@ -3990,7 +4042,7 @@ dependencies = [
  "aws-config",
  "aws-sdk-s3",
  "bytefmt",
- "clap",
+ "clap 4.0.18",
  "futures",
  "indicatif",
  "mz-ore",
@@ -4015,7 +4067,7 @@ dependencies = [
  "anyhow",
  "async-stream",
  "async-trait",
- "clap",
+ "clap 4.0.18",
  "crossbeam-channel",
  "futures",
  "http",
@@ -4103,7 +4155,7 @@ dependencies = [
  "anyhow",
  "bytes",
  "chrono",
- "clap",
+ "clap 4.0.18",
  "fallible-iterator",
  "futures",
  "junit-report",
@@ -4237,7 +4289,7 @@ version = "0.26.1-dev"
 dependencies = [
  "anyhow",
  "axum",
- "clap",
+ "clap 4.0.18",
  "fail",
  "mz-build-info",
  "mz-http-util",
@@ -4288,7 +4340,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "chrono",
- "clap",
+ "clap 4.0.18",
  "flate2",
  "futures",
  "globset",
@@ -5649,6 +5701,20 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.35.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72c825b8aa8010eb9ee99b75f05e10180b9278d161583034d7574c9d617aeada"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.11"
@@ -6188,14 +6254,21 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8440c860cf79def6164e4a0a983bcc2305d82419177a0e0c71930d049e3ac5a1"
+dependencies = [
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-dependencies = [
- "terminal_size",
-]
 
 [[package]]
 name = "thiserror"
diff --git a/src/billing-demo/Cargo.toml b/src/billing-demo/Cargo.toml
index c13ff3c61aa16..8f16d477b36ca 100644
--- a/src/billing-demo/Cargo.toml
+++ b/src/billing-demo/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.62"
 chrono = { version = "0.4.20", default-features = false, features = ["clock", "std"] }
-clap = { version = "3.2.17", features = ["derive"] }
+clap = { version = "4.0.18", 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 5447cb71a9b8d..e028ca4636ecc 100644
--- a/src/compute/Cargo.toml
+++ b/src/compute/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.62"
 axum = "0.5.15"
-clap = { version = "3.2.17", features = ["derive", "env"] }
+clap = { version = "4.0.18", 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 0b56f2497f1ab..c22bbbebd8992 100644
--- a/src/environmentd/Cargo.toml
+++ b/src/environmentd/Cargo.toml
@@ -16,7 +16,7 @@ axum = { version = "0.5.15", features = ["headers"] }
 base64 = "0.13.0"
 bytes = "1.2.1"
 chrono = { version = "0.4.20", default-features = false, features = ["std"] }
-clap = { version = "3.2.17", features = ["wrap_help", "env", "derive"] }
+clap = { version = "4.0.18", features = ["wrap_help", "env", "derive"] }
 fail = { version = "0.5.0", features = ["failpoints"] }
 futures = "0.3.23"
 headers = "0.3.7"
diff --git a/src/kafka-util/Cargo.toml b/src/kafka-util/Cargo.toml
index bc941a254de42..841b4fe5aab32 100644
--- a/src/kafka-util/Cargo.toml
+++ b/src/kafka-util/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.62"
 chrono = { version = "0.4.20", default-features = false, features = ["clock", "std"] }
-clap = { version = "3.2.17", features = ["derive"] }
+clap = { version = "4.0.18", 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 6b920e2f6af37..a893f70402ee5 100644
--- a/src/mz/Cargo.toml
+++ b/src/mz/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 
 [dependencies]
 serde = { version = "1.0.144", features = ["derive"] }
-clap = { version = "3.2.17", features = [ "derive" ] }
+clap = { version = "4.0.18", features = [ "derive" ] }
 tokio = { version = "1.19.2", features = ["full"] }
 open = "3.0.2"
 axum = "0.5.15"
diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml
index 9d0d415c94ba7..05bbb5cd556f1 100644
--- a/src/orchestrator-kubernetes/Cargo.toml
+++ b/src/orchestrator-kubernetes/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 anyhow = "1.0.62"
 async-trait = "0.1.57"
 chrono = { version = "0.4.20", default-features = false }
-clap = { version = "3.2.17", features = ["derive"] }
+clap = { version = "4.0.18", features = ["derive"] }
 futures = "0.3.23"
 maplit = "1.0.2"
 mz-orchestrator = { path = "../orchestrator" }
diff --git a/src/orchestrator-tracing/Cargo.toml b/src/orchestrator-tracing/Cargo.toml
index d464993ea7874..6727c7cfb8403 100644
--- a/src/orchestrator-tracing/Cargo.toml
+++ b/src/orchestrator-tracing/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.62"
 async-trait = "0.1.57"
-clap = { version = "3.2.17", features = ["env", "derive"] }
+clap = { version = "4.0.18", features = ["env", "derive"] }
 futures-core = "0.3.21"
 http = "0.2.8"
 mz-orchestrator = { path = "../orchestrator" }
diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml
index 9b44b0a64fdad..cd5ea28014c34 100644
--- a/src/ore/Cargo.toml
+++ b/src/ore/Cargo.toml
@@ -18,7 +18,7 @@ anyhow = { version = "1.0.62", optional = true }
 async-trait = { version = "0.1.57", optional = true }
 bytes = { version = "1.2.1", optional = true }
 chrono = { version = "0.4.20", default-features = false, features = ["std"], optional = true }
-clap = { version = "3.2.17", features = ["env"], optional = true }
+clap = { version = "4.0.18", features = ["env"], optional = true }
 ctor = { version = "0.1.23", optional = true }
 either = "1.8.0"
 futures = { version = "0.3.23", optional = true }
diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml
index 71edeba8a2e87..e7fd6379419e5 100644
--- a/src/persist-client/Cargo.toml
+++ b/src/persist-client/Cargo.toml
@@ -58,7 +58,7 @@ tokio-console = ["mz-ore/tokio-console"]
 [dev-dependencies]
 async-trait = "0.1.57"
 axum = "0.5.15"
-clap = { version = "3.2.17", features = ["derive", "env"] }
+clap = { version = "4.0.18", features = ["derive", "env"] }
 criterion = { git = "https://github.com/bheisler/criterion.rs.git", branch = "version-0.4", 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 5b8fd138ccc16..4b79bd5908b08 100644
--- a/src/pgtest/Cargo.toml
+++ b/src/pgtest/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.62"
 bytes = "1.2.1"
-clap = { version = "3.2.17", features = ["derive"] }
+clap = { version = "4.0.18", 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 e0ee2af84dd52..ce6d976046360 100644
--- a/src/s3-datagen/Cargo.toml
+++ b/src/s3-datagen/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = "1.0.62"
 aws-config = { version = "0.47.0", default-features = false, features = ["native-tls"] }
 aws-sdk-s3 = { version = "0.17.0", default-features = false, features = ["native-tls", "rt-tokio"] }
 bytefmt = "0.1.7"
-clap = { version = "3.2.17", features = ["derive"] }
+clap = { version = "4.0.18", features = ["derive"] }
 futures = "0.3.23"
 indicatif = "0.17.0"
 mz-ore = { path = "../ore" }
diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml
index 19e004ebc5b3a..39540741a8d92 100644
--- a/src/service/Cargo.toml
+++ b/src/service/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 anyhow = "1.0.62"
 async-stream = "0.3.3"
 async-trait = "0.1.57"
-clap = { version = "3.2.17", features = ["env", "derive"] }
+clap = { version = "4.0.18", features = ["env", "derive"] }
 crossbeam-channel = "0.5.6"
 futures = "0.3.23"
 http = "0.2.8"
diff --git a/src/sqllogictest/Cargo.toml b/src/sqllogictest/Cargo.toml
index e883ef55363e3..9f552a30cd2b1 100644
--- a/src/sqllogictest/Cargo.toml
+++ b/src/sqllogictest/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 anyhow = "1.0.62"
 bytes = "1.2.1"
 chrono = { version = "0.4.20", default-features = false, features = ["clock", "std"] }
-clap = { version = "3.2.17", features = ["derive"] }
+clap = { version = "4.0.18", features = ["derive"] }
 fallible-iterator = "0.2.0"
 futures = "0.3.23"
 junit-report = "0.7.1"
diff --git a/src/storaged/Cargo.toml b/src/storaged/Cargo.toml
index 2c4ea3086be70..ea1fa9bb89841 100644
--- a/src/storaged/Cargo.toml
+++ b/src/storaged/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.62"
 axum = "0.5.15"
-clap = { version = "3.2.17", features = ["derive", "env"] }
+clap = { version = "4.0.18", features = ["derive", "env"] }
 fail = { version = "0.5.0", 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 3aac6fc28d6a9..c65703373e4d8 100644
--- a/src/testdrive/Cargo.toml
+++ b/src/testdrive/Cargo.toml
@@ -21,7 +21,7 @@ aws-types = { version = "0.47.0", features = ["hardcoded-credentials"] }
 byteorder = "1.4.3"
 bytes = "1.2.1"
 chrono = { version = "0.4.20", default-features = false, features = ["std"] }
-clap = { version = "3.2.17", features = ["derive"] }
+clap = { version = "4.0.18", features = ["derive"] }
 flate2 = "1.0.24"
 futures = "0.3.23"
 globset = "0.4.9"
diff --git a/test/perf-kinesis/Cargo.toml b/test/perf-kinesis/Cargo.toml
index 37b26b1c123a8..dab82333ddf1b 100644
--- a/test/perf-kinesis/Cargo.toml
+++ b/test/perf-kinesis/Cargo.toml
@@ -12,7 +12,7 @@ aws-config = { version = "0.47.0", default-features = false, features = ["native
 aws-sdk-kinesis = { version = "0.17.0", default-features = false, features = ["native-tls", "rt-tokio"] }
 aws-types = "0.47.0"
 bytes = "1.2.1"
-clap = { version = "3.2.17", features = ["derive"] }
+clap = { version = "4.0.18", features = ["derive"] }
 futures = "0.3.23"
 mz-kinesis-util = { path = "../../src/kinesis-util" }
 mz-ore = { path = "../../src/ore", features = ["task"] }