diff --git a/Cargo.lock b/Cargo.lock index 8a375b7ddca71..4eae8bddcfd61 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.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ed45cc2c62a3eff523e718d8576ba762c83a3146151093283ac62ae11933a73" 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.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "db342ce9fda24fb191e2ed4e102055a4d381c1086a06630174cd8da8d5d917ce" 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.11", "dirs", "indicatif", "mz-ore", @@ -3119,7 +3171,7 @@ version = "0.0.0" dependencies = [ "anyhow", "chrono", - "clap", + "clap 4.0.11", "hex", "mz-ore", "mz-test-util", @@ -3172,7 +3224,7 @@ dependencies = [ "async-trait", "axum", "bytesize", - "clap", + "clap 4.0.11", "crossbeam-channel", "dec", "differential-dataflow", @@ -3274,7 +3326,7 @@ dependencies = [ "bytes", "cc", "chrono", - "clap", + "clap 4.0.11", "datadriven", "fail", "fallible-iterator", @@ -3478,7 +3530,7 @@ version = "0.0.0" dependencies = [ "anyhow", "chrono", - "clap", + "clap 4.0.11", "crossbeam", "mz-avro", "mz-ccsr", @@ -3584,7 +3636,7 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap", + "clap 4.0.11", "futures", "k8s-openapi", "kube", @@ -3625,7 +3677,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "clap", + "clap 4.0.11", "futures-core", "http", "humantime", @@ -3646,7 +3698,7 @@ dependencies = [ "atty", "bytes", "chrono", - "clap", + "clap 4.0.11", "console-subscriber", "ctor", "either", @@ -3686,7 +3738,7 @@ dependencies = [ "aws-sdk-kinesis", "aws-types", "bytes", - "clap", + "clap 4.0.11", "futures", "mz-kinesis-util", "mz-ore", @@ -3748,7 +3800,7 @@ dependencies = [ "async-trait", "axum", "bytes", - "clap", + "clap 4.0.11", "criterion", "datadriven", "differential-dataflow", @@ -3818,7 +3870,7 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap", + "clap 4.0.11", "datadriven", "fallible-iterator", "mz-ore", @@ -3993,7 +4045,7 @@ dependencies = [ "aws-config", "aws-sdk-s3", "bytefmt", - "clap", + "clap 4.0.11", "futures", "indicatif", "mz-ore", @@ -4030,7 +4082,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "clap", + "clap 4.0.11", "crossbeam-channel", "futures", "http", @@ -4122,7 +4174,7 @@ dependencies = [ "anyhow", "bytes", "chrono", - "clap", + "clap 4.0.11", "fallible-iterator", "futures", "junit-report", @@ -4256,7 +4308,7 @@ version = "0.27.0-alpha.24.post" dependencies = [ "anyhow", "axum", - "clap", + "clap 4.0.11", "fail", "mz-build-info", "mz-http-util", @@ -4307,7 +4359,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "clap", + "clap 4.0.11", "flate2", "futures", "globset", @@ -5698,6 +5750,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" @@ -6253,14 +6319,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.35" diff --git a/src/billing-demo/Cargo.toml b/src/billing-demo/Cargo.toml index 462bb31e32c56..5c79aceca4aaa 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.11", 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 61dc90129fde6..226edbc0f7fbe 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.11", 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 524fa69cde179..c1fefca3e2608 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.11", features = ["wrap_help", "env", "derive"] } fail = { version = "0.5.0", 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 783854ae17f88..9edc81fe8d599 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.11", 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 ce8977dcaa5c3..c7b73a044e5ce 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.20", features = [ "derive" ] } +clap = { version = "4.0.11", features = [ "derive" ] } tokio = { version = "1.19.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 9b509e7d9cdc0..3ecfa5aeb2d1d 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.11", 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 bd823071f236c..c49fb2f356f54 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.11", 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 e208a77a6dba4..be66ef62d42ff 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.11", 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 871aed38fdb95..4e148c5a42ab0 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.11", 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 61ae916876310..e2c49538aebf7 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.11", 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 36d6a0913a0b0..78e66bb0eb7c6 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.48.0", default-features = false, features = ["native-tls"] } aws-sdk-s3 = { version = "0.18.0", default-features = false, features = ["native-tls", "rt-tokio"] } bytefmt = "0.1.7" -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.11", 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 2f49959e75f14..04b6e5f4adf03 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.11", 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 6867d7993496e..c47e46cde66df 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.11", 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 58848d5e9106f..70f39e7b8b112 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.11", 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 f1fdcf907a091..6c7d2d5662638 100644 --- a/src/testdrive/Cargo.toml +++ b/src/testdrive/Cargo.toml @@ -21,7 +21,7 @@ aws-types = { version = "0.48.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.11", 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 7c20bc639f1d1..6ad80da7e7070 100644 --- a/test/perf-kinesis/Cargo.toml +++ b/test/perf-kinesis/Cargo.toml @@ -12,7 +12,7 @@ aws-config = { version = "0.48.0", default-features = false, features = ["native aws-sdk-kinesis = { version = "0.18.0", default-features = false, features = ["native-tls", "rt-tokio"] } aws-types = "0.48.0" bytes = "1.2.1" -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.0.11", features = ["derive"] } futures = "0.3.24" mz-kinesis-util = { path = "../../src/kinesis-util" } mz-ore = { path = "../../src/ore", features = ["task"] }