diff --git a/Cargo.lock b/Cargo.lock index 313e3c3344c8f..d40625c5127be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1008,9 +1008,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.17" +version = "3.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b" +checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" dependencies = [ "atty", "bitflags", @@ -1020,15 +1020,15 @@ dependencies = [ "once_cell", "strsim", "termcolor", - "terminal_size", + "terminal_size 0.2.1", "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.17" +version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ "heck", "proc-macro-error", @@ -1112,7 +1112,7 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "terminal_size", + "terminal_size 0.1.17", "unicode-width", "winapi", ] @@ -1781,6 +1781,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 +2462,12 @@ dependencies = [ "futures-util", ] +[[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" @@ -2803,6 +2830,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" @@ -5649,6 +5682,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,13 +6235,23 @@ 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" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" dependencies = [ - "terminal_size", + "terminal_size 0.2.1", ] [[package]] diff --git a/src/billing-demo/Cargo.toml b/src/billing-demo/Cargo.toml index c13ff3c61aa16..553f272f6a575 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 = "3.2.22", 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..d988d7080dfa3 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 = "3.2.22", 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..1d6a17cb33690 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 = "3.2.22", 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..f881642cf7665 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 = "3.2.22", 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..cf00bba6bc920 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 = "3.2.22", 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..df633edd92239 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 = "3.2.22", 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..0d90174eb471b 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 = "3.2.22", 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..42674bff53368 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 = "3.2.22", 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..c8c8576442a50 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 = "3.2.22", 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..a1bd25041d1e3 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 = "3.2.22", 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..fb5d2a9a2a0bb 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 = "3.2.22", 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..0118d259f25cb 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 = "3.2.22", 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..456ee82c802ee 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 = "3.2.22", 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..69e816e000831 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 = "3.2.22", 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..a5610ca3adb42 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 = "3.2.22", 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..9b8de1d6f4b95 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 = "3.2.22", features = ["derive"] } futures = "0.3.23" mz-kinesis-util = { path = "../../src/kinesis-util" } mz-ore = { path = "../../src/ore", features = ["task"] }