diff --git a/Cargo.lock b/Cargo.lock index 36b7f7f1e3624..021be28256eb8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,6 +71,55 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse 0.2.1", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse 0.2.1", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "anyhow" version = "1.0.66" @@ -1088,33 +1137,51 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.24" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef2b3ded6a26dfaec672a742c93c8cf6b689220324da509ec5caa20de55dc83" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ - "atty", "bitflags", - "clap_derive", - "clap_lex", + "clap_lex 0.2.2", "indexmap", + "textwrap", +] + +[[package]] +name = "clap" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +dependencies = [ + "clap_builder", + "clap_derive", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex 0.4.1", "strsim", - "termcolor", "terminal_size", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.24" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d756c5824fc5c0c1ee8e36000f576968dbcb2081def956c83fad6f40acd46f96" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.12", ] [[package]] @@ -1126,6 +1193,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + [[package]] name = "cmake" version = "0.1.48" @@ -1145,6 +1218,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "columnation" version = "0.1.0" @@ -1327,7 +1406,7 @@ dependencies = [ "atty", "cast", "ciborium", - "clap", + "clap 3.2.25", "criterion-plot", "futures", "itertools", @@ -2686,6 +2765,18 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -3369,7 +3460,7 @@ version = "0.1.0" dependencies = [ "anyhow", "axum", - "clap", + "clap 4.2.7", "dirs", "indicatif", "mz-build-info", @@ -3605,7 +3696,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "clap", + "clap 4.2.7", "crossbeam-channel", "dec", "differential-dataflow", @@ -3674,7 +3765,7 @@ version = "0.55.0-dev" dependencies = [ "anyhow", "axum", - "clap", + "clap 4.2.7", "fail", "futures", "mz-alloc", @@ -3707,7 +3798,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "clap", + "clap 4.2.7", "crossbeam-channel", "dec", "differential-dataflow", @@ -3832,7 +3923,7 @@ dependencies = [ "bytesize", "cc", "chrono", - "clap", + "clap 4.2.7", "datadriven", "fail", "fallible-iterator", @@ -4052,7 +4143,7 @@ dependencies = [ "anyhow", "byteorder", "chrono", - "clap", + "clap 4.2.7", "criterion", "differential-dataflow", "itertools", @@ -4082,7 +4173,7 @@ version = "0.0.0" dependencies = [ "anyhow", "chrono", - "clap", + "clap 4.2.7", "crossbeam", "mz-avro", "mz-ccsr", @@ -4189,7 +4280,7 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap", + "clap 4.2.7", "fail", "futures", "k8s-openapi", @@ -4240,7 +4331,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "clap", + "clap 4.2.7", "futures-core", "http", "humantime", @@ -4265,7 +4356,7 @@ dependencies = [ "atty", "bytes", "chrono", - "clap", + "clap 4.2.7", "console-subscriber", "ctor", "either", @@ -4352,7 +4443,7 @@ dependencies = [ "async-trait", "axum", "bytes", - "clap", + "clap 4.2.7", "criterion", "datadriven", "differential-dataflow", @@ -4451,7 +4542,7 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap", + "clap 4.2.7", "datadriven", "fallible-iterator", "mz-ore", @@ -4676,7 +4767,7 @@ dependencies = [ "aws-config", "aws-sdk-s3", "bytefmt", - "clap", + "clap 4.2.7", "futures", "indicatif", "mz-aws-s3-util", @@ -4717,7 +4808,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "clap", + "clap 4.2.7", "crossbeam-channel", "futures", "http", @@ -4827,7 +4918,7 @@ dependencies = [ "anyhow", "bytes", "chrono", - "clap", + "clap 4.2.7", "fallible-iterator", "futures", "itertools", @@ -4923,7 +5014,7 @@ name = "mz-stash-debug" version = "0.28.0-dev" dependencies = [ "anyhow", - "clap", + "clap 4.2.7", "mz-adapter", "mz-build-info", "mz-ore", @@ -4949,7 +5040,7 @@ dependencies = [ "axum", "bytesize", "chrono", - "clap", + "clap 4.2.7", "crossbeam-channel", "csv-core", "datadriven", @@ -5113,7 +5204,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "clap", + "clap 4.2.7", "flate2", "futures", "globset", @@ -6057,30 +6148,6 @@ dependencies = [ "toml", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.107", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-hack" version = "0.5.19" @@ -8138,6 +8205,12 @@ name = "utf8parse" version = "0.2.0" source = "git+https://github.com/alacritty/vte#45670c47cebd7af050def2f80a307bdeec7caba3" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "1.2.2" @@ -8179,7 +8252,7 @@ version = "0.10.1" source = "git+https://github.com/alacritty/vte#45670c47cebd7af050def2f80a307bdeec7caba3" dependencies = [ "arrayvec", - "utf8parse", + "utf8parse 0.2.0", "vte_generate_state_changes", ] @@ -8519,7 +8592,7 @@ dependencies = [ "bytes", "cc", "chrono", - "clap", + "clap 4.2.7", "criterion", "crossbeam-channel", "crossbeam-deque", diff --git a/src/cluster/Cargo.toml b/src/cluster/Cargo.toml index 5d4cede0555fe..27c96eb971800 100644 --- a/src/cluster/Cargo.toml +++ b/src/cluster/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-trait = "0.1.68" bytesize = "1.1.0" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.2.7", features = ["derive", "env"] } crossbeam-channel = "0.5.8" dec = { version = "0.4.8", features = ["serde"] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } diff --git a/src/clusterd/Cargo.toml b/src/clusterd/Cargo.toml index 75b08bae2cf8b..f1325fef3bbc4 100644 --- a/src/clusterd/Cargo.toml +++ b/src/clusterd/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" axum = "0.6.7" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.2.7", features = ["derive", "env"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" mz-alloc = { path = "../alloc" } diff --git a/src/compute/Cargo.toml b/src/compute/Cargo.toml index 229738d786843..c1b231a8571e7 100644 --- a/src/compute/Cargo.toml +++ b/src/compute/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-trait = "0.1.68" bytesize = "1.1.0" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.2.7", features = ["derive", "env"] } crossbeam-channel = "0.5.8" 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 b595abf62302e..af300876ef743 100644 --- a/src/environmentd/Cargo.toml +++ b/src/environmentd/Cargo.toml @@ -17,7 +17,7 @@ base64 = "0.13.1" bytes = "1.3.0" bytesize = "1.1.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["wrap_help", "env", "derive"] } +clap = { version = "4.2.7", features = ["wrap_help", "env", "derive"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" headers = "0.3.8" diff --git a/src/interchange/Cargo.toml b/src/interchange/Cargo.toml index 1d01bc7ce2091..4ac84d6f0fd9d 100644 --- a/src/interchange/Cargo.toml +++ b/src/interchange/Cargo.toml @@ -15,7 +15,7 @@ harness = false anyhow = "1.0.66" byteorder = "1.4.3" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.2.7", features = ["derive"] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } itertools = "0.10.5" once_cell = "1.16.0" diff --git a/src/kafka-util/Cargo.toml b/src/kafka-util/Cargo.toml index b52201bc3b4ee..9e22e49c9b937 100644 --- a/src/kafka-util/Cargo.toml +++ b/src/kafka-util/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.2.7", 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 b049e881bc8df..a4cbffb73d25a 100644 --- a/src/mz/Cargo.toml +++ b/src/mz/Cargo.toml @@ -9,7 +9,7 @@ rust-version.workspace = true [dependencies] anyhow = "1.0.66" axum = { version = "0.6.7" } -clap = { version = "3.2.24", features = [ "derive" ] } +clap = { version = "4.2.7", features = [ "derive" ] } dirs = "4.0.0" indicatif = "0.17.2" mz-build-info = { path = "../build-info" } diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml index 18a74232dc837..1bda89cc4fe93 100644 --- a/src/orchestrator-kubernetes/Cargo.toml +++ b/src/orchestrator-kubernetes/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-trait = "0.1.68" chrono = { version = "0.4.23", default-features = false } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.2.7", features = ["derive"] } fail = { version = "0.5.1", features = ["failpoints"] } futures = "0.3.25" maplit = "1.0.2" diff --git a/src/orchestrator-tracing/Cargo.toml b/src/orchestrator-tracing/Cargo.toml index c0b3f2639a43e..18f1daeed777c 100644 --- a/src/orchestrator-tracing/Cargo.toml +++ b/src/orchestrator-tracing/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" async-trait = "0.1.68" -clap = { version = "3.2.24", features = ["env", "derive"] } +clap = { version = "4.2.7", features = ["env", "derive"] } futures-core = "0.3.21" http = "0.2.8" humantime = { version = "2.1.0", optional = true } diff --git a/src/ore/Cargo.toml b/src/ore/Cargo.toml index 28ed001f56b9b..62769ea40fa65 100644 --- a/src/ore/Cargo.toml +++ b/src/ore/Cargo.toml @@ -18,7 +18,7 @@ anyhow = { version = "1.0.66", optional = true } async-trait = { version = "0.1.68", optional = true } bytes = { version = "1.3.0", optional = true } chrono = { version = "0.4.23", default-features = false, features = ["std"], optional = true } -clap = { version = "3.2.24", features = ["env"], optional = true } +clap = { version = "4.2.7", features = ["env"], optional = true } ctor = { version = "0.1.26", optional = true } either = "1.8.0" futures = { version = "0.3.25", optional = true } diff --git a/src/persist-client/Cargo.toml b/src/persist-client/Cargo.toml index a67659aa58c20..cd28ea5880dc1 100644 --- a/src/persist-client/Cargo.toml +++ b/src/persist-client/Cargo.toml @@ -33,7 +33,7 @@ anyhow = { version = "1.0.66", features = ["backtrace"] } async-stream = "0.3.3" async-trait = "0.1.68" bytes = "1.3.0" -clap = { version = "3.2.24", features = [ "derive" ] } +clap = { version = "4.2.7", features = [ "derive" ] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } futures = "0.3.25" futures-util = "0.3" @@ -67,7 +67,7 @@ tokio-console = ["mz-ore/tokio-console"] [dev-dependencies] async-trait = "0.1.68" axum = { version = "0.6.7" } -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.2.7", 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 10c349bc3b752..153c1812f33ef 100644 --- a/src/pgtest/Cargo.toml +++ b/src/pgtest/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] anyhow = "1.0.66" bytes = "1.3.0" -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.2.7", features = ["derive"] } datadriven = "0.6.0" fallible-iterator = "0.2.0" mz-ore = { path = "../ore", features = ["cli"] } diff --git a/src/s3-datagen/Cargo.toml b/src/s3-datagen/Cargo.toml index e10adae824cb5..75b1612d1c8fd 100644 --- a/src/s3-datagen/Cargo.toml +++ b/src/s3-datagen/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0.66" aws-config = { version = "0.55", default-features = false, features = ["native-tls"] } aws-sdk-s3 = { version = "0.26", default-features = false, features = ["native-tls", "rt-tokio"] } bytefmt = "0.1.7" -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.2.7", features = ["derive"] } futures = "0.3.25" indicatif = "0.17.2" mz-aws-s3-util = { path = "../aws-s3-util" } diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index c9bd084939c88..43bcfd43f4aa8 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" async-stream = "0.3.3" async-trait = "0.1.68" -clap = { version = "3.2.24", features = ["env", "derive"] } +clap = { version = "4.2.7", features = ["env", "derive"] } crossbeam-channel = "0.5.8" futures = "0.3.25" http = "0.2.8" diff --git a/src/sqllogictest/Cargo.toml b/src/sqllogictest/Cargo.toml index 9554de6045313..023d67c2c66c9 100644 --- a/src/sqllogictest/Cargo.toml +++ b/src/sqllogictest/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0.66" bytes = "1.3.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.2.7", features = ["derive"] } fallible-iterator = "0.2.0" futures = "0.3.25" itertools = "0.10.5" diff --git a/src/stash-debug/Cargo.toml b/src/stash-debug/Cargo.toml index 07123776627f5..f1a0f36810c09 100644 --- a/src/stash-debug/Cargo.toml +++ b/src/stash-debug/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] anyhow = "1.0.66" -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.2.7", features = ["derive", "env"] } mz-adapter = { path = "../adapter" } mz-build-info = { path = "../build-info" } mz-ore = { path = "../ore" } diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml index 2adf5810326e5..efe075a054c70 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -16,7 +16,7 @@ async-stream = "0.3.3" async-trait = "0.1.68" bytesize = "1.1.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.2.7", features = ["derive", "env"] } crossbeam-channel = "0.5.8" csv-core = { version = "0.1.10" } dec = "0.4.8" @@ -82,7 +82,7 @@ tonic-build = "0.8.2" [dev-dependencies] async-trait = "0.1.68" axum = { version = "0.6.7" } -clap = { version = "3.2.24", features = ["derive", "env"] } +clap = { version = "4.2.7", features = ["derive", "env"] } datadriven = { version = "0.6.0", features = ["async"] } humantime = "2.1.0" mz-http-util = { path = "../http-util" } diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml index a110e133b7317..8f80d8ca74033 100644 --- a/src/testdrive/Cargo.toml +++ b/src/testdrive/Cargo.toml @@ -18,7 +18,7 @@ aws-types = "0.55" byteorder = "1.4.3" bytes = "1.3.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.24", features = ["derive"] } +clap = { version = "4.2.7", features = ["derive"] } flate2 = "1.0.24" futures = "0.3.25" globset = "0.4.9" diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 13274916ef121..8d15ce19d89c1 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -26,7 +26,7 @@ bstr = { version = "0.2.14" } byteorder = { version = "1.4.3" } bytes = { version = "1.3.0" } chrono = { git = "https://github.com/chronotope/chrono.git", branch = "0.4.x", default-features = false, features = ["alloc", "clock", "serde"] } -clap = { version = "3.2.24", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.2.7", features = ["derive", "env", "wrap_help"] } criterion = { version = "0.4.0", features = ["async_tokio", "html_reports"] } crossbeam-channel = { version = "0.5.8" } crossbeam-deque = { version = "0.8.2" } @@ -123,7 +123,7 @@ byteorder = { version = "1.4.3" } bytes = { version = "1.3.0" } cc = { version = "1.0.78", default-features = false, features = ["parallel"] } chrono = { git = "https://github.com/chronotope/chrono.git", branch = "0.4.x", default-features = false, features = ["alloc", "clock", "serde"] } -clap = { version = "3.2.24", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.2.7", features = ["derive", "env", "wrap_help"] } criterion = { version = "0.4.0", features = ["async_tokio", "html_reports"] } crossbeam-channel = { version = "0.5.8" } crossbeam-deque = { version = "0.8.2" }