diff --git a/Cargo.lock b/Cargo.lock index c461b4ed09e5a..aac780abd42a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,9 +115,9 @@ source = "git+https://github.com/jorgecarleitao/arrow2.git#0ba4f8e21547ed08b4468 dependencies = [ "ahash", "arrow-format", - "base64", + "base64 0.13.1", "bytemuck", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "dyn-clone", "either", "ethnum", @@ -152,7 +152,7 @@ checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" dependencies = [ "askama_shared", "proc-macro2", - "syn", + "syn 1.0.107", ] [[package]] @@ -175,7 +175,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn", + "syn 1.0.107", "toml", ] @@ -224,18 +224,18 @@ checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.2", ] [[package]] @@ -701,12 +701,48 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.1" -source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d8068b6ccb8b34db9de397c7043f91db8b4c66414952c6db944f238c4d3db3" dependencies = [ "async-trait", - "axum-core", - "base64", + "axum-core 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.21.0", + "bitflags", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper", + "tokio", + "tokio-tungstenite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.6.11" +source = "git+https://github.com/tokio-rs/axum.git#8e1eb8979f58552dc5fefe3b09aa7da21ed48b8b" +dependencies = [ + "async-trait", + "axum-core 0.3.3 (git+https://github.com/tokio-rs/axum.git)", + "base64 0.21.0", "bitflags", "bytes", "futures-util", @@ -730,15 +766,31 @@ dependencies = [ "tokio", "tokio-tungstenite", "tower", - "tower-http", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.0" -source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.3" +source = "git+https://github.com/tokio-rs/axum.git#8e1eb8979f58552dc5fefe3b09aa7da21ed48b8b" dependencies = [ "async-trait", "bytes", @@ -789,6 +841,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64-simd" version = "0.7.0" @@ -929,7 +987,7 @@ checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1035,8 +1093,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" -source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#a1591e91f3a6af50e3d642039bbed1042f300d5b" +version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +dependencies = [ + "iana-time-zone", + "num-integer", + "num-traits", + "serde", + "winapi", +] + +[[package]] +name = "chrono" +version = "0.4.24" +source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#dc9ea3ab455bf705df7711a0bbdd73e4b7eadc12" dependencies = [ "iana-time-zone", "num-integer", @@ -1051,7 +1122,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa48fa079165080f11d7753fd0bc175b7d391f276b965fe4b55bfad67856e463" dependencies = [ - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "chrono-tz-build", "phf", "serde", @@ -1142,7 +1213,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1189,7 +1260,7 @@ checksum = "43b5affba7c91c039a483065125dd8c6d4a0985e1e9ac5ab6dffdea4fe4e637f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1498,7 +1569,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1525,7 +1596,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.107", ] [[package]] @@ -1542,7 +1613,7 @@ checksum = "2acc9305a8b69bc2308c2e17dbb98debeac984cdc89ac550c01507cc129433c3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1566,7 +1637,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 1.0.107", ] [[package]] @@ -1577,7 +1648,7 @@ checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1690,7 +1761,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1701,7 +1772,7 @@ checksum = "0c5905670fd9c320154f3a4a01c9e609733cd7b753f3c58777ab7d5ce26686b3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1900,7 +1971,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1920,7 +1991,7 @@ checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1931,7 +2002,7 @@ checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1951,7 +2022,7 @@ checksum = "33526f770a27828ce7c2792fdb7cb240220237e0ff12933ed6c23957fc5dd7cf" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2154,7 +2225,7 @@ checksum = "3dbc4f084ec5a3f031d24ccedeb87ab2c3189a2f33b8d070889073837d5ea09e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2166,7 +2237,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2190,7 +2261,7 @@ dependencies = [ "frunk_proc_macro_helpers", "proc-macro-hack", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2261,7 +2332,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2397,7 +2468,7 @@ version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6490be71f07a5f62b564bc58e36953f675833df11c7e4a0647bee7a07ca1ec5e" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "flate2", "nom", @@ -2410,7 +2481,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "bytes", "headers-core", @@ -2478,9 +2549,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -2524,9 +2595,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes", "futures-channel", @@ -2693,9 +2764,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" @@ -2744,7 +2815,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828" dependencies = [ - "base64", + "base64 0.13.1", "pem", "ring", "serde", @@ -2771,9 +2842,9 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ - "base64", + "base64 0.13.1", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "http", "percent-encoding", "serde", @@ -2801,9 +2872,9 @@ version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e80db3ca107e89da5f7eae37ea5274e06cefdcf9689d0ebd5ec3575a6f983e4e" dependencies = [ - "base64", + "base64 0.13.1", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "dirs-next", "either", "futures", @@ -2838,7 +2909,7 @@ version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fce686d2fbdaf6cb18d19cdb0692e9485dd9945f79f944b8772bdb2a07e8d39d" dependencies = [ - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "form_urlencoded", "http", "json-patch", @@ -2860,7 +2931,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn", + "syn 1.0.107", ] [[package]] @@ -2893,7 +2964,7 @@ version = "1.0.0" source = "git+https://github.com/MaterializeInc/rust-server-sdk#dcda26dad12a871795a6958ef238536c27c67164" dependencies = [ "built", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel", "data-encoding", "eventsource-client", @@ -2922,7 +2993,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c27dd31ce69c55fca526d1c22c2dcca96fd0c98e496529d37eeef6c41652173" dependencies = [ "base16ct", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "itertools", "lazy_static", "log", @@ -3212,7 +3283,7 @@ dependencies = [ "libc", "log", "wasi", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -3282,7 +3353,7 @@ version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9006c95034ccf7b903d955f210469119f6c3477fc9c9e7a7845ce38a3e665c2a" dependencies = [ - "base64", + "base64 0.13.1", "bigdecimal", "bindgen", "bitflags", @@ -3318,7 +3389,7 @@ name = "mz" version = "0.1.0" dependencies = [ "anyhow", - "axum", + "axum 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "dirs", "indicatif", @@ -3346,7 +3417,7 @@ dependencies = [ "anyhow", "bytes", "bytesize", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "const_format", "criterion", "datadriven", @@ -3436,7 +3507,7 @@ version = "0.7.0" dependencies = [ "anyhow", "byteorder", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "crc32fast", "digest", "enum-kinds", @@ -3459,7 +3530,7 @@ name = "mz-avro-derive" version = "0.0.0" dependencies = [ "quote", - "syn", + "syn 1.0.107", "workspace-hack", ] @@ -3570,7 +3641,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "http", "itertools", @@ -3601,7 +3672,7 @@ name = "mz-clusterd" version = "0.45.0-dev" dependencies = [ "anyhow", - "axum", + "axum 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "fail", "futures", @@ -3674,7 +3745,7 @@ dependencies = [ "async-stream", "async-trait", "bytesize", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "columnation", "differential-dataflow", "futures", @@ -3719,7 +3790,7 @@ name = "mz-controller" version = "0.0.0" dependencies = [ "anyhow", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "differential-dataflow", "futures", "mz-build-info", @@ -3752,12 +3823,12 @@ dependencies = [ "askama", "assert_cmd", "async-trait", - "axum", - "base64", + "axum 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.13.1", "bytes", "bytesize", "cc", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "datadriven", "fail", @@ -3851,7 +3922,7 @@ dependencies = [ "anyhow", "bytes", "bytesize", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "criterion", "csv", "datadriven", @@ -3915,7 +3986,7 @@ name = "mz-frontegg-auth" version = "0.0.0" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "derivative", "jsonwebtoken", "mz-ore", @@ -3934,7 +4005,7 @@ version = "0.0.0" dependencies = [ "anyhow", "askama", - "axum", + "axum 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "headers", "include_dir", "mz-ore", @@ -3952,7 +4023,7 @@ version = "0.0.0" dependencies = [ "anyhow", "byteorder", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "criterion", "differential-dataflow", "itertools", @@ -3981,7 +4052,7 @@ name = "mz-kafka-util" version = "0.0.0" dependencies = [ "anyhow", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "crossbeam", "mz-avro", @@ -4030,7 +4101,7 @@ version = "0.0.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "workspace-hack", ] @@ -4079,7 +4150,7 @@ dependencies = [ "anyhow", "async-trait", "bytesize", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "derivative", "futures-core", "mz-ore", @@ -4096,7 +4167,7 @@ version = "0.0.0" dependencies = [ "anyhow", "async-trait", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "fail", "futures", @@ -4121,7 +4192,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "futures", "hex", "itertools", @@ -4172,7 +4243,7 @@ dependencies = [ "async-trait", "atty", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "console-subscriber", "ctor", @@ -4240,7 +4311,7 @@ dependencies = [ "aws-credential-types", "aws-sdk-s3", "aws-types", - "base64", + "base64 0.13.1", "bytes", "deadpool-postgres", "differential-dataflow", @@ -4279,7 +4350,7 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "axum", + "axum 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "bytes", "clap", "criterion", @@ -4344,7 +4415,7 @@ version = "0.0.0" dependencies = [ "byteorder", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "dec", "mz-ore", "mz-repr", @@ -4441,7 +4512,7 @@ version = "0.0.0" dependencies = [ "anyhow", "askama", - "axum", + "axum 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace", "bytesize", "cfg-if", @@ -4491,7 +4562,7 @@ dependencies = [ "anyhow", "bitflags", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "chrono-tz", "columnation", "criterion", @@ -4535,7 +4606,7 @@ dependencies = [ name = "mz-repr-test-util" version = "0.0.0" dependencies = [ - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "datadriven", "mz-lowertest", "mz-ore", @@ -4627,7 +4698,7 @@ dependencies = [ "aws-arn", "aws-sdk-sts", "bitflags", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "datadriven", "enum-kinds", "globset", @@ -4697,7 +4768,7 @@ version = "0.0.1" dependencies = [ "anyhow", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "fallible-iterator", "futures", @@ -4807,7 +4878,7 @@ dependencies = [ "aws-sdk-s3", "aws-sdk-sqs", "bytesize", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "crossbeam-channel", "csv-core", @@ -4876,7 +4947,7 @@ dependencies = [ "aws-credential-types", "aws-types", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "dec", "derivative", "differential-dataflow", @@ -4932,7 +5003,7 @@ name = "mz-test-util" version = "0.0.0" dependencies = [ "anyhow", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "mz-kafka-util", "mz-ore", "rand", @@ -4960,7 +5031,7 @@ dependencies = [ "aws-types", "byteorder", "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "clap", "flate2", "futures", @@ -5063,7 +5134,7 @@ dependencies = [ "itertools", "mz-ore", "quote", - "syn", + "syn 1.0.107", "tempfile", "workspace-hack", ] @@ -5177,7 +5248,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -5250,7 +5321,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -5287,7 +5358,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" dependencies = [ "pathdiff", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5329,7 +5400,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -5505,7 +5576,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -5564,7 +5635,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -5648,7 +5719,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -5747,7 +5818,7 @@ name = "postgres-protocol" version = "0.6.4" source = "git+https://github.com/MaterializeInc/rust-postgres#9c9086235344fe794361a9985d97a64b42e61929" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "fallible-iterator", @@ -5765,7 +5836,7 @@ version = "0.2.4" source = "git+https://github.com/MaterializeInc/rust-postgres#9c9086235344fe794361a9985d97a64b42e61929" dependencies = [ "bytes", - "chrono", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "fallible-iterator", "postgres-protocol", "serde", @@ -5864,7 +5935,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" dependencies = [ "proc-macro2", - "syn", + "syn 1.0.107", ] [[package]] @@ -5896,7 +5967,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "version_check", ] @@ -5919,9 +5990,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" dependencies = [ "unicode-ident", ] @@ -5978,7 +6049,7 @@ source = "git+https://github.com/MaterializeInc/proptest.git#fc9660f0f45ad49949d dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -6008,7 +6079,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn", + "syn 1.0.107", "tempfile", "which", ] @@ -6023,7 +6094,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -6032,7 +6103,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d378290cd658b119ce87621931ef448017ef1a0044d7b681159d779e7e07b8f6" dependencies = [ - "base64", + "base64 0.13.1", "prost", "prost-types", "serde", @@ -6109,9 +6180,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -6278,7 +6349,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -6403,7 +6474,7 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -6474,7 +6545,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 1.0.107", ] [[package]] @@ -6681,7 +6752,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -6692,7 +6763,7 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -6753,8 +6824,8 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef" dependencies = [ - "base64", - "chrono", + "base64 0.13.1", + "chrono 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "hex", "indexmap", "serde", @@ -6772,7 +6843,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -7073,6 +7144,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59d3276aee1fa0c33612917969b5172b5be2db051232a6e4826f1a1a9191b045" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.1" @@ -7087,7 +7169,7 @@ checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "unicode-xid", ] @@ -7202,7 +7284,7 @@ checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -7388,9 +7470,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.2" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes", @@ -7404,7 +7486,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -7425,7 +7507,7 @@ checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -7541,8 +7623,8 @@ checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", - "axum", - "base64", + "axum 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.13.1", "bytes", "futures-core", "futures-util", @@ -7575,7 +7657,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -7604,7 +7686,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "base64", + "base64 0.13.1", "bitflags", "bytes", "futures-core", @@ -7652,7 +7734,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -7763,7 +7845,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" dependencies = [ - "base64", + "base64 0.13.1", "byteorder", "bytes", "http", @@ -7875,7 +7957,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f" dependencies = [ - "base64", + "base64 0.13.1", "chunked_transfer", "log", "native-tls", @@ -8016,7 +8098,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -8050,7 +8132,7 @@ checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8128,47 +8210,71 @@ dependencies = [ "windows_x86_64_msvc", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +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", +] + [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winreg" @@ -8189,13 +8295,13 @@ dependencies = [ "aws-sig-auth", "aws-sigv4", "aws-smithy-http", - "axum", - "base64", + "axum 0.6.11 (git+https://github.com/tokio-rs/axum.git)", + "base64 0.13.1", "bstr", "byteorder", "bytes", "cc", - "chrono", + "chrono 0.4.24 (git+https://github.com/chronotope/chrono.git?branch=0.4.x)", "clap", "criterion", "crossbeam-channel", @@ -8265,7 +8371,7 @@ dependencies = [ "sha2", "smallvec", "socket2", - "syn", + "syn 1.0.107", "textwrap", "tikv-jemalloc-sys", "time", @@ -8349,3 +8455,13 @@ dependencies = [ "cc", "libc", ] + +[[patch.unused]] +name = "axum" +version = "0.6.1" +source = "git+https://github.com/tokio-rs/axum.git#978ae6335862b264b4368e01a52177d98c42b2d9" + +[[patch.unused]] +name = "chrono" +version = "0.4.23" +source = "git+https://github.com/chronotope/chrono.git?branch=0.4.x#a1591e91f3a6af50e3d642039bbed1042f300d5b" diff --git a/src/expr-test-util/Cargo.toml b/src/expr-test-util/Cargo.toml index 6882dad69095f..5c988c4d1ef7b 100644 --- a/src/expr-test-util/Cargo.toml +++ b/src/expr-test-util/Cargo.toml @@ -12,7 +12,7 @@ mz-lowertest = { path = "../lowertest" } mz-ore = { path = "../ore" } mz-repr = { path = "../repr" } mz-repr-test-util = { path = "../repr-test-util" } -proc-macro2 = "1.0.47" +proc-macro2 = "1.0.52" serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.89" workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/expr/Cargo.toml b/src/expr/Cargo.toml index 65ea600a9620c..3795b171dab08 100644 --- a/src/expr/Cargo.toml +++ b/src/expr/Cargo.toml @@ -56,7 +56,7 @@ criterion = { version = "0.4.0" } datadriven = "0.6.0" mz-expr-test-util = { path = "../expr-test-util" } mz-ore = { path = "../ore" } -proc-macro2 = "1.0.47" +proc-macro2 = "1.0.52" [build-dependencies] prost-build = "0.11.2" diff --git a/src/lowertest-derive/Cargo.toml b/src/lowertest-derive/Cargo.toml index fcaef5f759f93..6de20ea58aa5f 100644 --- a/src/lowertest-derive/Cargo.toml +++ b/src/lowertest-derive/Cargo.toml @@ -10,7 +10,7 @@ publish = false proc-macro = true [dependencies] -proc-macro2 = "1.0.47" +proc-macro2 = "1.0.52" quote = "1.0.23" syn = { version = "1.0.107", features = ["extra-traits", "printing"] } workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/lowertest/Cargo.toml b/src/lowertest/Cargo.toml index 62c6b2da3906a..aaf5373c50291 100644 --- a/src/lowertest/Cargo.toml +++ b/src/lowertest/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] mz-lowertest-derive = { path = "../lowertest-derive" } mz-ore = { path = "../ore" } -proc-macro2 = "1.0.47" +proc-macro2 = "1.0.52" serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.89" workspace-hack = { version = "0.0.0", path = "../workspace-hack" } diff --git a/src/repr-test-util/Cargo.toml b/src/repr-test-util/Cargo.toml index 87ab891790199..569715dc05e46 100644 --- a/src/repr-test-util/Cargo.toml +++ b/src/repr-test-util/Cargo.toml @@ -11,7 +11,7 @@ chrono = { version = "0.4.23", default-features = false, features = ["serde", "s mz-lowertest = { path = "../lowertest" } mz-ore = { path = "../ore" } mz-repr = { path = "../repr" } -proc-macro2 = "1.0.47" +proc-macro2 = "1.0.52" workspace-hack = { version = "0.0.0", path = "../workspace-hack" } [dev-dependencies] diff --git a/src/transform/Cargo.toml b/src/transform/Cargo.toml index 6b742011a789f..8c0762f14bd61 100644 --- a/src/transform/Cargo.toml +++ b/src/transform/Cargo.toml @@ -25,7 +25,7 @@ datadriven = "0.6.0" mz-expr-test-util = { path = "../expr-test-util" } mz-lowertest = { path = "../lowertest" } mz-ore = { path = "../ore" } -proc-macro2 = "1.0.47" +proc-macro2 = "1.0.52" serde_json = "1.0.89" [package.metadata.cargo-udeps.ignore] diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index f991554b676d0..f07b47ecbf96d 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -72,7 +72,7 @@ phf = { version = "0.11.1", features = ["uncased"] } phf_shared = { version = "0.11.1", features = ["uncased"] } postgres = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4"] } postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } -proc-macro2 = { version = "1.0.47", features = ["span-locations"] } +proc-macro2 = { version = "1.0.52", features = ["span-locations"] } prometheus = { version = "0.13.3", default-features = false, features = ["process"] } prost = { version = "0.11.3", features = ["no-recursion-limit"] } prost-reflect = { version = "0.9.2", default-features = false, features = ["serde"] } @@ -170,7 +170,7 @@ phf = { version = "0.11.1", features = ["uncased"] } phf_shared = { version = "0.11.1", features = ["uncased"] } postgres = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4"] } postgres-types = { git = "https://github.com/MaterializeInc/rust-postgres", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } -proc-macro2 = { version = "1.0.47", features = ["span-locations"] } +proc-macro2 = { version = "1.0.52", features = ["span-locations"] } prometheus = { version = "0.13.3", default-features = false, features = ["process"] } prost = { version = "0.11.3", features = ["no-recursion-limit"] } prost-reflect = { version = "0.9.2", default-features = false, features = ["serde"] }