From e79da4a9492c318321dd62f8d21b3e199e8b5587 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 27 Jul 2023 17:01:16 +0200 Subject: [PATCH] Bump Rust dependencies and remove unused ones --- Cargo.lock | 759 +++++++----------- crates/axum-utils/Cargo.toml | 6 +- crates/cli/Cargo.toml | 7 +- crates/cli/src/main.rs | 8 +- crates/config/Cargo.toml | 6 +- crates/data-model/Cargo.toml | 4 +- crates/email/Cargo.toml | 2 +- crates/graphql/Cargo.toml | 4 +- crates/handlers/Cargo.toml | 6 +- crates/http/Cargo.toml | 10 +- crates/http/src/client.rs | 2 +- crates/iana-codegen/Cargo.toml | 2 +- crates/iana/Cargo.toml | 2 +- crates/jose/Cargo.toml | 8 +- crates/keystore/Cargo.toml | 4 +- crates/listener/Cargo.toml | 2 +- crates/matrix-synapse/Cargo.toml | 2 +- crates/matrix/Cargo.toml | 2 +- crates/oauth2-types/Cargo.toml | 6 +- crates/oidc-client/Cargo.toml | 7 +- crates/policy/Cargo.toml | 8 +- crates/router/Cargo.toml | 2 +- crates/spa/Cargo.toml | 4 +- crates/storage-pg/Cargo.toml | 9 +- crates/storage-pg/src/compat/session.rs | 14 +- crates/storage-pg/src/compat/sso_login.rs | 14 +- crates/storage-pg/src/lib.rs | 1 - crates/storage-pg/src/oauth2/session.rs | 14 +- crates/storage-pg/src/sea_query_sqlx.rs | 54 -- crates/storage-pg/src/upstream_oauth2/link.rs | 16 +- .../src/upstream_oauth2/provider.rs | 17 +- crates/storage-pg/src/user/email.rs | 17 +- crates/storage-pg/src/user/session.rs | 14 +- crates/storage/Cargo.toml | 8 +- crates/tasks/Cargo.toml | 10 +- crates/templates/Cargo.toml | 6 +- 36 files changed, 387 insertions(+), 670 deletions(-) delete mode 100644 crates/storage-pg/src/sea_query_sqlx.rs diff --git a/Cargo.lock b/Cargo.lock index c4beb2d8..567a9e9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,9 +170,9 @@ checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "apalis-core" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a7fa6614f9d29077a1f5f09d4a812326900ae137c5b644ebe93c422a8e4361" +checksum = "00c1754ab2177e028672e3a4aed42103656a7af676152d9533f5f5f8d2f8157d" dependencies = [ "async-stream", "async-trait", @@ -193,9 +193,9 @@ dependencies = [ [[package]] name = "apalis-cron" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7757a13691a4adf31b7cd971d2ed175ebf897dcb60398de9d25c78e80070ea6" +checksum = "58ec40212f8caffe889a7b1a05457e0816e429940a0125b193f65d59c5ce95b9" dependencies = [ "apalis-core", "async-stream", @@ -272,7 +272,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -339,8 +339,8 @@ dependencies = [ "async-graphql-parser", "darling 0.14.4", "proc-macro-crate", - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "syn 1.0.109", "thiserror", ] @@ -376,7 +376,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", - "autocfg 1.1.0", + "autocfg", "cfg-if", "concurrent-queue", "futures-lite", @@ -406,7 +406,7 @@ checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" dependencies = [ "async-io", "async-lock", - "autocfg 1.1.0", + "autocfg", "blocking", "cfg-if", "event-listener", @@ -460,9 +460,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -477,9 +477,9 @@ version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -503,26 +503,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -546,7 +526,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.4.0", - "fastrand", + "fastrand 1.9.0", "http", "hyper", "time 0.3.23", @@ -563,7 +543,7 @@ checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "fastrand", + "fastrand 1.9.0", "tokio", "tracing", "zeroize", @@ -709,7 +689,7 @@ dependencies = [ "aws-smithy-http-tower", "aws-smithy-types", "bytes 1.4.0", - "fastrand", + "fastrand 1.9.0", "http", "http-body", "hyper", @@ -892,9 +872,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" dependencies = [ "heck", - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -1020,7 +1000,7 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] @@ -1225,9 +1205,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.18" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6396aa128fe4149d2af114f746eb048b5667e2844cc51ae90830f45de7ccb" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -1236,9 +1216,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.18" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d011140df54d9c4c592974ccd7d694dd4ab5b92ea0436435fa900a211d6b0f6" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", @@ -1253,9 +1233,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -1264,15 +1244,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "colorchoice" version = "1.0.0" @@ -1368,18 +1339,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.97.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c289b8eac3a97329a524e953b5fd68a8416ca629e1a37287f12d9e0760aadbc" +checksum = "1380172556902242d32f78ed08c98aac4f5952aef22d3684aed5c66a5db0a6fc" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.97.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bf07ba80f53fa7f7dc97b11087ea867f7ae4621cfca21a909eca92c0b96c7d9" +checksum = "037cca234e1ad0766fdfe43b527ec14e100414b4ccf4bb614977aa9754958f57" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1398,42 +1369,42 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.97.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a7ca088173130c5c033e944756e3e441fbf3f637f32b4f6eb70252580c6dd4" +checksum = "d375e6afa8b9a304999ea8cf58424414b8e55e004571265a4f0826eba8b74f18" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.97.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0114095ec7d2fbd658ed100bd007006360bc2530f57c6eee3d3838869140dbf9" +checksum = "ca590e72ccb8da963def6e36460cce4412032b1f03c31d1a601838d305abdc39" [[package]] name = "cranelift-control" -version = "0.97.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d56031683a55a949977e756d21826eb17a1f346143a1badc0e120a15615cd38" +checksum = "9d2d38eea4373639f4b6236a40f69820fed16c5511093cd3783bf8491a93d9cf" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.97.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6565198b5684367371e2b946ceca721eb36965e75e3592fad12fc2e15f65d7b" +checksum = "5e3173c1434af23c00e4964722cf93ca8f0e6287289bf5d52110597c3ba2ea09" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.97.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f28cc44847c8b98cb921e6bfc0f7b228f4d27519376fea724d181da91709a6" +checksum = "aec4a3a33825062eccf6eec73e852c8773220f6e4798925e19696562948beb1f" dependencies = [ "cranelift-codegen", "log", @@ -1443,15 +1414,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.97.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b658177e72178c438f7de5d6645c56d97af38e17fcb0b500459007b4e05cc5" +checksum = "5146b5cea4b21095a021d964b0174cf6ff5530f83e8d0a822683c7559e360b66" [[package]] name = "cranelift-native" -version = "0.97.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf1c7de7221e6afcc5e13ced3b218faab3bc65b47eac67400046a05418aecd6a" +checksum = "21cec3717ce554d3936b2101aa8eae1a2a410bd6da0f4df698a4b008fe9cf1e9" dependencies = [ "cranelift-codegen", "libc", @@ -1460,9 +1431,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.97.1" +version = "0.98.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76b0d28ebe8edb6b503630c489aa4669f1e2d13b97bec7271a0fcb0e159be3ad" +checksum = "d7fd2f9f1bf29ce6639ae2f477a2fe20bad0bd09289df13efeb890e8e4b9f807" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1536,7 +1507,7 @@ version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ - "autocfg 1.1.0", + "autocfg", "cfg-if", "crossbeam-utils", "memoffset 0.9.0", @@ -1643,8 +1614,8 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "strsim", "syn 1.0.109", ] @@ -1657,10 +1628,10 @@ checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "strsim", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -1670,7 +1641,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core 0.14.4", - "quote 1.0.31", + "quote", "syn 1.0.109", ] @@ -1681,8 +1652,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", - "quote 1.0.31", - "syn 2.0.26", + "quote", + "syn 2.0.27", ] [[package]] @@ -1730,7 +1701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" dependencies = [ "serde", - "uuid 1.4.1", + "uuid", ] [[package]] @@ -1783,12 +1754,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "dotenv" version = "0.15.0" @@ -1823,9 +1788,9 @@ checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" [[package]] name = "ecdsa" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ "der", "digest", @@ -1837,9 +1802,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" dependencies = [ "serde", ] @@ -1977,6 +1942,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "ff" version = "0.13.0" @@ -2040,12 +2011,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "futures" version = "0.1.31" @@ -2117,7 +2082,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -2132,25 +2097,9 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", -] - -[[package]] -name = "futures-signals" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a12cb78961d5c0bc0e358599bba98ec09201090a22339cd8ea27e815c11b25" -dependencies = [ - "discard", - "futures-channel", - "futures-core", - "futures-util", - "gensym", - "log", - "pin-project", - "serde", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -2223,18 +2172,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "gensym" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb328fe25cbf075818a3e57bb5ee39b49b4f26c94d685356426154c5962cccd" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", - "uuid 0.7.4", -] - [[package]] name = "getrandom" version = "0.1.16" @@ -2280,9 +2217,9 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df" +checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006" dependencies = [ "aho-corasick", "bstr", @@ -2447,15 +2384,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.2" @@ -2530,9 +2458,9 @@ dependencies = [ [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "http-types" @@ -2711,7 +2639,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.1.0", + "autocfg", "hashbrown 0.12.3", "serde", ] @@ -2738,6 +2666,17 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" +[[package]] +name = "inherent" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + [[package]] name = "inlinable_string" version = "0.1.15" @@ -2789,7 +2728,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -2819,7 +2758,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -2930,7 +2869,7 @@ dependencies = [ "base64 0.21.2", "email-encoding", "email_address", - "fastrand", + "fastrand 1.9.0", "futures-io", "futures-util", "hostname", @@ -2997,7 +2936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0500463acd96259d219abb05dc57e5a076ef04b2db9a2112846929b5f174c96" dependencies = [ "libc", - "uuid 1.4.1", + "uuid", "winapi", ] @@ -3007,7 +2946,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ - "autocfg 1.1.0", + "autocfg", "scopeguard", ] @@ -3076,7 +3015,6 @@ version = "0.1.0" dependencies = [ "anyhow", "apalis-core", - "atty", "axum", "camino", "clap", @@ -3309,7 +3247,7 @@ dependencies = [ "tracing", "tracing-opentelemetry", "webpki", - "webpki-roots 0.24.0", + "webpki-roots 0.25.1", ] [[package]] @@ -3456,7 +3394,6 @@ dependencies = [ "chrono", "form_urlencoded", "futures 0.3.28", - "futures-signals", "futures-util", "headers", "http", @@ -3560,6 +3497,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "sea-query", + "sea-query-binder", "serde", "serde_json", "sqlx", @@ -3567,7 +3505,7 @@ dependencies = [ "tracing", "ulid", "url", - "uuid 1.4.1", + "uuid", ] [[package]] @@ -3693,7 +3631,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -3702,7 +3640,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -3808,7 +3746,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-traits", ] @@ -3818,18 +3756,18 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ - "autocfg 1.1.0", + "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ - "autocfg 1.1.0", + "autocfg", "libm", ] @@ -3839,7 +3777,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", ] @@ -3894,7 +3832,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opa-wasm" version = "0.1.0" -source = "git+https://github.com/matrix-org/rust-opa-wasm.git#8b2558d499a9a6ac7513c761e170da4be86bc42a" +source = "git+https://github.com/matrix-org/rust-opa-wasm.git#5177edfcb0e5baae0e8d73992efeac7c7b2dd685" dependencies = [ "anyhow", "base64 0.21.2", @@ -4191,12 +4129,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68517892c8daf78da08c0db777fcc17e07f2f63ef70041718f8a7630ad84f341" dependencies = [ "once_cell", - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "regex", "regex-syntax 0.7.4", "structmeta", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -4261,10 +4199,10 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da9f0f13dac8069c139e8300a6510e3f4143ecf5259c60b116a9b271b4ca0d54" dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2", "proc-macro2-diagnostics", - "quote 1.0.31", - "syn 2.0.26", + "quote", + "syn 2.0.27", ] [[package]] @@ -4310,9 +4248,9 @@ checksum = "99d490fe7e8556575ff6911e45567ab95e71617f43781e5c05490dc8d75c965c" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -4418,9 +4356,9 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -4485,7 +4423,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "autocfg 1.1.0", + "autocfg", "bitflags 1.3.2", "cfg-if", "concurrent-queue", @@ -4543,15 +4481,6 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - [[package]] name = "proc-macro2" version = "1.0.66" @@ -4567,9 +4496,9 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", "version_check", "yansi", ] @@ -4607,8 +4536,8 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -4640,20 +4569,11 @@ dependencies = [ [[package]] name = "quote" -version = "0.6.13" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" -dependencies = [ - "proc-macro2 1.0.66", + "proc-macro2", ] [[package]] @@ -4662,25 +4582,6 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi", -] - [[package]] name = "rand" version = "0.7.3" @@ -4691,7 +4592,7 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", ] [[package]] @@ -4705,16 +4606,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - [[package]] name = "rand_chacha" version = "0.2.2" @@ -4735,21 +4626,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" @@ -4768,15 +4644,6 @@ dependencies = [ "getrandom 0.2.10", ] -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rand_hc" version = "0.2.0" @@ -4786,59 +4653,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "rayon" version = "1.7.0" @@ -4861,15 +4675,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -5075,7 +4880,7 @@ checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" dependencies = [ "log", "ring", - "rustls-webpki 0.101.1", + "rustls-webpki 0.101.2", "sct", ] @@ -5112,9 +4917,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.1" +version = "0.101.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" +checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" dependencies = [ "ring", "untrusted", @@ -5179,8 +4984,8 @@ version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "serde_derive_internals", "syn 1.0.109", ] @@ -5214,14 +5019,15 @@ dependencies = [ [[package]] name = "sea-query" -version = "0.28.5" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbab99b8cd878ab7786157b7eb8df96333a6807cc6e45e8888c85b51534b401a" +checksum = "6aeb899964df7038e7274306b742951b82a04f835bca8a4683a4c254a6bf35fa" dependencies = [ "chrono", + "inherent", "sea-query-attr", "sea-query-derive", - "uuid 1.4.1", + "uuid", ] [[package]] @@ -5232,19 +5038,31 @@ checksum = "878cf3d57f0e5bfacd425cdaccc58b4c06d68a7b71c63fc28710a20c88676808" dependencies = [ "darling 0.14.4", "heck", - "quote 1.0.31", + "quote", "syn 1.0.109", ] [[package]] -name = "sea-query-derive" -version = "0.3.0" +name = "sea-query-binder" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63f62030c60f3a691f5fe251713b4e220b306e50a71e1d6f9cce1f24bb781978" +checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9" +dependencies = [ + "chrono", + "sea-query", + "sqlx", + "uuid", +] + +[[package]] +name = "sea-query-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd78f2e0ee8e537e9195d1049b752e0433e2cac125426bccb7b5c3e508096117" dependencies = [ "heck", - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "syn 1.0.109", "thiserror", ] @@ -5265,9 +5083,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -5278,9 +5096,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -5395,14 +5213,14 @@ dependencies = [ "thiserror", "time 0.3.23", "url", - "uuid 1.4.1", + "uuid", ] [[package]] name = "serde" -version = "1.0.174" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1" +checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc" dependencies = [ "serde_derive", ] @@ -5422,13 +5240,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.174" +version = "1.0.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e" +checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -5437,16 +5255,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -5509,9 +5327,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" dependencies = [ "darling 0.20.3", - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -5560,9 +5378,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b824b6e687aff278cdbf3b36f07aa52d4bd4099699324d5da86a2ebce3aa00b3" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -5605,7 +5423,7 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ - "autocfg 1.1.0", + "autocfg", ] [[package]] @@ -5741,7 +5559,7 @@ dependencies = [ "tokio-stream", "tracing", "url", - "uuid 1.4.1", + "uuid", "webpki-roots 0.24.0", ] @@ -5751,8 +5569,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "sqlx-core", "sqlx-macros-core", "syn 1.0.109", @@ -5769,8 +5587,8 @@ dependencies = [ "heck", "hex", "once_cell", - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "serde", "serde_json", "sha2", @@ -5824,7 +5642,7 @@ dependencies = [ "stringprep", "thiserror", "tracing", - "uuid 1.4.1", + "uuid", "whoami", ] @@ -5865,7 +5683,7 @@ dependencies = [ "stringprep", "thiserror", "tracing", - "uuid 1.4.1", + "uuid", "whoami", ] @@ -5890,7 +5708,7 @@ dependencies = [ "sqlx-core", "tracing", "url", - "uuid 1.4.1", + "uuid", ] [[package]] @@ -5927,10 +5745,10 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "structmeta-derive", - "syn 2.0.26", + "syn 2.0.27", ] [[package]] @@ -5939,31 +5757,31 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] name = "strum" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "6069ca09d878a33f883cc06aaa9718ede171841d3832450354410b718b097232" dependencies = [ "heck", - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.27", ] [[package]] @@ -5972,36 +5790,25 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - [[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.26" +version = "2.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "unicode-ident", ] @@ -6013,21 +5820,20 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "target-lexicon" -version = "0.12.9" +version = "0.12.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" +checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg 1.1.0", "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.37.23", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -6065,22 +5871,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -6173,7 +5979,7 @@ version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ - "autocfg 1.1.0", + "autocfg", "backtrace", "bytes 1.4.0", "libc", @@ -6203,9 +6009,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -6420,9 +6226,9 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", ] [[package]] @@ -6511,8 +6317,8 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6179333b981641242a768f30f371c9baccbfcc03749627000c500ab88bf4528b" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -6535,7 +6341,7 @@ source = "git+https://github.com/dylanhart/ulid-rs.git?rev=0b9295c2db2114cd87aa1 dependencies = [ "rand 0.8.5", "serde", - "uuid 1.4.1", + "uuid", ] [[package]] @@ -6642,12 +6448,6 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - [[package]] name = "unicode-xid" version = "0.2.4" @@ -6696,9 +6496,9 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf8parse" @@ -6706,15 +6506,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "uuid" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -dependencies = [ - "rand 0.6.5", -] - [[package]] name = "uuid" version = "1.4.1" @@ -6817,9 +6608,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", "wasm-bindgen-shared", ] @@ -6841,7 +6632,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ - "quote 1.0.31", + "quote", "wasm-bindgen-macro-support", ] @@ -6851,9 +6642,9 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ - "proc-macro2 1.0.66", - "quote 1.0.31", - "syn 2.0.26", + "proc-macro2", + "quote", + "syn 2.0.27", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6876,9 +6667,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd02b992d828b91efaf2a7499b21205fe4ab3002e401e3fe0f227aaeb4001d93" +checksum = "0b1f817f2ca5070983c71f1205fbab5848c9073df7f4e1af9fdceb4cc4a1b8e5" dependencies = [ "anyhow", "async-trait", @@ -6909,18 +6700,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284466ef356ce2d909bc0ad470b60c4d0df5df2de9084457e118131b3c779b92" +checksum = "0f82fbfda4610e9225238c62574ecded8e9d6ad3a12f387ac45819ecad5c3f9b" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc78cfe1a758d1336f447a47af6ec05e0df2c03c93440d70faf80e17fbb001e" +checksum = "b4f5b87f1ed383d6c219c04467ab6ae87990d6c2815d5a990138990a7fcbab95" dependencies = [ "anyhow", "base64 0.21.2", @@ -6938,13 +6729,13 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e916103436a6d84faa4c2083e2e98612a323c2cc6147ec419124f67c764c9c" +checksum = "e27b96c540c78e12b60025fcbc0ba8a55bff1b32885a5e8eae2df765a6bc97ac" dependencies = [ "anyhow", - "proc-macro2 1.0.66", - "quote 1.0.31", + "proc-macro2", + "quote", "syn 1.0.109", "wasmtime-component-util", "wasmtime-wit-bindgen", @@ -6953,15 +6744,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f20a5135ec5ef01080e674979b02d6fa5eebaa2b0c2d6660513ee9956a1bf624" +checksum = "0928fe66c22bf8887e2fb524b7647308b8ce836a333af8504e4f1d80b8ea849f" [[package]] name = "wasmtime-cranelift" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1aa99cbf3f8edb5ad8408ba380f5ab481528ecd8a5053acf758e006d6727fd" +checksum = "b659f6e58662d1131f250339acd03aa49377f9351474282699985b79ca4d4a7c" dependencies = [ "anyhow", "cranelift-codegen", @@ -6982,9 +6773,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce31fd55978601acc103acbb8a26f81c89a6eae12d3a1c59f34151dfa609484" +checksum = "74171de083bf2ecb716c507900f825e2b858346c714fbf48f4763ea760f998a8" dependencies = [ "anyhow", "cranelift-codegen", @@ -6998,9 +6789,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f9e58e0ee7d43ff13e75375c726b16bce022db798d3a099a65eeaa7d7a544b" +checksum = "b124cbac1a3e04a744c76b3f77919343ef16dc4c818a2406dd7b689b16a54639" dependencies = [ "anyhow", "cranelift-entity", @@ -7017,9 +6808,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14309cbdf2c395258b124a24757c727403070c0465a28bcc780c4f82f4bca5ff" +checksum = "f92ffb8869395c63100ffefbd71cf9489e7e9218e63a3798dcfe93fa8945f9cf" dependencies = [ "cc", "cfg-if", @@ -7030,9 +6821,9 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0f2eaeb01bb67266416507829bd8e0bb60278444e4cbd048e280833ebeaa02" +checksum = "90ff15f426c2378f32ffb6d9b4370e3504231492e93f6968e8b5102c3256bbc4" dependencies = [ "addr2line 0.19.0", "anyhow", @@ -7054,18 +6845,18 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42e59d62542bfb73ce30672db7eaf4084a60b434b688ac4f05b287d497de082" +checksum = "c549e219102426aa1f90bd18e56a3195ed1e696c318abb3f501c1f4924b530ac" dependencies = [ "once_cell", ] [[package]] name = "wasmtime-jit-icache-coherence" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b49ceb7e2105a8ebe5614d7bbab6f6ef137a284e371633af60b34925493081f" +checksum = "1cf02fedda287a409cff80ad40a7c6c0f0771e99b0cd5e2b79d9cb7ecdc1b2f4" dependencies = [ "cfg-if", "libc", @@ -7074,9 +6865,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5de4762421b0b2b19e02111ca403632852b53e506e03b4b227ffb0fbfa63c2" +checksum = "fc38c6229a5d3b8a2528eb33eb11d3e7ebf570259c7cd2f01e8668fe783ea443" dependencies = [ "anyhow", "cc", @@ -7100,9 +6891,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb7c138f797192f46afdd3ec16f85ef007c3bb45fa8e5174031f17b0be4c4a" +checksum = "768f6c5e7afc3a02eff2753196741db8e5ac5faf26a1e2204d7341b30a637c6f" dependencies = [ "cranelift-entity", "serde", @@ -7112,9 +6903,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "10.0.1" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3334b0466a4d340de345cda83474d1d2c429770c3d667877971407672bc618a" +checksum = "84a4a005a6a2d5faa7cd953d389da8ae979cb571fe40edec7769649d8c98d874" dependencies = [ "anyhow", "heck", @@ -7174,9 +6965,15 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.1", + "rustls-webpki 0.101.2", ] +[[package]] +name = "webpki-roots" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9c6eda1c830a36f361e7721c87fd79ea84293b54f8c48c959f85ec636f0f196" + [[package]] name = "whoami" version = "1.4.1" @@ -7357,9 +7154,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" dependencies = [ "memchr", ] @@ -7398,7 +7195,7 @@ dependencies = [ "log", "pulldown-cmark", "semver", - "unicode-xid 0.2.4", + "unicode-xid", "url", ] diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml index 6e27c2f7..7c98541e 100644 --- a/crates/axum-utils/Cargo.toml +++ b/crates/axum-utils/Cargo.toml @@ -18,11 +18,11 @@ http-body = "0.4.5" mime = "0.3.17" rand = "0.8.5" sentry = { version = "0.31.5", default-features = false } -serde = "1.0.174" +serde = "1.0.176" serde_with = "3.1.0" serde_urlencoded = "0.7.1" -serde_json = "1.0.103" -thiserror = "1.0.43" +serde_json = "1.0.104" +thiserror = "1.0.44" tokio = "1.29.1" tower = { version = "0.4.13", features = ["util"] } tracing = "0.1.37" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 6aa21d12..65bf5d63 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -6,12 +6,11 @@ edition = "2021" license = "Apache-2.0" [dependencies] -apalis-core = "0.4.2" +apalis-core = "0.4.3" anyhow = "1.0.72" -atty = "0.2.14" axum = "0.6.19" camino = "1.1.6" -clap = { version = "4.3.18", features = ["derive"] } +clap = { version = "4.3.19", features = ["derive"] } dotenv = "0.15.0" httpdate = "1.0.2" hyper = { version = "0.14.27", features = ["full"] } @@ -20,7 +19,7 @@ listenfd = "1.0.1" rand = "0.8.5" rand_chacha = "0.3.1" rustls = "0.21.5" -serde_json = "1.0.103" +serde_json = "1.0.104" serde_yaml = "0.9.25" sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres"] } tokio = { version = "1.29.1", features = ["full"] } diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index b11893de..7a0696ba 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -17,7 +17,7 @@ #![warn(clippy::pedantic)] #![allow(clippy::module_name_repetitions)] -use std::sync::Arc; +use std::{io::IsTerminal, sync::Arc}; use anyhow::Context; use clap::Parser; @@ -55,10 +55,12 @@ async fn try_main() -> anyhow::Result<()> { // Setup logging // This writes logs to stderr - let (log_writer, _guard) = tracing_appender::non_blocking(std::io::stderr()); + let output = std::io::stderr(); + let with_ansi = output.is_terminal(); + let (log_writer, _guard) = tracing_appender::non_blocking(output); let fmt_layer = tracing_subscriber::fmt::layer() .with_writer(log_writer) - .with_ansi(atty::is(atty::Stream::Stderr)); + .with_ansi(with_ansi); let filter_layer = EnvFilter::try_from_default_env() .or_else(|_| EnvFilter::try_new("info")) .context("could not setup logging filter")?; diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 757fd8da..c73dfcdf 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -10,7 +10,7 @@ tokio = { version = "1.29.1", features = ["fs", "rt"] } tracing = "0.1.37" async-trait = "0.1.72" -thiserror = "1.0.43" +thiserror = "1.0.44" anyhow = "1.0.72" camino = { version = "1.1.6", features = ["serde1"] } @@ -20,9 +20,9 @@ schemars = { version = "0.8.12", features = ["url", "chrono"] } ulid = { version = "1.0.0", features = ["serde"] } url = { version = "2.4.0", features = ["serde"] } -serde = { version = "1.0.174", features = ["derive"] } +serde = { version = "1.0.176", features = ["derive"] } serde_with = { version = "3.1.0", features = ["hex", "chrono"] } -serde_json = "1.0.103" +serde_json = "1.0.104" pem-rfc7468 = "0.7.0" rustls-pemfile = "1.0.3" diff --git a/crates/data-model/Cargo.toml b/crates/data-model/Cargo.toml index 5d89f40c..af0b8b9c 100644 --- a/crates/data-model/Cargo.toml +++ b/crates/data-model/Cargo.toml @@ -7,8 +7,8 @@ license = "Apache-2.0" [dependencies] chrono = "0.4.26" -thiserror = "1.0.43" -serde = "1.0.174" +thiserror = "1.0.44" +serde = "1.0.176" url = { version = "2.4.0", features = ["serde"] } crc = "3.0.1" ulid = { version = "1.0.0", features = ["serde"] } diff --git a/crates/email/Cargo.toml b/crates/email/Cargo.toml index 651433b3..3fbe7c5c 100644 --- a/crates/email/Cargo.toml +++ b/crates/email/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" [dependencies] async-trait = "0.1.72" tracing = "0.1.37" -thiserror = "1.0.43" +thiserror = "1.0.44" headers = "0.3.8" aws-sdk-sesv2 = { version = "0.28.0", default-features = false } diff --git a/crates/graphql/Cargo.toml b/crates/graphql/Cargo.toml index d764ceab..d5e80b13 100644 --- a/crates/graphql/Cargo.toml +++ b/crates/graphql/Cargo.toml @@ -11,8 +11,8 @@ async-graphql = { version = "5.0.10", features = ["chrono", "url"] } async-trait = "0.1.72" chrono = "0.4.26" lettre = { version = "0.10.4", default-features = false } -serde = { version = "1.0.174", features = ["derive"] } -thiserror = "1.0.43" +serde = { version = "1.0.176", features = ["derive"] } +thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["sync"] } tracing = "0.1.37" tower = { version = "0.4.13", features = ["util"] } diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index 67ca73a9..e63ea1ed 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -15,7 +15,7 @@ tracing = "0.1.37" opentelemetry = "0.19.0" # Error management -thiserror = "1.0.43" +thiserror = "1.0.44" anyhow = "1.0.72" sentry = { version = "0.31.5", default-features = false } @@ -36,9 +36,9 @@ lettre = { version = "0.10.4", default-features = false, features = ["builder"] sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres"] } # Various structure (de)serialization -serde = { version = "1.0.174", features = ["derive"] } +serde = { version = "1.0.176", features = ["derive"] } serde_with = { version = "3.1.0", features = ["hex", "chrono"] } -serde_json = "1.0.103" +serde_json = "1.0.104" serde_urlencoded = "0.7.1" # Password hashing diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index adb76b2d..18ef2575 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -20,23 +20,23 @@ once_cell = "1.18.0" opentelemetry = "0.19.0" rustls = { version = "0.21.5", optional = true } rustls-native-certs = { version = "0.6.3", optional = true } -serde = "1.0.174" -serde_json = "1.0.103" +serde = "1.0.176" +serde_json = "1.0.104" serde_urlencoded = "0.7.1" -thiserror = "1.0.43" +thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["sync", "parking_lot"], optional = true } tower = { version = "0.4.13", features = [] } tower-http = { version = "0.4.3", features = ["cors"] } tracing = "0.1.37" tracing-opentelemetry = "0.19.0" webpki = { version = "0.22.0", optional = true } -webpki-roots = { version = "0.24.0", optional = true } +webpki-roots = { version = "0.25.1", optional = true } mas-tower = { path = "../tower" } [dev-dependencies] anyhow = "1.0.72" -serde = { version = "1.0.174", features = ["derive"] } +serde = { version = "1.0.176", features = ["derive"] } tokio = { version = "1.29.1", features = ["macros", "rt"] } tower = { version = "0.4.13", features = ["util"] } diff --git a/crates/http/src/client.rs b/crates/http/src/client.rs index 21f806e7..925676cf 100644 --- a/crates/http/src/client.rs +++ b/crates/http/src/client.rs @@ -78,7 +78,7 @@ async fn tls_roots() -> Result { #[allow(clippy::unused_async)] async fn tls_roots() -> Result { let mut roots = rustls::RootCertStore::empty(); - roots.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| { + roots.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| { rustls::OwnedTrustAnchor::from_subject_spki_name_constraints( ta.subject, ta.spki, diff --git a/crates/iana-codegen/Cargo.toml b/crates/iana-codegen/Cargo.toml index 635282a7..609d1e3e 100644 --- a/crates/iana-codegen/Cargo.toml +++ b/crates/iana-codegen/Cargo.toml @@ -13,7 +13,7 @@ convert_case = "0.6.0" csv = "1.2.2" futures-util = "0.3.28" hyper = { version = "0.14.27", features = ["tcp", "client", "http1"] } -serde = { version = "1.0.174", features = ["derive"] } +serde = { version = "1.0.176", features = ["derive"] } tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "fs", "io-util"] } tracing = "0.1.37" tracing-subscriber = "0.3.17" diff --git a/crates/iana/Cargo.toml b/crates/iana/Cargo.toml index 6cf22df9..74586b9d 100644 --- a/crates/iana/Cargo.toml +++ b/crates/iana/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -serde = { version = "1.0.174", optional = true } +serde = { version = "1.0.176", optional = true } schemars = { version = "0.8.12", default-features = false, optional = true } [features] diff --git a/crates/jose/Cargo.toml b/crates/jose/Cargo.toml index 9880f426..554c9ab0 100644 --- a/crates/jose/Cargo.toml +++ b/crates/jose/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" base64ct = { version = "1.6.0", features = ["std"] } chrono = { version = "0.4.26", features = ["serde"] } digest = "0.10.7" -ecdsa = { version = "0.16.7", features = ["signing", "verifying"] } +ecdsa = { version = "0.16.8", features = ["signing", "verifying"] } elliptic-curve = "0.13.5" generic-array = "0.14.7" hmac = "0.12.1" @@ -20,12 +20,12 @@ rand = "0.8.5" rsa = "0.9.2" schemars = "0.8.12" sec1 = "0.7.3" -serde = { version = "1.0.174", features = ["derive"] } -serde_json = "1.0.103" +serde = { version = "1.0.176", features = ["derive"] } +serde_json = "1.0.104" serde_with = { version = "3.1.0", features = ["base64"] } sha2 = { version = "0.10.7", features = ["oid"] } signature = "2.1.0" -thiserror = "1.0.43" +thiserror = "1.0.44" tracing = "0.1.37" url = { version = "2.4.0", features = ["serde"] } diff --git a/crates/keystore/Cargo.toml b/crates/keystore/Cargo.toml index 4e79ff8a..e1c9215c 100644 --- a/crates/keystore/Cargo.toml +++ b/crates/keystore/Cargo.toml @@ -10,7 +10,7 @@ aead = { version = "0.5.2", features = ["std"] } const-oid = { version = "0.9.4", features = ["std"] } cookie = { version = "0.17.0", features = ["key-expansion", "private"] } der = { version = "0.7.7", features = ["std"] } -ecdsa = { version = "0.16.7", features = ["std"] } +ecdsa = { version = "0.16.8", features = ["std"] } elliptic-curve = { version = "0.13.5", features = ["std", "pem", "sec1"] } k256 = { version = "0.13.1", features = ["std"] } p256 = { version = "0.13.2", features = ["std"] } @@ -22,7 +22,7 @@ rand = "0.8.5" rsa = { version = "0.9.2", features = ["std", "pem"] } sec1 = { version = "0.7.3", features = ["std"] } spki = { version = "0.7.2", features = ["std"] } -thiserror = "1.0.43" +thiserror = "1.0.44" generic-array = "0.14.7" chacha20poly1305 = { version = "0.10.1", features = ["std"] } base64ct = "1.6.0" diff --git a/crates/listener/Cargo.toml b/crates/listener/Cargo.toml index 718d7830..2cce770b 100644 --- a/crates/listener/Cargo.toml +++ b/crates/listener/Cargo.toml @@ -11,7 +11,7 @@ futures-util = "0.3.28" http-body = "0.4.5" hyper = { version = "0.14.27", features = ["server", "http1", "http2", "tcp"] } pin-project-lite = "0.2.10" -thiserror = "1.0.43" +thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["net", "rt", "macros", "signal", "time"] } tokio-rustls = "0.24.1" tower-http = { version = "0.4.3", features = ["add-extension"] } diff --git a/crates/matrix-synapse/Cargo.toml b/crates/matrix-synapse/Cargo.toml index 552718b7..f9a67a67 100644 --- a/crates/matrix-synapse/Cargo.toml +++ b/crates/matrix-synapse/Cargo.toml @@ -10,7 +10,7 @@ anyhow = "1.0.72" async-trait = "0.1.72" http = "0.2.9" url = "2.4.0" -serde = { version = "1.0.174", features = ["derive"] } +serde = { version = "1.0.176", features = ["derive"] } tower = { version = "0.4.13", features = ["util"] } mas-axum-utils = { path = "../axum-utils" } diff --git a/crates/matrix/Cargo.toml b/crates/matrix/Cargo.toml index bdfa1463..20fc88db 100644 --- a/crates/matrix/Cargo.toml +++ b/crates/matrix/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -serde = { version = "1.0.174", features = ["derive"] } +serde = { version = "1.0.176", features = ["derive"] } async-trait = "0.1.72" http = "0.2.9" url = "2.4.0" diff --git a/crates/oauth2-types/Cargo.toml b/crates/oauth2-types/Cargo.toml index ae1ac00e..1275ba03 100644 --- a/crates/oauth2-types/Cargo.toml +++ b/crates/oauth2-types/Cargo.toml @@ -7,8 +7,8 @@ license = "Apache-2.0" [dependencies] http = "0.2.9" -serde = "1.0.174" -serde_json = "1.0.103" +serde = "1.0.176" +serde_json = "1.0.104" language-tags = { version = "0.3.2", features = ["serde"] } url = { version = "2.4.0", features = ["serde"] } parse-display = "0.8.2" @@ -17,7 +17,7 @@ serde_with = { version = "3.1.0", features = ["chrono"] } chrono = "0.4.26" sha2 = "0.10.7" data-encoding = "2.4.0" -thiserror = "1.0.43" +thiserror = "1.0.44" mas-iana = { path = "../iana" } mas-jose = { path = "../jose" } diff --git a/crates/oidc-client/Cargo.toml b/crates/oidc-client/Cargo.toml index 2e6a3efd..60adee23 100644 --- a/crates/oidc-client/Cargo.toml +++ b/crates/oidc-client/Cargo.toml @@ -23,18 +23,17 @@ bytes = "1.4.0" chrono = "0.4.26" form_urlencoded = "1.2.0" futures = "0.3.28" -futures-signals = "0.3.32" futures-util = "0.3.28" headers = "0.3.8" http = "0.2.9" once_cell = "1.18.0" mime = "0.3.17" rand = "0.8.5" -serde = { version = "1.0.174", features = ["derive"] } -serde_json = "1.0.103" +serde = { version = "1.0.176", features = ["derive"] } +serde_json = "1.0.104" serde_urlencoded = "0.7.1" serde_with = "3.1.0" -thiserror = "1.0.43" +thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["rt", "macros", "rt-multi-thread"] } tower = { version = "0.4.13", features = ["full"] } tracing = "0.1.37" diff --git a/crates/policy/Cargo.toml b/crates/policy/Cargo.toml index 979d7908..8f8a4f7c 100644 --- a/crates/policy/Cargo.toml +++ b/crates/policy/Cargo.toml @@ -8,12 +8,12 @@ license = "Apache-2.0" [dependencies] anyhow = "1.0.72" opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" } -serde = { version = "1.0.174", features = ["derive"] } -serde_json = "1.0.103" -thiserror = "1.0.43" +serde = { version = "1.0.176", features = ["derive"] } +serde_json = "1.0.104" +thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["io-util"] } tracing = "0.1.37" -wasmtime = { version = "10.0.1", default-features = false, features = ["async", "cranelift"] } +wasmtime = { version = "11.0.1", default-features = false, features = ["async", "cranelift"] } mas-data-model = { path = "../data-model" } oauth2-types = { path = "../oauth2-types" } diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 66b6de09..493b5dfc 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [dependencies] axum = { version = "0.6.19", default-features = false } -serde = { version = "1.0.174", features = ["derive"] } +serde = { version = "1.0.176", features = ["derive"] } serde_urlencoded = "0.7.1" url = "2.4.0" ulid = "1.0.0" diff --git a/crates/spa/Cargo.toml b/crates/spa/Cargo.toml index 1b8f2c04..fc8ab5c1 100644 --- a/crates/spa/Cargo.toml +++ b/crates/spa/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -serde = { version = "1.0.174", features = ["derive"] } -thiserror = "1.0.43" +serde = { version = "1.0.176", features = ["derive"] } +thiserror = "1.0.44" camino = { version = "1.1.6", features = ["serde1"] } diff --git a/crates/storage-pg/Cargo.toml b/crates/storage-pg/Cargo.toml index 84bad60f..5c935954 100644 --- a/crates/storage-pg/Cargo.toml +++ b/crates/storage-pg/Cargo.toml @@ -8,11 +8,12 @@ license = "Apache-2.0" [dependencies] async-trait = "0.1.72" sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "json", "uuid"] } -sea-query = { version = "0.28.5", features = ["derive", "attr", "with-uuid", "with-chrono"] } +sea-query = { version = "0.30.0", features = ["derive", "attr", "with-uuid", "with-chrono"] } +sea-query-binder = { version = "0.5.0", features = ["sqlx-postgres", "with-uuid", "with-chrono"] } chrono = { version = "0.4.26", features = ["serde"] } -serde = { version = "1.0.174", features = ["derive"] } -serde_json = "1.0.103" -thiserror = "1.0.43" +serde = { version = "1.0.176", features = ["derive"] } +serde_json = "1.0.104" +thiserror = "1.0.44" tracing = "0.1.37" futures-util = "0.3.28" diff --git a/crates/storage-pg/src/compat/session.rs b/crates/storage-pg/src/compat/session.rs index de3e673c..cd1f8a93 100644 --- a/crates/storage-pg/src/compat/session.rs +++ b/crates/storage-pg/src/compat/session.rs @@ -23,6 +23,7 @@ use mas_storage::{ }; use rand::RngCore; use sea_query::{enum_def, Expr, PostgresQueryBuilder, Query}; +use sea_query_binder::SqlxBinder; use sqlx::PgConnection; use ulid::Ulid; use url::Url; @@ -31,7 +32,6 @@ use uuid::Uuid; use crate::{ iden::{CompatSessions, CompatSsoLogins}, pagination::QueryBuilderExt, - sea_query_sqlx::map_values, tracing::ExecuteExt, DatabaseError, DatabaseInconsistencyError, }; @@ -323,7 +323,7 @@ impl<'c> CompatSessionRepository for PgCompatSessionRepository<'c> { filter: CompatSessionFilter<'_>, pagination: Pagination, ) -> Result)>, Self::Error> { - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr_as( Expr::col((CompatSessions::Table, CompatSessions::CompatSessionId)), CompatSessionAndSsoLoginLookupIden::CompatSessionId, @@ -400,9 +400,7 @@ impl<'c> CompatSessionRepository for PgCompatSessionRepository<'c> { (CompatSessions::Table, CompatSessions::CompatSessionId), pagination, ) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let edges: Vec = sqlx::query_as_with(&sql, arguments) .traced() @@ -423,7 +421,7 @@ impl<'c> CompatSessionRepository for PgCompatSessionRepository<'c> { err, )] async fn count(&mut self, filter: CompatSessionFilter<'_>) -> Result { - let (sql, values) = sea_query::Query::select() + let (sql, arguments) = sea_query::Query::select() .expr(Expr::col((CompatSessions::Table, CompatSessions::CompatSessionId)).count()) .from(CompatSessions::Table) .and_where_option(filter.user().map(|user| { @@ -456,9 +454,7 @@ impl<'c> CompatSessionRepository for PgCompatSessionRepository<'c> { exists.not() } })) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let count: i64 = sqlx::query_scalar_with(&sql, arguments) .traced() diff --git a/crates/storage-pg/src/compat/sso_login.rs b/crates/storage-pg/src/compat/sso_login.rs index 11ab2fa4..fe5b3b46 100644 --- a/crates/storage-pg/src/compat/sso_login.rs +++ b/crates/storage-pg/src/compat/sso_login.rs @@ -21,6 +21,7 @@ use mas_storage::{ }; use rand::RngCore; use sea_query::{enum_def, Expr, PostgresQueryBuilder, Query}; +use sea_query_binder::SqlxBinder; use sqlx::PgConnection; use ulid::Ulid; use url::Url; @@ -29,7 +30,6 @@ use uuid::Uuid; use crate::{ iden::{CompatSessions, CompatSsoLogins}, pagination::QueryBuilderExt, - sea_query_sqlx::map_values, tracing::ExecuteExt, DatabaseError, DatabaseInconsistencyError, }; @@ -316,7 +316,7 @@ impl<'c> CompatSsoLoginRepository for PgCompatSsoLoginRepository<'c> { filter: CompatSsoLoginFilter<'_>, pagination: Pagination, ) -> Result, Self::Error> { - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr_as( Expr::col((CompatSsoLogins::Table, CompatSsoLogins::CompatSsoLoginId)), CompatSsoLoginLookupIden::CompatSsoLoginId, @@ -380,9 +380,7 @@ impl<'c> CompatSsoLoginRepository for PgCompatSsoLoginRepository<'c> { (CompatSsoLogins::Table, CompatSsoLogins::CompatSsoLoginId), pagination, ) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let edges: Vec = sqlx::query_as_with(&sql, arguments) .traced() @@ -403,7 +401,7 @@ impl<'c> CompatSsoLoginRepository for PgCompatSsoLoginRepository<'c> { err )] async fn count(&mut self, filter: CompatSsoLoginFilter<'_>) -> Result { - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr(Expr::col((CompatSsoLogins::Table, CompatSsoLogins::CompatSsoLoginId)).count()) .from(CompatSsoLogins::Table) .and_where_option(filter.user().map(|user| { @@ -436,9 +434,7 @@ impl<'c> CompatSsoLoginRepository for PgCompatSsoLoginRepository<'c> { Expr::col((CompatSsoLogins::Table, CompatSsoLogins::FulfilledAt)).is_null() } })) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let count: i64 = sqlx::query_scalar_with(&sql, arguments) .traced() diff --git a/crates/storage-pg/src/lib.rs b/crates/storage-pg/src/lib.rs index 004bee31..4a822986 100644 --- a/crates/storage-pg/src/lib.rs +++ b/crates/storage-pg/src/lib.rs @@ -187,7 +187,6 @@ mod errors; pub(crate) mod iden; pub(crate) mod pagination; pub(crate) mod repository; -mod sea_query_sqlx; pub(crate) mod tracing; pub(crate) use self::errors::DatabaseInconsistencyError; diff --git a/crates/storage-pg/src/oauth2/session.rs b/crates/storage-pg/src/oauth2/session.rs index e1f59835..e7458a20 100644 --- a/crates/storage-pg/src/oauth2/session.rs +++ b/crates/storage-pg/src/oauth2/session.rs @@ -22,6 +22,7 @@ use mas_storage::{ use oauth2_types::scope::Scope; use rand::RngCore; use sea_query::{enum_def, Expr, PostgresQueryBuilder, Query}; +use sea_query_binder::SqlxBinder; use sqlx::PgConnection; use ulid::Ulid; use uuid::Uuid; @@ -29,7 +30,6 @@ use uuid::Uuid; use crate::{ iden::{OAuth2Sessions, UserSessions}, pagination::QueryBuilderExt, - sea_query_sqlx::map_values, tracing::ExecuteExt, DatabaseError, DatabaseInconsistencyError, }; @@ -232,7 +232,7 @@ impl<'c> OAuth2SessionRepository for PgOAuth2SessionRepository<'c> { filter: OAuth2SessionFilter<'_>, pagination: Pagination, ) -> Result, Self::Error> { - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr_as( Expr::col((OAuth2Sessions::Table, OAuth2Sessions::OAuth2SessionId)), OAuthSessionLookupIden::Oauth2SessionId, @@ -291,9 +291,7 @@ impl<'c> OAuth2SessionRepository for PgOAuth2SessionRepository<'c> { (OAuth2Sessions::Table, OAuth2Sessions::OAuth2SessionId), pagination, ) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let edges: Vec = sqlx::query_as_with(&sql, arguments) .traced() @@ -314,7 +312,7 @@ impl<'c> OAuth2SessionRepository for PgOAuth2SessionRepository<'c> { err, )] async fn count(&mut self, filter: OAuth2SessionFilter<'_>) -> Result { - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr(Expr::col((OAuth2Sessions::Table, OAuth2Sessions::OAuth2SessionId)).count()) .from(OAuth2Sessions::Table) .and_where_option(filter.user().map(|user| { @@ -346,9 +344,7 @@ impl<'c> OAuth2SessionRepository for PgOAuth2SessionRepository<'c> { Expr::col((OAuth2Sessions::Table, OAuth2Sessions::FinishedAt)).is_not_null() } })) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let count: i64 = sqlx::query_scalar_with(&sql, arguments) .traced() diff --git a/crates/storage-pg/src/sea_query_sqlx.rs b/crates/storage-pg/src/sea_query_sqlx.rs deleted file mode 100644 index 8d6cf333..00000000 --- a/crates/storage-pg/src/sea_query_sqlx.rs +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2021-2023 The Matrix.org Foundation C.I.C. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! A [`sea_query::Values`] to [`sqlx::Arguments`] mapper - -use sea_query::Value; -use sqlx::Arguments; - -pub(crate) fn map_values(values: sea_query::Values) -> sqlx::postgres::PgArguments { - let mut arguments = sqlx::postgres::PgArguments::default(); - - for value in values { - match value { - Value::Bool(b) => arguments.add(b), - Value::TinyInt(i) => arguments.add(i), - Value::SmallInt(i) => arguments.add(i), - Value::Int(i) => arguments.add(i), - Value::BigInt(i) => arguments.add(i), - Value::TinyUnsigned(u) => arguments.add(u.map(i16::from)), - Value::SmallUnsigned(u) => arguments.add(u.map(i32::from)), - Value::Unsigned(u) => arguments.add(u.map(i64::from)), - Value::BigUnsigned(u) => arguments.add(u.map(|u| i64::try_from(u).unwrap_or(i64::MAX))), - Value::Float(f) => arguments.add(f), - Value::Double(d) => arguments.add(d), - Value::String(s) => arguments.add(s.as_deref()), - Value::Char(c) => arguments.add(c.map(|c| c.to_string())), - Value::Bytes(b) => arguments.add(b.as_deref()), - Value::ChronoDate(d) => arguments.add(d.as_deref()), - Value::ChronoTime(t) => arguments.add(t.as_deref()), - Value::ChronoDateTime(dt) => arguments.add(dt.as_deref()), - Value::ChronoDateTimeUtc(dt) => arguments.add(dt.as_deref()), - Value::ChronoDateTimeLocal(dt) => arguments.add(dt.as_deref()), - Value::ChronoDateTimeWithTimeZone(dt) => arguments.add(dt.as_deref()), - Value::Uuid(u) => arguments.add(u.as_deref()), - - // This depends on the features enabled for sea-query, so let's keep the wildcard - #[allow(unreachable_patterns)] - _ => unimplemented!(), - } - } - - arguments -} diff --git a/crates/storage-pg/src/upstream_oauth2/link.rs b/crates/storage-pg/src/upstream_oauth2/link.rs index a0f6a2f8..1ccdf062 100644 --- a/crates/storage-pg/src/upstream_oauth2/link.rs +++ b/crates/storage-pg/src/upstream_oauth2/link.rs @@ -21,13 +21,13 @@ use mas_storage::{ }; use rand::RngCore; use sea_query::{enum_def, Expr, PostgresQueryBuilder, Query}; +use sea_query_binder::SqlxBinder; use sqlx::PgConnection; use ulid::Ulid; use uuid::Uuid; use crate::{ - iden::UpstreamOAuthLinks, pagination::QueryBuilderExt, sea_query_sqlx::map_values, - tracing::ExecuteExt, DatabaseError, + iden::UpstreamOAuthLinks, pagination::QueryBuilderExt, tracing::ExecuteExt, DatabaseError, }; /// An implementation of [`UpstreamOAuthLinkRepository`] for a PostgreSQL @@ -241,7 +241,7 @@ impl<'c> UpstreamOAuthLinkRepository for PgUpstreamOAuthLinkRepository<'c> { filter: UpstreamOAuthLinkFilter<'_>, pagination: Pagination, ) -> Result, DatabaseError> { - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr_as( Expr::col(( UpstreamOAuthLinks::Table, @@ -287,9 +287,7 @@ impl<'c> UpstreamOAuthLinkRepository for PgUpstreamOAuthLinkRepository<'c> { ), pagination, ) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let edges: Vec = sqlx::query_as_with(&sql, arguments) .traced() @@ -310,7 +308,7 @@ impl<'c> UpstreamOAuthLinkRepository for PgUpstreamOAuthLinkRepository<'c> { err, )] async fn count(&mut self, filter: UpstreamOAuthLinkFilter<'_>) -> Result { - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr( Expr::col(( UpstreamOAuthLinks::Table, @@ -330,9 +328,7 @@ impl<'c> UpstreamOAuthLinkRepository for PgUpstreamOAuthLinkRepository<'c> { )) .eq(Uuid::from(provider.id)) })) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let count: i64 = sqlx::query_scalar_with(&sql, arguments) .traced() diff --git a/crates/storage-pg/src/upstream_oauth2/provider.rs b/crates/storage-pg/src/upstream_oauth2/provider.rs index 2bc713d4..12641783 100644 --- a/crates/storage-pg/src/upstream_oauth2/provider.rs +++ b/crates/storage-pg/src/upstream_oauth2/provider.rs @@ -23,14 +23,15 @@ use mas_storage::{ use oauth2_types::scope::Scope; use rand::RngCore; use sea_query::{enum_def, Expr, PostgresQueryBuilder, Query}; +use sea_query_binder::SqlxBinder; use sqlx::{types::Json, PgConnection}; use tracing::{info_span, Instrument}; use ulid::Ulid; use uuid::Uuid; use crate::{ - iden::UpstreamOAuthProviders, pagination::QueryBuilderExt, sea_query_sqlx::map_values, - tracing::ExecuteExt, DatabaseError, DatabaseInconsistencyError, + iden::UpstreamOAuthProviders, pagination::QueryBuilderExt, tracing::ExecuteExt, DatabaseError, + DatabaseInconsistencyError, }; /// An implementation of [`UpstreamOAuthProviderRepository`] for a PostgreSQL @@ -373,7 +374,7 @@ impl<'c> UpstreamOAuthProviderRepository for PgUpstreamOAuthProviderRepository<' pagination: Pagination, ) -> Result, Self::Error> { // XXX: the filter is currently ignored, as it does not have any fields - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr_as( Expr::col(( UpstreamOAuthProviders::Table, @@ -442,9 +443,7 @@ impl<'c> UpstreamOAuthProviderRepository for PgUpstreamOAuthProviderRepository<' ), pagination, ) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let edges: Vec = sqlx::query_as_with(&sql, arguments) .traced() @@ -471,7 +470,7 @@ impl<'c> UpstreamOAuthProviderRepository for PgUpstreamOAuthProviderRepository<' _filter: UpstreamOAuthProviderFilter<'_>, ) -> Result { // XXX: the filter is currently ignored, as it does not have any fields - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr( Expr::col(( UpstreamOAuthProviders::Table, @@ -480,9 +479,7 @@ impl<'c> UpstreamOAuthProviderRepository for PgUpstreamOAuthProviderRepository<' .count(), ) .from(UpstreamOAuthProviders::Table) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let count: i64 = sqlx::query_scalar_with(&sql, arguments) .traced() diff --git a/crates/storage-pg/src/user/email.rs b/crates/storage-pg/src/user/email.rs index 83106aaf..10b73527 100644 --- a/crates/storage-pg/src/user/email.rs +++ b/crates/storage-pg/src/user/email.rs @@ -21,14 +21,15 @@ use mas_storage::{ }; use rand::RngCore; use sea_query::{enum_def, Expr, PostgresQueryBuilder, Query}; +use sea_query_binder::SqlxBinder; use sqlx::PgConnection; use tracing::{info_span, Instrument}; use ulid::Ulid; use uuid::Uuid; use crate::{ - iden::UserEmails, pagination::QueryBuilderExt, sea_query_sqlx::map_values, tracing::ExecuteExt, - DatabaseError, DatabaseInconsistencyError, + iden::UserEmails, pagination::QueryBuilderExt, tracing::ExecuteExt, DatabaseError, + DatabaseInconsistencyError, }; /// An implementation of [`UserEmailRepository`] for a PostgreSQL connection @@ -243,7 +244,7 @@ impl<'c> UserEmailRepository for PgUserEmailRepository<'c> { filter: UserEmailFilter<'_>, pagination: Pagination, ) -> Result, DatabaseError> { - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr_as( Expr::col((UserEmails::Table, UserEmails::UserEmailId)), UserEmailLookupIden::UserEmailId, @@ -276,9 +277,7 @@ impl<'c> UserEmailRepository for PgUserEmailRepository<'c> { } })) .generate_pagination((UserEmails::Table, UserEmails::UserEmailId), pagination) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let edges: Vec = sqlx::query_as_with(&sql, arguments) .traced() @@ -299,7 +298,7 @@ impl<'c> UserEmailRepository for PgUserEmailRepository<'c> { err, )] async fn count(&mut self, filter: UserEmailFilter<'_>) -> Result { - let (sql, values) = Query::select() + let (sql, arguments) = Query::select() .expr(Expr::col((UserEmails::Table, UserEmails::UserEmailId)).count()) .from(UserEmails::Table) .and_where_option(filter.user().map(|user| { @@ -312,9 +311,7 @@ impl<'c> UserEmailRepository for PgUserEmailRepository<'c> { Expr::col((UserEmails::Table, UserEmails::ConfirmedAt)).is_null() } })) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let count: i64 = sqlx::query_scalar_with(&sql, arguments) .traced() diff --git a/crates/storage-pg/src/user/session.rs b/crates/storage-pg/src/user/session.rs index b6458a93..c0afdc63 100644 --- a/crates/storage-pg/src/user/session.rs +++ b/crates/storage-pg/src/user/session.rs @@ -18,6 +18,7 @@ use mas_data_model::{Authentication, BrowserSession, Password, UpstreamOAuthLink use mas_storage::{user::BrowserSessionRepository, Clock, Page, Pagination}; use rand::RngCore; use sea_query::{Expr, PostgresQueryBuilder}; +use sea_query_binder::SqlxBinder; use sqlx::PgConnection; use ulid::Ulid; use uuid::Uuid; @@ -25,7 +26,6 @@ use uuid::Uuid; use crate::{ iden::{UserSessions, Users}, pagination::QueryBuilderExt, - sea_query_sqlx::map_values, tracing::ExecuteExt, DatabaseError, DatabaseInconsistencyError, }; @@ -207,7 +207,7 @@ impl<'c> BrowserSessionRepository for PgBrowserSessionRepository<'c> { filter: mas_storage::user::BrowserSessionFilter<'_>, pagination: Pagination, ) -> Result, Self::Error> { - let (sql, values) = sea_query::Query::select() + let (sql, arguments) = sea_query::Query::select() .expr_as( Expr::col((UserSessions::Table, UserSessions::UserSessionId)), SessionLookupIden::UserSessionId, @@ -254,9 +254,7 @@ impl<'c> BrowserSessionRepository for PgBrowserSessionRepository<'c> { (UserSessions::Table, UserSessions::UserSessionId), pagination, ) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let edges: Vec = sqlx::query_as_with(&sql, arguments) .traced() @@ -282,7 +280,7 @@ impl<'c> BrowserSessionRepository for PgBrowserSessionRepository<'c> { &mut self, filter: mas_storage::user::BrowserSessionFilter<'_>, ) -> Result { - let (sql, values) = sea_query::Query::select() + let (sql, arguments) = sea_query::Query::select() .expr(Expr::col((UserSessions::Table, UserSessions::UserSessionId)).count()) .from(UserSessions::Table) .and_where_option(filter.user().map(|user| { @@ -295,9 +293,7 @@ impl<'c> BrowserSessionRepository for PgBrowserSessionRepository<'c> { Expr::col((UserSessions::Table, UserSessions::FinishedAt)).is_not_null() } })) - .build(PostgresQueryBuilder); - - let arguments = map_values(values); + .build_sqlx(PostgresQueryBuilder); let count: i64 = sqlx::query_scalar_with(&sql, arguments) .traced() diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index dc31c19b..6c08d58f 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -8,14 +8,14 @@ license = "Apache-2.0" [dependencies] async-trait = "0.1.72" chrono = "0.4.26" -thiserror = "1.0.43" +thiserror = "1.0.44" futures-util = "0.3.28" -apalis-core = { version = "0.4.2", features = ["tokio-comp"] } +apalis-core = { version = "0.4.3", features = ["tokio-comp"] } opentelemetry = "0.19.0" rand_core = "0.6.4" -serde = "1.0.174" -serde_json = "1.0.103" +serde = "1.0.176" +serde_json = "1.0.104" tracing = "0.1.37" tracing-opentelemetry = "0.19.0" url = "2.4.0" diff --git a/crates/tasks/Cargo.toml b/crates/tasks/Cargo.toml index e6ae46c8..fc90e08e 100644 --- a/crates/tasks/Cargo.toml +++ b/crates/tasks/Cargo.toml @@ -7,8 +7,8 @@ license = "apache-2.0" [dependencies] anyhow = "1.0.72" -apalis-core = { version = "0.4.2", features = ["extensions", "tokio-comp", "storage"] } -apalis-cron = "0.4.2" +apalis-core = { version = "0.4.3", features = ["extensions", "tokio-comp", "storage"] } +apalis-cron = "0.4.3" async-stream = "0.3.5" async-trait = "0.1.72" chrono = "0.4.26" @@ -17,7 +17,7 @@ futures-lite = "1.13.0" rand = "0.8.5" rand_chacha = "0.3.1" sqlx = { version = "0.7.1", features = ["runtime-tokio-rustls", "postgres"] } -thiserror = "1.0.43" +thiserror = "1.0.44" tokio = { version = "1.29.1", features = ["rt"] } tower = "0.4.13" tracing = "0.1.37" @@ -25,8 +25,8 @@ tracing-opentelemetry = "0.19.0" opentelemetry = "0.19.0" ulid = "1.0.0" url = "2.4.0" -serde = { version = "1.0.174", features = ["derive"] } -serde_json = "1.0.103" +serde = { version = "1.0.176", features = ["derive"] } +serde_json = "1.0.104" mas-data-model = { path = "../data-model" } mas-email = { path = "../email" } diff --git a/crates/templates/Cargo.toml b/crates/templates/Cargo.toml index 14a9becf..d02e0175 100644 --- a/crates/templates/Cargo.toml +++ b/crates/templates/Cargo.toml @@ -10,11 +10,11 @@ tracing = "0.1.37" tokio = { version = "1.29.1", features = ["macros", "rt"] } anyhow = "1.0.72" -thiserror = "1.0.43" +thiserror = "1.0.44" tera = "1.19.0" -serde = { version = "1.0.174", features = ["derive"] } -serde_json = "1.0.103" +serde = { version = "1.0.176", features = ["derive"] } +serde_json = "1.0.104" serde_urlencoded = "0.7.1" camino = "1.1.6"