diff --git a/Cargo.lock b/Cargo.lock index 1090e96d03d84..932531a60557a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,6 +56,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -71,6 +77,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" @@ -112,7 +167,7 @@ dependencies = [ "arrow-format", "base64 0.13.1", "bytemuck", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "dyn-clone", "either", "ethnum", @@ -253,7 +308,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.6", "libc", "winapi", ] @@ -1007,11 +1062,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" -source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#895d3b867ff318b5866cad7684d26279a45bc114" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "winapi", +] + +[[package]] +name = "chrono" +version = "0.4.26" +source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#fb220c8ab9f0a627fd3230700ac2fbc50538d2d7" +dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", "serde", "winapi", @@ -1023,7 +1091,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa48fa079165080f11d7753fd0bc175b7d391f276b965fe4b55bfad67856e463" dependencies = [ - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "chrono-tz-build", "phf", "serde", @@ -1088,33 +1156,51 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.20" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ - "atty", "bitflags", - "clap_derive", - "clap_lex", + "clap_lex 0.2.2", "indexmap", + "textwrap 0.16.0", +] + +[[package]] +name = "clap" +version = "4.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" +dependencies = [ + "clap_builder", + "clap_derive", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex 0.5.0", "strsim", - "termcolor", - "terminal_size", - "textwrap", + "terminal_size 0.2.6", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.12", ] [[package]] @@ -1126,6 +1212,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + [[package]] name = "cmake" version = "0.1.48" @@ -1145,6 +1237,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" @@ -1179,7 +1277,7 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "terminal_size", + "terminal_size 0.1.17", "unicode-width", "winapi", ] @@ -1328,7 +1426,7 @@ dependencies = [ "atty", "cast", "ciborium", - "clap", + "clap 3.2.25", "criterion-plot", "futures", "itertools", @@ -1950,6 +2048,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -2429,6 +2538,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -2671,6 +2786,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 0.37.7", + "windows-sys 0.48.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -2762,7 +2889,7 @@ checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ "base64 0.13.1", "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "http", "percent-encoding", "serde", @@ -2792,7 +2919,7 @@ checksum = "e80db3ca107e89da5f7eae37ea5274e06cefdcf9689d0ebd5ec3575a6f983e4e" dependencies = [ "base64 0.13.1", "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "dirs-next", "either", "futures", @@ -2827,7 +2954,7 @@ version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce686d2fbdaf6cb18d19cdb0692e9485dd9945f79f944b8772bdb2a07e8d39d" dependencies = [ - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "form_urlencoded", "http", "json-patch", @@ -2882,7 +3009,7 @@ version = "1.0.0" source = "git+https://github.com/MaterializeInc/rust-server-sdk#dcda26dad12a871795a6958ef238536c27c67164" dependencies = [ "built", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel", "data-encoding", "eventsource-client", @@ -2911,7 +3038,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c27dd31ce69c55fca526d1c22c2dcca96fd0c98e496529d37eeef6c41652173" dependencies = [ "base16ct", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "itertools", "lazy_static", "log", @@ -3082,6 +3209,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + [[package]] name = "lock_api" version = "0.4.6" @@ -3342,7 +3475,7 @@ version = "0.1.0" dependencies = [ "anyhow", "axum", - "clap", + "clap 4.3.4", "dirs", "indicatif", "mz-build-info", @@ -3369,7 +3502,7 @@ dependencies = [ "anyhow", "bytes", "bytesize", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "const_format", "criterion", "datadriven", @@ -3461,7 +3594,7 @@ version = "0.7.0" dependencies = [ "anyhow", "byteorder", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "crc32fast", "digest", "enum-kinds", @@ -3560,7 +3693,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "clap", + "clap 4.3.4", "crossbeam-channel", "dec", "differential-dataflow", @@ -3596,7 +3729,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "http", "itertools", @@ -3628,7 +3761,7 @@ version = "0.53.0-dev" dependencies = [ "anyhow", "axum", - "clap", + "clap 4.3.4", "fail", "futures", "mz-alloc", @@ -3661,7 +3794,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "clap", + "clap 4.3.4", "crossbeam-channel", "dec", "differential-dataflow", @@ -3700,7 +3833,7 @@ dependencies = [ "async-stream", "async-trait", "bytesize", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "columnation", "differential-dataflow", "futures", @@ -3745,7 +3878,7 @@ name = "mz-controller" version = "0.0.0" dependencies = [ "anyhow", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "differential-dataflow", "futures", "mz-build-info", @@ -3784,8 +3917,8 @@ dependencies = [ "bytes", "bytesize", "cc", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.4", "datadriven", "fail", "fallible-iterator", @@ -3879,7 +4012,7 @@ dependencies = [ "anyhow", "bytes", "bytesize", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "criterion", "csv", "datadriven", @@ -3985,8 +4118,8 @@ version = "0.0.0" dependencies = [ "anyhow", "byteorder", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.4", "criterion", "differential-dataflow", "itertools", @@ -4015,8 +4148,8 @@ name = "mz-kafka-util" version = "0.0.0" dependencies = [ "anyhow", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.4", "crossbeam", "mz-avro", "mz-ccsr", @@ -4105,7 +4238,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "derivative", "futures-core", "mz-ore", @@ -4122,8 +4255,8 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.4", "fail", "futures", "k8s-openapi", @@ -4147,7 +4280,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "hex", "itertools", @@ -4174,7 +4307,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "clap", + "clap 4.3.4", "futures-core", "http", "humantime", @@ -4198,8 +4331,8 @@ dependencies = [ "async-trait", "atty", "bytes", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.4", "console-subscriber", "ctor", "either", @@ -4286,7 +4419,7 @@ dependencies = [ "async-trait", "axum", "bytes", - "clap", + "clap 4.3.4", "criterion", "datadriven", "differential-dataflow", @@ -4356,7 +4489,7 @@ version = "0.0.0" dependencies = [ "byteorder", "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "dec", "mz-ore", "mz-pgrepr-consts", @@ -4380,7 +4513,7 @@ version = "0.0.0" dependencies = [ "anyhow", "bytes", - "clap", + "clap 4.3.4", "datadriven", "fallible-iterator", "mz-ore", @@ -4512,7 +4645,7 @@ dependencies = [ "anyhow", "bitflags", "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "chrono-tz", "columnation", "criterion", @@ -4559,7 +4692,7 @@ dependencies = [ name = "mz-repr-test-util" version = "0.0.0" dependencies = [ - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "datadriven", "mz-lowertest", "mz-ore", @@ -4594,7 +4727,7 @@ dependencies = [ "aws-config", "aws-sdk-s3", "bytefmt", - "clap", + "clap 4.3.4", "futures", "indicatif", "mz-aws-s3-util", @@ -4635,7 +4768,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "clap", + "clap 4.3.4", "crossbeam-channel", "futures", "http", @@ -4668,7 +4801,7 @@ dependencies = [ "anyhow", "aws-sdk-sts", "bitflags", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "const_format", "datadriven", "enum-kinds", @@ -4741,8 +4874,8 @@ version = "0.0.1" dependencies = [ "anyhow", "bytes", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.4", "fallible-iterator", "futures", "itertools", @@ -4831,7 +4964,7 @@ name = "mz-stash-debug" version = "0.28.0-dev" dependencies = [ "anyhow", - "clap", + "clap 4.3.4", "mz-adapter", "mz-build-info", "mz-ore", @@ -4856,8 +4989,8 @@ dependencies = [ "async-trait", "axum", "bytesize", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.4", "crossbeam-channel", "csv-core", "datadriven", @@ -4936,7 +5069,7 @@ dependencies = [ "aws-credential-types", "aws-types", "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "dec", "derivative", "differential-dataflow", @@ -4993,7 +5126,7 @@ name = "mz-test-util" version = "0.0.0" dependencies = [ "anyhow", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "mz-kafka-util", "mz-ore", "rand", @@ -5018,8 +5151,8 @@ dependencies = [ "aws-types", "byteorder", "bytes", - "chrono", - "clap", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 4.3.4", "flate2", "futures", "globset", @@ -5286,7 +5419,7 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.6", "libc", ] @@ -5820,7 +5953,7 @@ dependencies = [ [[package]] name = "postgres-protocol" version = "0.6.5" -source = "git+https://github.com/MaterializeInc/rust-postgres#dd70a8b9caec1bb056ff66782a8e8b72d446ffa5" +source = "git+https://github.com/MaterializeInc/rust-postgres#7bdd17b5acf4d7dbc53b08a9038793ab7e49da6c" dependencies = [ "base64 0.21.0", "byteorder", @@ -5837,10 +5970,10 @@ dependencies = [ [[package]] name = "postgres-types" version = "0.2.5" -source = "git+https://github.com/MaterializeInc/rust-postgres#dd70a8b9caec1bb056ff66782a8e8b72d446ffa5" +source = "git+https://github.com/MaterializeInc/rust-postgres#7bdd17b5acf4d7dbc53b08a9038793ab7e49da6c" dependencies = [ "bytes", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "fallible-iterator", "postgres-protocol", "serde", @@ -5963,30 +6096,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" @@ -6012,7 +6121,7 @@ dependencies = [ "byteorder", "hex", "lazy_static", - "rustix", + "rustix 0.36.7", ] [[package]] @@ -6476,13 +6585,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.1.4", "windows-sys 0.42.0", ] +[[package]] +name = "rustix" +version = "0.37.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" +dependencies = [ + "bitflags", + "errno 0.3.1", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.45.0", +] + [[package]] name = "rustversion" version = "1.0.9" @@ -6841,7 +6964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" dependencies = [ "base64 0.13.1", - "chrono", + "chrono 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "hex", "indexmap", "serde", @@ -7265,7 +7388,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall", - "rustix", + "rustix 0.36.7", "windows-sys 0.42.0", ] @@ -7288,15 +7411,31 @@ dependencies = [ "winapi", ] +[[package]] +name = "terminal_size" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +dependencies = [ + "rustix 0.37.7", + "windows-sys 0.48.0", +] + [[package]] name = "textwrap" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" dependencies = [ - "terminal_size", + "terminal_size 0.1.17", ] +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + [[package]] name = "thiserror" version = "1.0.37" @@ -7583,7 +7722,7 @@ dependencies = [ [[package]] name = "tokio-postgres" version = "0.7.8" -source = "git+https://github.com/MaterializeInc/rust-postgres#dd70a8b9caec1bb056ff66782a8e8b72d446ffa5" +source = "git+https://github.com/MaterializeInc/rust-postgres#7bdd17b5acf4d7dbc53b08a9038793ab7e49da6c" dependencies = [ "async-trait", "byteorder", @@ -8056,6 +8195,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" @@ -8097,7 +8242,7 @@ version = "0.10.1" source = "git+https://github.com/alacritty/vte#45670c47cebd7af050def2f80a307bdeec7caba3" dependencies = [ "arrayvec", - "utf8parse", + "utf8parse 0.2.0", "vte_generate_state_changes", ] @@ -8270,13 +8415,13 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -8285,7 +8430,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", ] [[package]] @@ -8294,13 +8448,28 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -8309,42 +8478,84 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + [[package]] name = "winreg" version = "0.10.1" @@ -8370,8 +8581,8 @@ dependencies = [ "byteorder", "bytes", "cc", - "chrono", - "clap", + "chrono 0.4.26 (git+https://github.com/chronotope/chrono.git?branch=0.4.x)", + "clap 4.3.4", "criterion", "crossbeam-channel", "crossbeam-deque", @@ -8430,7 +8641,7 @@ dependencies = [ "regex-syntax", "reqwest", "ring", - "rustix", + "rustix 0.36.7", "schemars", "scopeguard", "security-framework", @@ -8440,7 +8651,7 @@ dependencies = [ "sha2", "smallvec", "syn 1.0.107", - "textwrap", + "textwrap 0.15.0", "tikv-jemalloc-sys", "time", "time-macros", @@ -8523,3 +8734,8 @@ dependencies = [ "cc", "libc", ] + +[[patch.unused]] +name = "chrono" +version = "0.4.24" +source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#895d3b867ff318b5866cad7684d26279a45bc114" diff --git a/src/cluster/Cargo.toml b/src/cluster/Cargo.toml index 67507fcbd26b3..b30b6c1cac539 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.59" bytesize = "1.1.0" -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.3.4", 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 e03e1611b9c66..0332d86477950 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.20", features = ["derive", "env"] } +clap = { version = "4.3.4", 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 271277d777eae..4e64cd551d3ad 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.59" bytesize = "1.1.0" -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.3.4", 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 6d64280003c16..159d52c20cccc 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.20", features = ["wrap_help", "env", "derive"] } +clap = { version = "4.3.4", 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 b7196138c77e5..6578f9722340e 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.20", features = ["derive"] } +clap = { version = "4.3.4", 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 2695a5cb41a0f..17e8af66df087 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.20", features = ["derive"] } +clap = { version = "4.3.4", 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 af17216d974c3..75cd20d79ad7e 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.20", features = [ "derive" ] } +clap = { version = "4.3.4", 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 72db7bd9798c7..ecc7ed9fc33bc 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.59" chrono = { version = "0.4.23", default-features = false } -clap = { version = "3.2.20", features = ["derive"] } +clap = { version = "4.3.4", 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 5ab655cd6e441..55340441edf17 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.59" -clap = { version = "3.2.20", features = ["env", "derive"] } +clap = { version = "4.3.4", 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 96cb99cc95c3d..800415a616bbb 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.59", 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.20", features = ["env"], optional = true } +clap = { version = "4.3.4", 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 dc7638d5de84a..22ddf274e98d5 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.59" bytes = "1.3.0" -clap = { version = "3.2.20", features = [ "derive" ] } +clap = { version = "4.3.4", features = [ "derive" ] } differential-dataflow = { git = "https://github.com/TimelyDataflow/differential-dataflow.git" } futures = "0.3.25" futures-util = "0.3" @@ -63,7 +63,7 @@ tokio-console = ["mz-ore/tokio-console"] [dev-dependencies] async-trait = "0.1.59" axum = { version = "0.6.7" } -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.3.4", 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 04d27af59a5f0..dc74c1b2f4f3a 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.20", features = ["derive"] } +clap = { version = "4.3.4", 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 354b63bdbd722..f5e2331593edd 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.20", features = ["derive"] } +clap = { version = "4.3.4", 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 74a0c8e392b81..3686f03ae8fc5 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.59" -clap = { version = "3.2.20", features = ["env", "derive"] } +clap = { version = "4.3.4", 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 ebf1b52083758..e0e89573422de 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.20", features = ["derive"] } +clap = { version = "4.3.4", 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 153d9f26c8fdb..d5d70dbae4e0e 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.20", features = ["derive", "env"] } +clap = { version = "4.3.4", 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 9cb99fdbd1a89..08260090abc68 100644 --- a/src/storage/Cargo.toml +++ b/src/storage/Cargo.toml @@ -16,7 +16,7 @@ async-stream = "0.3.3" async-trait = "0.1.59" bytesize = "1.1.0" chrono = { version = "0.4.23", default-features = false, features = ["std"] } -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.3.4", features = ["derive", "env"] } crossbeam-channel = "0.5.8" csv-core = { version = "0.1.10" } dec = "0.4.8" @@ -81,7 +81,7 @@ tonic-build = "0.8.2" [dev-dependencies] async-trait = "0.1.59" axum = { version = "0.6.7" } -clap = { version = "3.2.20", features = ["derive", "env"] } +clap = { version = "4.3.4", features = ["derive", "env"] } datadriven = { version = "0.6.0", features = ["async"] } humantime = "2.1.0" rocksdb = { version = "0.20.1", default-features = false, features = ["snappy"] } diff --git a/src/testdrive/Cargo.toml b/src/testdrive/Cargo.toml index 4776ed01aa5d2..0e3882ab16ba0 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.20", features = ["derive"] } +clap = { version = "4.3.4", 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 dafb65499d886..275ee7c9ab9db 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.20", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.3.4", 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.20", features = ["derive", "env", "wrap_help"] } +clap = { version = "4.3.4", 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" }