From a47c755184f368b5a9ea142db373f1635ade97e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Wed, 27 Nov 2024 14:54:15 +0100 Subject: [PATCH] chore: Bump the deps and move some of them to the workspace --- .deny.toml | 1 + Cargo.lock | 664 ++++++++++++------ Cargo.toml | 58 +- crates/matrix-sdk-base/Cargo.toml | 10 +- crates/matrix-sdk-common/Cargo.toml | 12 +- crates/matrix-sdk-crypto/Cargo.toml | 26 +- crates/matrix-sdk-indexeddb/Cargo.toml | 16 +- .../src/crypto_store/migrations/mod.rs | 8 +- crates/matrix-sdk-qrcode/Cargo.toml | 6 +- crates/matrix-sdk-sqlite/Cargo.toml | 10 +- crates/matrix-sdk-store-encryption/Cargo.toml | 10 +- crates/matrix-sdk-ui/Cargo.toml | 12 +- crates/matrix-sdk/Cargo.toml | 38 +- 13 files changed, 576 insertions(+), 295 deletions(-) diff --git a/.deny.toml b/.deny.toml index 5b60ee4be2f..ee7d34d1e28 100644 --- a/.deny.toml +++ b/.deny.toml @@ -24,6 +24,7 @@ allow = [ "ISC", "MIT", "MPL-2.0", + "Unicode-3.0", "Zlib", ] exceptions = [ diff --git a/Cargo.lock b/Cargo.lock index a71427865f2..e5ac40cb13d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -150,9 +150,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "anymap2" @@ -303,9 +303,9 @@ dependencies = [ [[package]] name = "async-once-cell" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" +checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a" [[package]] name = "async-rx" @@ -341,9 +341,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -370,9 +370,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", @@ -396,7 +396,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -404,9 +404,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", @@ -417,7 +417,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -514,21 +514,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" @@ -552,9 +537,9 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "blake3" -version = "1.5.3" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec", @@ -627,9 +612,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bytesize" @@ -666,7 +651,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -701,9 +686,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -918,9 +906,9 @@ source = "git+https://github.com/jplatte/const_panic?rev=9024a4cb3eac45c1d2d980f [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -1219,9 +1207,9 @@ dependencies = [ [[package]] name = "deadpool-sqlite" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9cc6210316f8b7ced394e2a5d2833ce7097fb28afb5881299c61bc18e8e0e9" +checksum = "656f14fc1ab819c65f332045ea7cb38841bbe551f3b2bc7e3abefb559af4155c" dependencies = [ "deadpool 0.12.1", "deadpool-sync", @@ -1329,6 +1317,17 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dyn-clone" version = "1.0.17" @@ -1571,7 +1570,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tower", + "tower 0.4.13", "tracing-subscriber", "url", ] @@ -1701,9 +1700,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fancy_constructor" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71f317e4af73b2f8f608fac190c52eac4b1879d2145df1db2fe48881ca69435" +checksum = "07b19d0e43eae2bfbafe4931b5e79c73fb1a849ca15cd41a761a7b8587f9a1a2" dependencies = [ "macroific", "proc-macro2", @@ -1713,9 +1712,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "ff" @@ -1993,9 +1992,9 @@ dependencies = [ [[package]] name = "growable-bloom-filter" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c669fa03050eb3445343f215d62fc1ab831e8098bc9a55f26e9724faff11075c" +checksum = "d174ccb4ba660d431329e7f0797870d0a4281e36353ec4b4a3c5eab6c2cfb6f1" dependencies = [ "serde", "serde_bytes", @@ -2259,7 +2258,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -2287,6 +2286,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -2295,19 +2412,30 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "image" -version = "0.25.2" +version = "0.25.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b" dependencies = [ "bytemuck", "byteorder-lite", @@ -2508,9 +2636,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -2598,9 +2726,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" [[package]] name = "libm" @@ -2620,9 +2748,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -2635,6 +2763,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lock_api" version = "0.4.12" @@ -2745,9 +2879,9 @@ dependencies = [ [[package]] name = "mas-http" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4fa3f4f6cece26099dba086413276f440fcad27b8ea204baf46462a730aed7" +checksum = "6f0f43adb7c4c4dc44517b3167d0b25111273c088eaaf79bf326c5bfb6006e52" dependencies = [ "async-trait", "bytes", @@ -2764,8 +2898,8 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "thiserror", - "tower", + "thiserror 1.0.63", + "tower 0.4.13", "tower-http", "tracing", "tracing-opentelemetry", @@ -2773,9 +2907,9 @@ dependencies = [ [[package]] name = "mas-iana" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19952e638c55401f5ce3d9f3a7a8a4213bc64f8d009824bdc6a06d3d8ebb5ba5" +checksum = "0d41af7e8eb3584b648c563a1b97b8f60c7f3dcd7ea0ded525050418d90c5200" dependencies = [ "schemars", "serde", @@ -2783,9 +2917,9 @@ dependencies = [ [[package]] name = "mas-jose" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d73e868cddb188020c87cebc64ef426b96af4577eeb752deae72c6bb61d0375b" +checksum = "bb6a1c99221601a1e9ef284efaa6db5985389c839c299d71d5a4c2933ba88eda" dependencies = [ "base64ct", "chrono", @@ -2807,16 +2941,16 @@ dependencies = [ "serde_with", "sha2", "signature", - "thiserror", + "thiserror 1.0.63", "tracing", "url", ] [[package]] name = "mas-oidc-client" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ca6eb2ed615b36f5a988856be91918dbdd46c3160fb0739ca277d03ad690b4" +checksum = "0b4aea512a69c0441c349668da2f5b0bdaeba45163b9616cb9373177de1834ec" dependencies = [ "base64ct", "bytes", @@ -2836,8 +2970,8 @@ dependencies = [ "serde_json", "serde_urlencoded", "serde_with", - "thiserror", - "tower", + "thiserror 1.0.63", + "tower 0.4.13", "tracing", "url", ] @@ -2864,7 +2998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e2551de3bba2cc65b52dc6b268df6114011fe118ac24870fbcf1b35537bd721" dependencies = [ "matrix-pickle-derive", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -2938,12 +3072,12 @@ dependencies = [ "similar-asserts", "stream_assert", "tempfile", - "thiserror", + "thiserror 2.0.3", "tokio", "tokio-stream", "tokio-test", "tokio-util", - "tower", + "tower 0.5.1", "tracing", "tracing-subscriber", "uniffi", @@ -2984,7 +3118,7 @@ dependencies = [ "serde_json", "similar-asserts", "stream_assert", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", "unicode-normalization", @@ -3010,7 +3144,7 @@ dependencies = [ "ruma", "serde", "serde_json", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", "tracing-subscriber", @@ -3044,7 +3178,7 @@ dependencies = [ "hmac", "http", "indoc", - "itertools 0.12.1", + "itertools 0.13.0", "js_option", "matrix-sdk-common", "matrix-sdk-qrcode", @@ -3060,7 +3194,7 @@ dependencies = [ "similar-asserts", "stream_assert", "subtle", - "thiserror", + "thiserror 2.0.3", "time", "tokio", "tokio-stream", @@ -3093,7 +3227,7 @@ dependencies = [ "serde_json", "sha2", "tempfile", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing-subscriber", "uniffi", @@ -3123,7 +3257,7 @@ dependencies = [ "ruma", "serde", "serde_json", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", "tracing-appender", @@ -3171,7 +3305,7 @@ dependencies = [ "serde-wasm-bindgen", "serde_json", "sha2", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", "tracing-subscriber", @@ -3221,7 +3355,7 @@ dependencies = [ "image", "qrcode", "ruma-common", - "thiserror", + "thiserror 2.0.3", "vodozemac", ] @@ -3233,7 +3367,7 @@ dependencies = [ "async-trait", "deadpool-sqlite", "glob", - "itertools 0.12.1", + "itertools 0.13.0", "matrix-sdk-base", "matrix-sdk-crypto", "matrix-sdk-store-encryption", @@ -3246,7 +3380,7 @@ dependencies = [ "serde_json", "similar-asserts", "tempfile", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", "vodozemac", @@ -3268,7 +3402,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 2.0.3", "zeroize", ] @@ -3323,7 +3457,7 @@ dependencies = [ "growable-bloom-filter", "imbl", "indexmap 2.6.0", - "itertools 0.12.1", + "itertools 0.13.0", "matrix-sdk", "matrix-sdk-base", "matrix-sdk-test", @@ -3335,7 +3469,7 @@ dependencies = [ "serde_json", "stream_assert", "tempfile", - "thiserror", + "thiserror 2.0.3", "tokio", "tokio-stream", "tracing", @@ -3367,9 +3501,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime2ext" -version = "0.1.52" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a85a5069ebd40e64b1985773cc81addbe9d90d7ecf60e7b5475a57ad584c70" +checksum = "515a63dc9666c865e848b043ab52fe9a5c713ae89cde4b5fbaae67cfd614b93a" [[package]] name = "mime_guess" @@ -3381,6 +3515,16 @@ dependencies = [ "unicase", ] +[[package]] +name = "minicov" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b" +dependencies = [ + "cc", + "walkdir", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3587,9 +3731,9 @@ dependencies = [ [[package]] name = "oauth2" -version = "5.0.0-alpha.4" +version = "5.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098af5a5110b4deacf3200682963713b143ae9d28762b739bdb7b98429dfaf68" +checksum = "23d385da3c602d29036d2f70beed71c36604df7570be17fed4c5b839616785bf" dependencies = [ "base64 0.22.1", "chrono", @@ -3601,15 +3745,15 @@ dependencies = [ "serde_json", "serde_path_to_error", "sha2", - "thiserror", + "thiserror 1.0.63", "url", ] [[package]] name = "oauth2-types" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74573d5c35d172f72bc0f8ca82ed7978c060ce880780e4470e27d2efce10a06f" +checksum = "db9baa46cfc1969e04a7f8c31ee6718a8b4cb52ef31d7d91772f878052d872e1" dependencies = [ "chrono", "data-encoding", @@ -3621,7 +3765,7 @@ dependencies = [ "serde_json", "serde_with", "sha2", - "thiserror", + "thiserror 1.0.63", "url", ] @@ -3636,9 +3780,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -3654,9 +3798,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openidconnect" -version = "4.0.0-alpha.2" +version = "4.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4c74c00c2727896cebfcd04018dea51902881e711c69f76a446314ab5596e2" +checksum = "a93a50789d0b649986bfb104cdef97736ca072d579ec88496d5c6f9abed0ea85" dependencies = [ "base64 0.21.7", "chrono", @@ -3679,7 +3823,7 @@ dependencies = [ "serde_with", "sha2", "subtle", - "thiserror", + "thiserror 1.0.63", "url", ] @@ -3738,7 +3882,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -3761,7 +3905,7 @@ dependencies = [ "opentelemetry", "percent-encoding", "rand", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -3981,9 +4125,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -4088,7 +4232,7 @@ dependencies = [ "smallvec", "symbolic-demangle", "tempfile", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -4144,9 +4288,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -4157,8 +4301,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ - "bit-set", - "bit-vec", "bitflags 2.6.0", "lazy_static", "num-traits", @@ -4166,8 +4308,6 @@ dependencies = [ "rand_chacha", "rand_xorshift", "regex-syntax 0.8.5", - "rusty-fork", - "tempfile", "unarray", ] @@ -4221,12 +4361,6 @@ dependencies = [ "image", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quick-xml" version = "0.26.0" @@ -4248,7 +4382,7 @@ dependencies = [ "quinn-udp", "rustc-hash 1.1.0", "rustls", - "thiserror", + "thiserror 1.0.63", "tokio", "tracing", ] @@ -4265,7 +4399,7 @@ dependencies = [ "rustc-hash 2.0.0", "rustls", "slab", - "thiserror", + "thiserror 1.0.63", "tinyvec", "tracing", ] @@ -4402,7 +4536,7 @@ checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -4632,7 +4766,7 @@ dependencies = [ "serde", "serde_html_form", "serde_json", - "thiserror", + "thiserror 1.0.63", "url", "web-time", ] @@ -4661,7 +4795,7 @@ dependencies = [ "serde", "serde_html_form", "serde_json", - "thiserror", + "thiserror 1.0.63", "time", "tracing", "url", @@ -4689,7 +4823,7 @@ dependencies = [ "ruma-macros", "serde", "serde_json", - "thiserror", + "thiserror 1.0.63", "tracing", "url", "web-time", @@ -4731,7 +4865,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e7f9b534a65698d7db3c08d94bf91de0046fe6c7893a7b360502f65e7011ac4" dependencies = [ "js_int", - "thiserror", + "thiserror 1.0.63", ] [[package]] @@ -4766,9 +4900,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.31.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" dependencies = [ "bitflags 2.6.0", "fallible-iterator", @@ -4807,9 +4941,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -4865,18 +4999,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - [[package]] name = "ryu" version = "1.0.18" @@ -5194,6 +5316,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook" version = "0.3.17" @@ -5246,9 +5374,9 @@ dependencies = [ [[package]] name = "similar-asserts" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e041bb827d1bfca18f213411d51b665309f1afb37a04a5d1464530e13779fc0f" +checksum = "cfe85670573cd6f0fa97940f26e7e6601213c3b0555246c24234131f88c5709e" dependencies = [ "console", "similar", @@ -5429,9 +5557,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -5450,14 +5578,26 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tempfile" -version = "3.10.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", "windows-sys 0.52.0", ] @@ -5488,7 +5628,16 @@ version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.63", +] + +[[package]] +name = "thiserror" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +dependencies = [ + "thiserror-impl 2.0.3", ] [[package]] @@ -5502,6 +5651,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -5545,6 +5705,16 @@ dependencies = [ "time-core", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinytemplate" version = "1.2.1" @@ -5572,9 +5742,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -5626,7 +5796,7 @@ checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" dependencies = [ "either", "futures-util", - "thiserror", + "thiserror 1.0.63", "tokio", ] @@ -5657,9 +5827,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -5727,6 +5897,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower-http" version = "0.5.2" @@ -5754,15 +5940,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -5781,7 +5967,7 @@ version = "0.2.3" source = "git+https://github.com/element-hq/tracing.git?rev=ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd#ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.63", "time", "tracing-subscriber", ] @@ -5911,12 +6097,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" version = "1.0.12" @@ -6112,9 +6292,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -6134,6 +6314,18 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -6142,9 +6334,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "serde", @@ -6183,9 +6375,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vodozemac" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7761890811f1dfe2ebef5e630add0a98597682ebf4e4477d98fb8d2e9172ac" +checksum = "dd4b56780b7827dd72c3c6398c3048752bebf8d1d84ec19b606b15dbc3c850b8" dependencies = [ "aes", "arrayvec", @@ -6206,20 +6398,11 @@ dependencies = [ "serde_json", "sha2", "subtle", - "thiserror", + "thiserror 1.0.63", "x25519-dalek", "zeroize", ] -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - [[package]] name = "walkdir" version = "2.5.0" @@ -6247,19 +6430,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -6272,9 +6456,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -6284,9 +6468,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6294,9 +6478,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -6307,18 +6491,19 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-bindgen-test" -version = "0.3.42" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" +checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426" dependencies = [ "console_error_panic_hook", "js-sys", + "minicov", "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", @@ -6327,9 +6512,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.42" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" +checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" dependencies = [ "proc-macro2", "quote", @@ -6351,9 +6536,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -6593,13 +6778,13 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717" +checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "deadpool 0.10.0", "futures", "http", @@ -6615,6 +6800,18 @@ dependencies = [ "url", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "x25519-dalek" version = "2.0.1" @@ -6661,6 +6858,30 @@ version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -6681,6 +6902,27 @@ dependencies = [ "syn", ] +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zeroize" version = "1.8.1" @@ -6700,3 +6942,25 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/Cargo.toml b/Cargo.toml index 63687ba8f71..3743dbe4d4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,34 +18,44 @@ default-members = ["benchmarks", "crates/*", "labs/*"] resolver = "2" [workspace.package] -rust-version = "1.76" +rust-version = "1.80" [workspace.dependencies] -anyhow = "1.0.68" +anyhow = "1.0.93" aquamarine = "0.6.0" -assert-json-diff = "2" +assert-json-diff = "2.0.2" assert_matches = "1.5.0" -assert_matches2 = "0.1.1" +assert_matches2 = "0.1.2" async-rx = "0.1.3" -async-stream = "0.3.3" -async-trait = "0.1.60" +async-stream = "0.3.5" +async-trait = "0.1.83" as_variant = "1.2.0" -base64 = "0.22.0" -byteorder = "1.4.3" +base64 = "0.22.1" +byteorder = "1.5.0" +chrono = "0.4.38" eyeball = { version = "0.8.8", features = ["tracing"] } eyeball-im = { version = "0.5.1", features = ["tracing"] } eyeball-im-util = "0.7.0" -futures-core = "0.3.28" +futures-core = "0.3.31" futures-executor = "0.3.21" -futures-util = "0.3.26" -growable-bloom-filter = "2.1.0" +futures-util = "0.3.31" +gloo-timers = "0.3.0" +growable-bloom-filter = "2.1.1" +hkdf = "0.12.4" +hmac = "0.12.1" http = "1.1.0" imbl = "3.0.0" -itertools = "0.12.0" -once_cell = "1.16.0" -pin-project-lite = "0.2.9" +indexmap = "2.6.0" +itertools = "0.13.0" +js-sys = "0.3.72" +mime = "0.3.17" +once_cell = "1.20.2" +pbkdf2 = { version = "0.12.2" } +pin-project-lite = "0.2.15" +proptest = { version = "1.5.0", default-features = false, features = ["std"] } rand = "0.8.5" reqwest = { version = "0.12.4", default-features = false } +rmp-serde = "1.3.0" ruma = { version = "0.11.1", features = [ "client-api-c", "compat-upload-signatures", @@ -65,20 +75,26 @@ serde = "1.0.151" serde_html_form = "0.2.0" serde_json = "1.0.91" sha2 = "0.10.8" -similar-asserts = "1.5.0" +similar-asserts = "1.6.0" stream_assert = "0.1.1" -thiserror = "1.0.38" -tokio = { version = "1.39.1", default-features = false, features = ["sync"] } +tempfile = "3.9.0" +thiserror = "2.0.3" +tokio = { version = "1.41.1", default-features = false, features = ["sync"] } tokio-stream = "0.1.14" tracing = { version = "0.1.40", default-features = false, features = ["std"] } tracing-core = "0.1.32" tracing-subscriber = "0.3.18" +unicode-normalization = "0.1.24" uniffi = { version = "0.28.0" } uniffi_bindgen = { version = "0.28.0" } -url = "2.5.0" -vodozemac = { version = "0.8.0", features = ["insecure-pk-encryption"] } -wiremock = "0.6.0" -zeroize = "1.6.0" +url = "2.5.4" +uuid = "1.11.0" +vodozemac = { version = "0.8.1", features = ["insecure-pk-encryption"] } +wasm-bindgen = "0.2.84" +wasm-bindgen-test = "0.3.33" +web-sys = "0.3.72" +wiremock = "0.6.2" +zeroize = "1.8.1" matrix-sdk = { path = "crates/matrix-sdk", version = "0.8.0", default-features = false } matrix-sdk-base = { path = "crates/matrix-sdk-base", version = "0.8.0" } diff --git a/crates/matrix-sdk-base/Cargo.toml b/crates/matrix-sdk-base/Cargo.toml index c312798fb85..656beca6ef8 100644 --- a/crates/matrix-sdk-base/Cargo.toml +++ b/crates/matrix-sdk-base/Cargo.toml @@ -49,8 +49,8 @@ as_variant = { workspace = true } assert_matches = { workspace = true, optional = true } assert_matches2 = { workspace = true, optional = true } async-trait = { workspace = true } -bitflags = { version = "2.4.0", features = ["serde"] } -decancer = "3.2.4" +bitflags = { version = "2.6.0", features = ["serde"] } +decancer = "3.2.8" eyeball = { workspace = true } eyeball-im = { workspace = true } futures-util = { workspace = true } @@ -61,9 +61,9 @@ matrix-sdk-crypto = { workspace = true, optional = true } matrix-sdk-store-encryption = { workspace = true } matrix-sdk-test = { workspace = true, optional = true } once_cell = { workspace = true } -regex = "1.11.0" +regex = "1.11.1" ruma = { workspace = true, features = ["canonical-json", "unstable-msc3381", "unstable-msc2867", "rand"] } -unicode-normalization = "0.1.24" +unicode-normalization = { workspace = true } serde = { workspace = true, features = ["rc"] } serde_json = { workspace = true } tokio = { workspace = true } @@ -85,7 +85,7 @@ similar-asserts = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } [target.'cfg(target_arch = "wasm32")'.dev-dependencies] -wasm-bindgen-test = "0.3.33" +wasm-bindgen-test = { workspace = true } [lints] workspace = true diff --git a/crates/matrix-sdk-common/Cargo.toml b/crates/matrix-sdk-common/Cargo.toml index 1d9b0ea5c3f..78837937e11 100644 --- a/crates/matrix-sdk-common/Cargo.toml +++ b/crates/matrix-sdk-common/Cargo.toml @@ -36,16 +36,16 @@ uniffi = { workspace = true, optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] futures-util = { workspace = true, features = ["channel"] } wasm-bindgen-futures = { version = "0.4.33", optional = true } -gloo-timers = { version = "0.3.0", features = ["futures"] } -web-sys = { version = "0.3.60", features = ["console"] } +gloo-timers = { workspace = true, features = ["futures"] } +web-sys = { workspace = true, features = ["console"] } tracing-subscriber = { workspace = true, features = ["fmt", "ansi"] } -wasm-bindgen = "0.2.84" +wasm-bindgen = { workspace = true } [dev-dependencies] assert_matches = { workspace = true } -proptest = { version = "1.4.0", default-features = false, features = ["std"] } +proptest = { workspace = true } matrix-sdk-test-macros = { path = "../../testing/matrix-sdk-test-macros" } -wasm-bindgen-test = "0.3.33" +wasm-bindgen-test = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] # Enable the test macro. @@ -54,7 +54,7 @@ tokio = { workspace = true, features = ["rt", "macros"] } [target.'cfg(target_arch = "wasm32")'.dev-dependencies] # Enable the JS feature for getrandom. getrandom = { version = "0.2.6", default-features = false, features = ["js"] } -js-sys = "0.3.64" +js-sys = { workspace = true } [lints] workspace = true diff --git a/crates/matrix-sdk-crypto/Cargo.toml b/crates/matrix-sdk-crypto/Cargo.toml index e97c18ca6c5..060692780fe 100644 --- a/crates/matrix-sdk-crypto/Cargo.toml +++ b/crates/matrix-sdk-crypto/Cargo.toml @@ -35,39 +35,39 @@ message-ids = [] testing = ["matrix-sdk-test"] [dependencies] -aes = "0.8.1" +aes = "0.8.4" aquamarine = { workspace = true } as_variant = { workspace = true } async-trait = { workspace = true } -bs58 = { version = "0.5.0" } +bs58 = { version = "0.5.1" } byteorder = { workspace = true } cfg-if = "1.0" -ctr = "0.9.1" +ctr = "0.9.2" eyeball = { workspace = true } futures-core = { workspace = true } futures-util = { workspace = true } -hkdf = "0.12.3" -hmac = "0.12.1" +hkdf = { workspace = true } +hmac = { workspace = true } itertools = { workspace = true } js_option = "0.1.1" matrix-sdk-qrcode = { workspace = true, optional = true } matrix-sdk-common = { workspace = true } matrix-sdk-test = { workspace = true, optional = true } # feature = testing only -pbkdf2 = { version = "0.12.2", default-features = false } +pbkdf2 = { workspace = true } rand = { workspace = true } -rmp-serde = "1.1.1" +rmp-serde = { workspace = true } ruma = { workspace = true, features = ["rand", "canonical-json", "unstable-msc3814"] } serde = { workspace = true, features = ["derive", "rc"] } serde_json = { workspace = true } sha2 = { workspace = true } -subtle = "2.5.0" -time = { version = "0.3.34", features = ["formatting"] } +subtle = "2.6.1" +time = { version = "0.3.36", features = ["formatting"] } tokio-stream = { workspace = true, features = ["sync"] } tokio = { workspace = true } thiserror = { workspace = true } tracing = { workspace = true, features = ["attributes"] } url = { workspace = true } -ulid = { version = "1.0.0" } +ulid = { version = "1.1.3" } uniffi = { workspace = true, optional = true } vodozemac = { workspace = true } zeroize = { workspace = true, features = ["zeroize_derive"] } @@ -84,10 +84,10 @@ assert_matches = { workspace = true } assert_matches2 = { workspace = true } futures-executor = { workspace = true } http = { workspace = true } -indoc = "2.0.1" +indoc = "2.0.5" matrix-sdk-test = { workspace = true } -proptest = { version = "1.0.0", default-features = false, features = ["std"] } -similar-asserts = "1.5.0" +proptest = { workspace = true } +similar-asserts = { workspace = true } # required for async_test macro stream_assert = { workspace = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } diff --git a/crates/matrix-sdk-indexeddb/Cargo.toml b/crates/matrix-sdk-indexeddb/Cargo.toml index 35610b05f10..46de1f42acf 100644 --- a/crates/matrix-sdk-indexeddb/Cargo.toml +++ b/crates/matrix-sdk-indexeddb/Cargo.toml @@ -26,20 +26,20 @@ base64 = { workspace = true } gloo-utils = { version = "0.2.0", features = ["serde"] } growable-bloom-filter = { workspace = true, optional = true } indexed_db_futures = "0.5.0" -js-sys = { version = "0.3.58" } +js-sys = { workspace = true } matrix-sdk-base = { workspace = true, features = ["js"], optional = true } matrix-sdk-crypto = { workspace = true, features = ["js"], optional = true } matrix-sdk-store-encryption = { workspace = true } ruma = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -serde-wasm-bindgen = "0.6.1" +serde-wasm-bindgen = "0.6.5" thiserror = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } -wasm-bindgen = "0.2.83" -web-sys = { version = "0.3.57", features = ["IdbKeyRange"] } -hkdf = "0.12.4" +wasm-bindgen = { workspace = true } +web-sys = { workspace = true, features = ["IdbKeyRange"] } +hkdf = { workspace = true } zeroize = { workspace = true } sha2 = { workspace = true } @@ -56,9 +56,9 @@ matrix-sdk-crypto = { workspace = true, features = ["js", "testing"] } matrix-sdk-test = { workspace = true } rand = { workspace = true } tracing-subscriber = { workspace = true, features = ["registry", "tracing-log"] } -uuid = "1.3.0" -wasm-bindgen-test = "0.3.33" -web-sys = { version = "0.3.57", features = ["IdbKeyRange", "Window", "Performance"] } +uuid = { workspace = true } +wasm-bindgen-test = { workspace = true } +web-sys = { workspace = true, features = ["IdbKeyRange", "Window", "Performance"] } [lints] workspace = true diff --git a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs index b12e5055e66..66e315e3033 100644 --- a/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs +++ b/crates/matrix-sdk-indexeddb/src/crypto_store/migrations/mod.rs @@ -220,8 +220,8 @@ fn add_nonunique_index<'a>( name: &str, key_path: &str, ) -> Result, DomException> { - let mut params = IdbIndexParameters::new(); - params.unique(false); + let params = IdbIndexParameters::new(); + params.set_unique(false); object_store.create_index_with_params(name, &IdbKeyPath::str(key_path), ¶ms) } @@ -230,8 +230,8 @@ fn add_unique_index<'a>( name: &str, key_path: &str, ) -> Result, DomException> { - let mut params = IdbIndexParameters::new(); - params.unique(true); + let params = IdbIndexParameters::new(); + params.set_unique(true); object_store.create_index_with_params(name, &IdbKeyPath::str(key_path), ¶ms) } diff --git a/crates/matrix-sdk-qrcode/Cargo.toml b/crates/matrix-sdk-qrcode/Cargo.toml index f2f3b1afbd1..42cf72489ca 100644 --- a/crates/matrix-sdk-qrcode/Cargo.toml +++ b/crates/matrix-sdk-qrcode/Cargo.toml @@ -20,14 +20,14 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] byteorder = { workspace = true } -qrcode = { version = "0.14.0", default-features = false } +qrcode = { version = "0.14.1", default-features = false } ruma-common = { workspace = true } thiserror = { workspace = true } vodozemac = { workspace = true } [dev-dependencies] -image = { version = "0.25.1", default-features = false } -qrcode = { version = "0.14.0", default-features = false, features = ["image"] } +image = { version = "0.25.5", default-features = false } +qrcode = { version = "0.14.1", default-features = false, features = ["image"] } [lints] workspace = true diff --git a/crates/matrix-sdk-sqlite/Cargo.toml b/crates/matrix-sdk-sqlite/Cargo.toml index 96f342f86a0..f23d45a9433 100644 --- a/crates/matrix-sdk-sqlite/Cargo.toml +++ b/crates/matrix-sdk-sqlite/Cargo.toml @@ -18,14 +18,14 @@ state-store = ["dep:matrix-sdk-base"] [dependencies] async-trait = { workspace = true } -deadpool-sqlite = "0.8.1" +deadpool-sqlite = "0.9.0" itertools = { workspace = true } matrix-sdk-base = { workspace = true, optional = true } matrix-sdk-crypto = { workspace = true, optional = true } matrix-sdk-store-encryption = { workspace = true } -rmp-serde = "1.1.1" +rmp-serde = { workspace = true } ruma = { workspace = true } -rusqlite = { version = "0.31.0", features = ["limits"] } +rusqlite = { version = "0.32.1", features = ["limits"] } serde = { workspace = true } serde_json = { workspace = true } thiserror = { workspace = true } @@ -35,13 +35,13 @@ vodozemac = { workspace = true } [dev-dependencies] assert_matches = { workspace = true } -glob = "0.3.0" +glob = "0.3.1" matrix-sdk-base = { workspace = true, features = ["testing"] } matrix-sdk-crypto = { workspace = true, features = ["testing"] } matrix-sdk-test = { workspace = true } once_cell = { workspace = true } similar-asserts = { workspace = true } -tempfile = "3.3.0" +tempfile = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } [lints] diff --git a/crates/matrix-sdk-store-encryption/Cargo.toml b/crates/matrix-sdk-store-encryption/Cargo.toml index 4328298929e..eda60adb6a3 100644 --- a/crates/matrix-sdk-store-encryption/Cargo.toml +++ b/crates/matrix-sdk-store-encryption/Cargo.toml @@ -15,13 +15,13 @@ js = ["dep:getrandom", "getrandom?/js"] [dependencies] base64 = { workspace = true } -blake3 = "1.5.0" +blake3 = "1.5.5" chacha20poly1305 = { version = "0.10.1", features = ["std"] } -getrandom = { version = "0.2.10", optional = true } -hmac = "0.12.1" -pbkdf2 = "0.12.2" +getrandom = { version = "0.2.15", optional = true } +hmac = { workspace = true } +pbkdf2 = { workspace = true } rand = { workspace = true } -rmp-serde = "1.1.2" +rmp-serde = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } sha2 = { workspace = true } diff --git a/crates/matrix-sdk-ui/Cargo.toml b/crates/matrix-sdk-ui/Cargo.toml index ab8f743cc88..106220a3420 100644 --- a/crates/matrix-sdk-ui/Cargo.toml +++ b/crates/matrix-sdk-ui/Cargo.toml @@ -21,10 +21,10 @@ unstable-msc3956 = ["ruma/unstable-msc3956"] [dependencies] as_variant = { workspace = true } async_cell = "0.2.2" -async-once-cell = "0.5.2" +async-once-cell = "0.5.4" async-rx = { workspace = true } async-stream = { workspace = true } -chrono = "0.4.23" +chrono = { workspace = true } eyeball = { workspace = true } eyeball-im = { workspace = true } eyeball-im-util = { workspace = true } @@ -33,11 +33,11 @@ futures-util = { workspace = true } fuzzy-matcher = "0.3.7" growable-bloom-filter = { workspace = true } imbl = { workspace = true, features = ["serde"] } -indexmap = "2.0.0" +indexmap = { workspace = true } itertools = { workspace = true } matrix-sdk = { workspace = true, features = ["experimental-sliding-sync", "e2e-encryption"] } matrix-sdk-base = { workspace = true } -mime = "0.3.16" +mime = { workspace = true } once_cell = { workspace = true } pin-project-lite = { workspace = true } ruma = { workspace = true, features = ["html", "unstable-msc3381"] } @@ -47,7 +47,7 @@ thiserror = { workspace = true } tokio = { workspace = true } tokio-stream = { workspace = true, features = ["sync"] } tracing = { workspace = true, features = ["attributes"] } -unicode-normalization = "0.1.22" +unicode-normalization = { workspace = true } uniffi = { workspace = true, optional = true } [dev-dependencies] @@ -59,7 +59,7 @@ eyeball-im-util = { workspace = true } matrix-sdk = { workspace = true, features = ["testing", "sqlite"] } matrix-sdk-test = { workspace = true } stream_assert = { workspace = true } -tempfile = "3.3.0" +tempfile = { workspace = true } wiremock = { workspace = true } [lints] diff --git a/crates/matrix-sdk/Cargo.toml b/crates/matrix-sdk/Cargo.toml index 2bf75fcb7ff..18f7c6f039a 100644 --- a/crates/matrix-sdk/Cargo.toml +++ b/crates/matrix-sdk/Cargo.toml @@ -69,34 +69,34 @@ anymap2 = "0.13.0" aquamarine = { workspace = true } assert_matches2 = { workspace = true, optional = true } as_variant = { workspace = true } -async-channel = "2.2.1" +async-channel = "2.3.1" async-stream = { workspace = true } async-trait = { workspace = true } -axum = { version = "0.7.4", optional = true } -bytes = "1.1.0" -bytesize = "1.1" -chrono = { version = "0.4.23", optional = true } -event-listener = "5.3.0" +axum = { version = "0.7.9", optional = true } +bytes = "1.8.0" +bytesize = "1.3" +chrono = { workspace = true, optional = true } +event-listener = "5.3.1" eyeball = { workspace = true } eyeball-im = { workspace = true } -eyre = { version = "0.6.8", optional = true } +eyre = { version = "0.6.12", optional = true } futures-core = { workspace = true } futures-util = { workspace = true } growable-bloom-filter = { workspace = true } http = { workspace = true } imbl = { workspace = true, features = ["serde"] } -indexmap = "2.0.2" +indexmap = { workspace = true } js_int = "0.2.2" language-tags = { version = "0.3.2", optional = true } -mas-oidc-client = { version = "0.10.0", default-features = false, optional = true } +mas-oidc-client = { version = "0.11.0", default-features = false, optional = true } matrix-sdk-base = { workspace = true } matrix-sdk-common = { workspace = true } matrix-sdk-ffi-macros = { workspace = true, optional = true } matrix-sdk-indexeddb = { workspace = true, optional = true } matrix-sdk-sqlite = { workspace = true, optional = true } matrix-sdk-test = { workspace = true, optional = true } -mime = "0.3.16" -mime2ext = "0.1.52" +mime = { workspace = true } +mime2ext = "0.1.53" pin-project-lite = { workspace = true } rand = { workspace = true , optional = true } ruma = { workspace = true, features = ["rand", "unstable-msc2448", "unstable-msc2965", "unstable-msc3930", "unstable-msc3245-v1-compat", "unstable-msc2867"] } @@ -104,31 +104,31 @@ serde = { workspace = true } serde_html_form = { workspace = true } serde_json = { workspace = true } sha2 = { workspace = true, optional = true } -tempfile = "3.3.0" +tempfile = { workspace = true } thiserror = { workspace = true } tokio-stream = { workspace = true, features = ["sync"] } -tower = { version = "0.4.13", features = ["util"], optional = true } +tower = { version = "0.5.1", features = ["util"], optional = true } tracing = { workspace = true, features = ["attributes"] } uniffi = { workspace = true, optional = true } url = { workspace = true, features = ["serde"] } urlencoding = "2.1.3" -uuid = { version = "1.4.1", features = ["serde", "v4"], optional = true } +uuid = { workspace = true, features = ["serde", "v4"], optional = true } vodozemac = { workspace = true } zeroize = { workspace = true } [target.'cfg(target_arch = "wasm32")'.dependencies] -gloo-timers = { version = "0.3.0", features = ["futures"] } +gloo-timers = { workspace = true, features = ["futures"] } reqwest = { workspace = true } tokio = { workspace = true, features = ["macros"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] backoff = { version = "0.4.0", features = ["tokio"] } -openidconnect = { version = "4.0.0-alpha.2", optional = true } +openidconnect = { version = "4.0.0-rc.1", optional = true } # only activate reqwest's stream feature on non-wasm, the wasm part seems to not # support *sending* streams, which makes it useless for us. reqwest = { workspace = true, features = ["stream"] } tokio = { workspace = true, features = ["fs", "rt", "macros"] } -tokio-util = "0.7.9" +tokio-util = "0.7.12" wiremock = { workspace = true, optional = true } [dev-dependencies] @@ -148,10 +148,10 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] } tokio-test = "0.4.4" [target.'cfg(target_arch = "wasm32")'.dev-dependencies] -wasm-bindgen-test = "0.3.33" +wasm-bindgen-test = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -proptest = "1.4.0" +proptest = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } wiremock = { workspace = true }