diff --git a/Cargo.lock b/Cargo.lock index 8864852d484..f4cd5d00171 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,7 +11,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -57,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom 0.2.12", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -176,7 +176,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -193,7 +193,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -240,7 +240,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -286,17 +286,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - [[package]] name = "async-channel" version = "2.1.1" @@ -304,7 +293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 4.0.3", + "event-listener", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -370,7 +359,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -381,7 +370,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -430,7 +419,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.11", + "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", "itoa", @@ -490,7 +479,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.11", + "http 0.2.12", "http-body 0.4.6", "mime", "rustversion", @@ -526,10 +515,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom 0.2.12", + "getrandom", "instant", "pin-project-lite", - "rand 0.8.5", + "rand", "tokio", ] @@ -554,12 +543,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -931,7 +914,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -1210,7 +1193,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "subtle", "zeroize", ] @@ -1222,7 +1205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "typenum", ] @@ -1233,7 +1216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -1271,7 +1254,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -1295,7 +1278,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -1306,7 +1289,7 @@ checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" dependencies = [ "darling_core", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -1321,19 +1304,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" -[[package]] -name = "deadpool" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e" -dependencies = [ - "async-trait", - "deadpool-runtime", - "num_cpus", - "retain_mut", - "tokio", -] - [[package]] name = "deadpool" version = "0.10.0" @@ -1361,7 +1331,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8010e36e12f3be22543a5e478b4af20aeead9a700dd69581a5e050a070fc22c" dependencies = [ - "deadpool 0.10.0", + "deadpool", "deadpool-sync", "rusqlite", ] @@ -1393,7 +1363,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -1417,7 +1387,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -1477,7 +1447,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -1519,7 +1489,7 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", - "rand_core 0.6.4", + "rand_core", "serde", "sha2", "subtle", @@ -1547,7 +1517,7 @@ dependencies = [ "hkdf", "pem-rfc7468", "pkcs8", - "rand_core 0.6.4", + "rand_core", "sec1", "subtle", "zeroize", @@ -1578,12 +1548,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "event-listener" version = "4.0.3" @@ -1601,7 +1565,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.3", + "event-listener", "pin-project-lite", ] @@ -1728,7 +1692,7 @@ dependencies = [ "http 1.1.0", "matrix-sdk", "matrix-sdk-ui", - "rand 0.8.5", + "rand", "serde", "serde_json", "tokio", @@ -1744,7 +1708,7 @@ dependencies = [ "anyhow", "dirs", "matrix-sdk", - "rand 0.8.5", + "rand", "serde", "serde_json", "tokio", @@ -1802,7 +1766,7 @@ checksum = "dd65f1b59dd22d680c7a626cc4a000c1e03d241c51c3e034d2bc9f1e90734f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -1873,16 +1837,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", + "syn 2.0.60", ] [[package]] @@ -1906,7 +1861,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -2056,21 +2011,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-macro" version = "0.3.30" @@ -2079,7 +2019,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -2094,12 +2034,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - [[package]] name = "futures-util" version = "0.3.30" @@ -2138,17 +2072,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.12" @@ -2158,7 +2081,7 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -2227,7 +2150,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -2242,7 +2165,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.11", + "http 0.2.12", "indexmap 2.2.2", "slab", "tokio", @@ -2313,7 +2236,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -2325,7 +2248,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", + "http 0.2.12", ] [[package]] @@ -2381,7 +2304,7 @@ dependencies = [ "markup5ever", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -2413,7 +2336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] @@ -2446,27 +2369,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" -[[package]] -name = "http-types" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" -dependencies = [ - "anyhow", - "async-channel 1.9.0", - "base64 0.13.1", - "futures-lite", - "http 0.2.11", - "infer", - "pin-project-lite", - "rand 0.7.3", - "serde", - "serde_json", - "serde_qs", - "serde_urlencoded", - "url", -] - [[package]] name = "httparse" version = "1.8.0" @@ -2490,7 +2392,7 @@ dependencies = [ "futures-core", "futures-util", "h2 0.3.26", - "http 0.2.11", + "http 0.2.12", "http-body 0.4.6", "httparse", "httpdate", @@ -2521,20 +2423,24 @@ dependencies = [ "pin-project-lite", "smallvec", "tokio", + "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", - "http 0.2.11", - "hyper 0.14.28", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", ] [[package]] @@ -2551,15 +2457,18 @@ dependencies = [ [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", - "hyper 0.14.28", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", ] [[package]] @@ -2569,6 +2478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ "bytes", + "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.0", @@ -2576,6 +2486,9 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2658,7 +2571,7 @@ checksum = "978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085" dependencies = [ "bitmaps", "imbl-sized-chunks", - "rand_core 0.6.4", + "rand_core", "rand_xoshiro", "serde", "version_check", @@ -2749,12 +2662,6 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" -[[package]] -name = "infer" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - [[package]] name = "inferno" version = "0.11.19" @@ -2803,7 +2710,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -3085,7 +2992,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -3096,7 +3003,7 @@ checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -3109,7 +3016,7 @@ dependencies = [ "macroific_core", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -3140,7 +3047,7 @@ dependencies = [ "bytes", "futures-util", "headers", - "http 0.2.11", + "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", "opentelemetry", @@ -3180,7 +3087,7 @@ dependencies = [ "mas-iana", "p256", "p384", - "rand 0.8.5", + "rand", "rsa", "schemars", "sec1", @@ -3205,14 +3112,14 @@ dependencies = [ "form_urlencoded", "futures-util", "headers", - "http 0.2.11", + "http 0.2.12", "language-tags", "mas-http", "mas-iana", "mas-jose", "mime", "oauth2-types", - "rand 0.8.5", + "rand", "serde", "serde_json", "serde_urlencoded", @@ -3240,9 +3147,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "matrix-pickle" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fd26463ce5d86b8d9bb9c4142d453198ba22fb91bd46d3c9f144ae699d821d" +checksum = "7eb521190328c57a2051f70250beb874dc0fac6bcd22b615f7f9700b7b4fb826" dependencies = [ "matrix-pickle-derive", "thiserror", @@ -3250,15 +3157,15 @@ dependencies = [ [[package]] name = "matrix-pickle-derive" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93779aa78d39c2fe34746287b10a866192cf8af1b81767fff76bd64099acc0f5" +checksum = "c6fb3c7231cbb7fbbc50871615edebf65183b382cdaa1fe21c5e88a12617de8e" dependencies = [ - "proc-macro-crate 2.0.2", + "proc-macro-crate 3.1.0", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -3272,7 +3179,7 @@ dependencies = [ "assert-json-diff", "assert_matches", "assert_matches2", - "async-channel 2.1.1", + "async-channel", "async-stream", "async-trait", "axum 0.7.4", @@ -3282,7 +3189,7 @@ dependencies = [ "cfg-vis", "chrono", "dirs", - "event-listener 4.0.3", + "event-listener", "eyeball", "eyeball-im", "eyeball-im-util", @@ -3291,7 +3198,8 @@ dependencies = [ "futures-executor", "futures-util", "gloo-timers", - "http 0.2.11", + "http 0.2.12", + "http 1.1.0", "image", "imbl", "indexmap 2.2.2", @@ -3306,8 +3214,8 @@ dependencies = [ "mime", "mime2ext", "once_cell", - "rand 0.8.5", - "reqwest", + "rand", + "reqwest 0.12.4", "ruma", "serde", "serde_html_form", @@ -3346,7 +3254,7 @@ dependencies = [ "eyeball-im", "futures-executor", "futures-util", - "http 0.2.11", + "http 1.1.0", "matrix-sdk-common", "matrix-sdk-crypto", "matrix-sdk-store-encryption", @@ -3411,7 +3319,7 @@ dependencies = [ "futures-util", "hkdf", "hmac", - "http 0.2.11", + "http 1.1.0", "indoc", "itertools 0.12.1", "js_option", @@ -3421,7 +3329,7 @@ dependencies = [ "olm-rs", "pbkdf2", "proptest", - "rand 0.8.5", + "rand", "rmp-serde", "ruma", "serde", @@ -3448,13 +3356,13 @@ dependencies = [ "assert_matches2", "futures-util", "hmac", - "http 0.2.11", + "http 1.1.0", "js_int", "matrix-sdk-common", "matrix-sdk-crypto", "matrix-sdk-sqlite", "pbkdf2", - "rand 0.8.5", + "rand", "ruma", "serde", "serde_json", @@ -3519,7 +3427,7 @@ dependencies = [ "assert_matches2", "async-trait", "base64 0.21.7", - "getrandom 0.2.12", + "getrandom", "gloo-utils", "indexed_db_futures", "js-sys", @@ -3555,14 +3463,14 @@ dependencies = [ "futures", "futures-core", "futures-util", - "http 0.2.11", + "http 1.1.0", "json-structural-diff", "matrix-sdk", "matrix-sdk-test", "matrix-sdk-ui", "once_cell", - "rand 0.8.5", - "reqwest", + "rand", + "reqwest 0.12.4", "serde_json", "stream_assert", "tempfile", @@ -3618,10 +3526,10 @@ dependencies = [ "blake3", "chacha20poly1305", "displaydoc", - "getrandom 0.2.12", + "getrandom", "hmac", "pbkdf2", - "rand 0.8.5", + "rand", "rmp-serde", "serde", "serde_json", @@ -3635,8 +3543,8 @@ name = "matrix-sdk-test" version = "0.7.0" dependencies = [ "ctor", - "getrandom 0.2.12", - "http 0.2.11", + "getrandom", + "http 1.1.0", "matrix-sdk-test-macros", "once_cell", "ruma", @@ -3652,7 +3560,7 @@ name = "matrix-sdk-test-macros" version = "0.7.0" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -3770,7 +3678,7 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -3888,7 +3796,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "rand", "smallvec", "zeroize", ] @@ -3907,7 +3815,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -3989,7 +3897,7 @@ source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=d3 dependencies = [ "chrono", "data-encoding", - "http 0.2.11", + "http 0.2.12", "language-tags", "mas-iana", "mas-jose", @@ -4016,7 +3924,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd6c2c7054110ce4d7b4756d7b7fe507fea9413968ad0ef8f1d043d504aec725" dependencies = [ - "getrandom 0.2.12", + "getrandom", "olm-sys", "serde", "serde_json", @@ -4080,7 +3988,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -4124,9 +4032,9 @@ checksum = "7cbfa5308166ca861434f0b0913569579b8e587430a3d6bcd7fd671921ec145a" dependencies = [ "async-trait", "bytes", - "http 0.2.11", + "http 0.2.12", "opentelemetry", - "reqwest", + "reqwest 0.11.20", ] [[package]] @@ -4137,14 +4045,14 @@ checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" dependencies = [ "async-trait", "futures-core", - "http 0.2.11", + "http 0.2.12", "opentelemetry", "opentelemetry-http", "opentelemetry-proto", "opentelemetry-semantic-conventions", "opentelemetry_sdk", "prost", - "reqwest", + "reqwest 0.11.20", "thiserror", "tokio", "tonic", @@ -4184,7 +4092,7 @@ dependencies = [ "opentelemetry", "ordered-float", "percent-encoding", - "rand 0.8.5", + "rand", "thiserror", "tokio", "tokio-stream", @@ -4342,7 +4250,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ "phf_shared 0.10.0", - "rand 0.8.5", + "rand", ] [[package]] @@ -4352,7 +4260,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared 0.11.2", - "rand 0.8.5", + "rand", ] [[package]] @@ -4365,7 +4273,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -4403,7 +4311,7 @@ checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -4581,12 +4489,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.2" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.21.1", ] [[package]] @@ -4615,9 +4522,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -4638,7 +4545,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -4650,8 +4557,8 @@ dependencies = [ "bitflags 2.4.2", "lazy_static", "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_xorshift", "regex-syntax 0.8.2", "unarray", @@ -4677,20 +4584,27 @@ dependencies = [ "itertools 0.10.5", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] name = "pulldown-cmark" -version = "0.9.6" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" dependencies = [ "bitflags 2.4.2", "memchr", + "pulldown-cmark-escape", "unicase", ] +[[package]] +name = "pulldown-cmark-escape" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3" + [[package]] name = "qoi" version = "0.4.1" @@ -4733,19 +4647,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -4753,18 +4654,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -4774,16 +4665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -4792,16 +4674,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -4810,7 +4683,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -4819,7 +4692,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -4868,8 +4741,8 @@ dependencies = [ "once_cell", "paste", "profiling", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "simd_helpers", "system-deps", "thiserror", @@ -4933,7 +4806,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.12", + "getrandom", "libredox", "thiserror", ] @@ -4988,18 +4861,54 @@ version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "async-compression", "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", "h2 0.3.26", - "http 0.2.11", + "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "async-compression", + "base64 0.22.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", "hyper-rustls", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -5010,9 +4919,12 @@ dependencies = [ "pin-project-lite", "rustls", "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", @@ -5025,15 +4937,9 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots", - "winreg", + "winreg 0.52.0", ] -[[package]] -name = "retain_mut" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" - [[package]] name = "rfc6979" version = "0.4.0" @@ -5060,7 +4966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.12", + "getrandom", "libc", "spin 0.9.8", "untrusted", @@ -5113,7 +5019,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core 0.6.4", + "rand_core", "signature", "spki", "subtle", @@ -5133,7 +5039,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.9.4" -source = "git+https://github.com/ruma/ruma?rev=21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa#21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa" +source = "git+https://github.com/ruma/ruma?rev=b6200c01a120120faf9f744ab4f171ff3beefd72#b6200c01a120120faf9f744ab4f171ff3beefd72" dependencies = [ "assign", "js_int", @@ -5150,13 +5056,13 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.17.4" -source = "git+https://github.com/ruma/ruma?rev=21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa#21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa" +source = "git+https://github.com/ruma/ruma?rev=b6200c01a120120faf9f744ab4f171ff3beefd72#b6200c01a120120faf9f744ab4f171ff3beefd72" dependencies = [ "as_variant", "assign", "bytes", "date_header", - "http 0.2.11", + "http 1.1.0", "js_int", "js_option", "maplit", @@ -5172,20 +5078,20 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.12.1" -source = "git+https://github.com/ruma/ruma?rev=21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa#21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa" +source = "git+https://github.com/ruma/ruma?rev=b6200c01a120120faf9f744ab4f171ff3beefd72#b6200c01a120120faf9f744ab4f171ff3beefd72" dependencies = [ "as_variant", - "base64 0.21.7", + "base64 0.22.0", "bytes", "form_urlencoded", - "getrandom 0.2.12", - "http 0.2.11", + "getrandom", + "http 1.1.0", "indexmap 2.2.2", "js-sys", "js_int", "konst", "percent-encoding", - "rand 0.8.5", + "rand", "regex", "ruma-identifiers-validation", "ruma-macros", @@ -5204,7 +5110,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.27.11" -source = "git+https://github.com/ruma/ruma?rev=21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa#21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa" +source = "git+https://github.com/ruma/ruma?rev=b6200c01a120120faf9f744ab4f171ff3beefd72#b6200c01a120120faf9f744ab4f171ff3beefd72" dependencies = [ "as_variant", "indexmap 2.2.2", @@ -5228,7 +5134,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.8.0" -source = "git+https://github.com/ruma/ruma?rev=21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa#21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa" +source = "git+https://github.com/ruma/ruma?rev=b6200c01a120120faf9f744ab4f171ff3beefd72#b6200c01a120120faf9f744ab4f171ff3beefd72" dependencies = [ "js_int", "ruma-common", @@ -5240,7 +5146,7 @@ dependencies = [ [[package]] name = "ruma-html" version = "0.1.0" -source = "git+https://github.com/ruma/ruma?rev=21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa#21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa" +source = "git+https://github.com/ruma/ruma?rev=b6200c01a120120faf9f744ab4f171ff3beefd72#b6200c01a120120faf9f744ab4f171ff3beefd72" dependencies = [ "as_variant", "html5ever", @@ -5252,7 +5158,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.3" -source = "git+https://github.com/ruma/ruma?rev=21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa#21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa" +source = "git+https://github.com/ruma/ruma?rev=b6200c01a120120faf9f744ab4f171ff3beefd72#b6200c01a120120faf9f744ab4f171ff3beefd72" dependencies = [ "js_int", "thiserror", @@ -5261,22 +5167,22 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.12.0" -source = "git+https://github.com/ruma/ruma?rev=21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa#21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa" +source = "git+https://github.com/ruma/ruma?rev=b6200c01a120120faf9f744ab4f171ff3beefd72#b6200c01a120120faf9f744ab4f171ff3beefd72" dependencies = [ "once_cell", - "proc-macro-crate 2.0.2", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "ruma-identifiers-validation", "serde", - "syn 2.0.48", + "syn 2.0.60", "toml 0.8.2", ] [[package]] name = "ruma-push-gateway-api" version = "0.8.0" -source = "git+https://github.com/ruma/ruma?rev=21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa#21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa" +source = "git+https://github.com/ruma/ruma?rev=b6200c01a120120faf9f744ab4f171ff3beefd72#b6200c01a120120faf9f744ab4f171ff3beefd72" dependencies = [ "js_int", "ruma-common", @@ -5329,32 +5235,42 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.11" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", + "rustls-pki-types", ] +[[package]] +name = "rustls-pki-types" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] @@ -5453,17 +5369,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", + "syn 2.0.60", ] [[package]] @@ -5549,7 +5455,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -5598,17 +5504,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_qs" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6" -dependencies = [ - "percent-encoding", - "serde", - "thiserror", -] - [[package]] name = "serde_spanned" version = "0.6.5" @@ -5657,7 +5552,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -5728,7 +5623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -5896,7 +5791,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -5941,9 +5836,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -5956,6 +5851,27 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "system-deps" version = "6.2.2" @@ -5982,7 +5898,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", - "fastrand 2.0.1", + "fastrand", "rustix", "windows-sys 0.52.0", ] @@ -6026,7 +5942,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -6143,7 +6059,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -6158,11 +6074,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ "rustls", + "rustls-pki-types", "tokio", ] @@ -6227,9 +6144,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -6258,6 +6175,17 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.2", + "toml_datetime", + "winnow", +] + [[package]] name = "tonic" version = "0.11.0" @@ -6270,7 +6198,7 @@ dependencies = [ "base64 0.21.7", "bytes", "h2 0.3.26", - "http 0.2.11", + "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", "hyper-timeout", @@ -6296,7 +6224,7 @@ dependencies = [ "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", + "rand", "slab", "tokio", "tokio-util", @@ -6315,7 +6243,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http 0.2.11", + "http 0.2.12", "http-body 0.4.6", "http-range-header", "pin-project-lite", @@ -6367,7 +6295,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -6470,8 +6398,8 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" dependencies = [ - "getrandom 0.2.12", - "rand 0.8.5", + "getrandom", + "rand", "web-time", ] @@ -6596,7 +6524,7 @@ version = "0.26.1" source = "git+https://github.com/mozilla/uniffi-rs?rev=789a9023b522562a95618443cee5a0d4f111c4c7#789a9023b522562a95618443cee5a0d4f111c4c7" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -6627,7 +6555,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.48", + "syn 2.0.60", "toml 0.5.11", "uniffi_meta", ] @@ -6719,7 +6647,7 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.12", + "getrandom", "serde", "wasm-bindgen", ] @@ -6774,7 +6702,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vodozemac" version = "0.5.1" -source = "git+https://github.com/matrix-org/vodozemac?rev=0c75746fc8a5eda4a0e490d345d1798b4c6cbd67#0c75746fc8a5eda4a0e490d345d1798b4c6cbd67" +source = "git+https://github.com/matrix-org/vodozemac?rev=2722fb9518059ccd2ad55470f4c4d3ba5e447bd9#2722fb9518059ccd2ad55470f4c4d3ba5e447bd9" dependencies = [ "aes", "arrayvec", @@ -6782,13 +6710,13 @@ dependencies = [ "cbc", "curve25519-dalek", "ed25519-dalek", - "getrandom 0.2.12", + "getrandom", "hkdf", "hmac", "matrix-pickle", "pkcs7", "prost", - "rand 0.8.5", + "rand", "serde", "serde_bytes", "serde_json", @@ -6799,12 +6727,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "walkdir" version = "2.4.0" @@ -6824,12 +6746,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6857,7 +6773,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -6891,7 +6807,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6924,14 +6840,14 @@ checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -6962,9 +6878,12 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.4" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "weedle2" @@ -7177,26 +7096,38 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wiremock" -version = "0.5.22" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9" +checksum = "ec874e1eef0df2dcac546057fe5e29186f09c378181cd7b635b4b7bcc98e9d81" dependencies = [ "assert-json-diff", "async-trait", "base64 0.21.7", - "deadpool 0.9.5", + "deadpool", "futures", - "futures-timer", - "http-types", - "hyper 0.14.28", + "http 1.1.0", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "log", "once_cell", "regex", "serde", "serde_json", "tokio", + "url", ] [[package]] @@ -7206,7 +7137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", - "rand_core 0.6.4", + "rand_core", "serde", "zeroize", ] @@ -7267,7 +7198,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] @@ -7287,7 +7218,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.60", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 98e7527572a..6029d220a33 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,10 +36,10 @@ futures-executor = "0.3.21" futures-util = { version = "0.3.26", default-features = false, features = [ "alloc", ] } -http = "0.2.6" +http = "1.1.0" imbl = "2.0.0" itertools = "0.12.0" -ruma = { git = "https://github.com/ruma/ruma", rev = "21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa", features = [ +ruma = { git = "https://github.com/ruma/ruma", rev = "b6200c01a120120faf9f744ab4f171ff3beefd72", features = [ "client-api-c", "compat-upload-signatures", "compat-user-id", @@ -48,7 +48,7 @@ ruma = { git = "https://github.com/ruma/ruma", rev = "21b644ac6ae1c7d4a4f7e98a64 "unstable-msc3401", "unstable-msc3266", ] } -ruma-common = { git = "https://github.com/ruma/ruma", rev = "21b644ac6ae1c7d4a4f7e98a6481a3318f2deeaa" } +ruma-common = { git = "https://github.com/ruma/ruma", rev = "b6200c01a120120faf9f744ab4f171ff3beefd72" } once_cell = "1.16.0" rand = "0.8.5" serde = "1.0.151" @@ -63,8 +63,8 @@ tracing = { version = "0.1.40", default-features = false, features = ["std"] } tracing-core = "0.1.32" uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "789a9023b522562a95618443cee5a0d4f111c4c7" } uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs", rev = "789a9023b522562a95618443cee5a0d4f111c4c7" } -vodozemac = { git="https://github.com/matrix-org/vodozemac", rev = "0c75746fc8a5eda4a0e490d345d1798b4c6cbd67" } -wiremock = "0.5.21" +vodozemac = { git="https://github.com/matrix-org/vodozemac", rev = "2722fb9518059ccd2ad55470f4c4d3ba5e447bd9" } +wiremock = "0.6.0" zeroize = "1.6.0" matrix-sdk = { path = "crates/matrix-sdk", version = "0.7.0", default-features = false } diff --git a/bindings/matrix-sdk-ffi/src/platform.rs b/bindings/matrix-sdk-ffi/src/platform.rs index fed242ba5cf..2ff857adc9c 100644 --- a/bindings/matrix-sdk-ffi/src/platform.rs +++ b/bindings/matrix-sdk-ffi/src/platform.rs @@ -66,11 +66,9 @@ pub fn create_otlp_tracer( let auth = STANDARD.encode(format!("{user}:{password}")); let headers = HashMap::from([("Authorization".to_owned(), format!("Basic {auth}"))]); - let http_client = matrix_sdk::reqwest::ClientBuilder::new().build()?; let exporter = opentelemetry_otlp::new_exporter() .http() - .with_http_client(http_client) .with_protocol(Protocol::HttpBinary) .with_endpoint(otlp_endpoint) .with_headers(headers); diff --git a/crates/matrix-sdk-ui/src/room_list_service/mod.rs b/crates/matrix-sdk-ui/src/room_list_service/mod.rs index cea6d33d0db..8ba95bc268d 100644 --- a/crates/matrix-sdk-ui/src/room_list_service/mod.rs +++ b/crates/matrix-sdk-ui/src/room_list_service/mod.rs @@ -661,7 +661,7 @@ mod tests { impl Match for SlidingSyncMatcher { fn matches(&self, request: &Request) -> bool { request.url.path() == "/_matrix/client/unstable/org.matrix.msc3575/sync" - && request.method == Method::Post + && request.method == Method::POST } } diff --git a/crates/matrix-sdk-ui/tests/integration/sliding_sync.rs b/crates/matrix-sdk-ui/tests/integration/sliding_sync.rs index dac43c03c7b..d0eed1e4cac 100644 --- a/crates/matrix-sdk-ui/tests/integration/sliding_sync.rs +++ b/crates/matrix-sdk-ui/tests/integration/sliding_sync.rs @@ -48,7 +48,7 @@ pub(crate) struct PartialSlidingSyncRequest { impl Match for SlidingSyncMatcher { fn matches(&self, request: &Request) -> bool { request.url.path() == "/_matrix/client/unstable/org.matrix.msc3575/sync" - && request.method == Method::Post + && request.method == Method::POST } } diff --git a/crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs b/crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs index b6782254e95..db56d215db2 100644 --- a/crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs +++ b/crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs @@ -299,7 +299,7 @@ struct SlidingSyncMatcher; impl Match for SlidingSyncMatcher { fn matches(&self, request: &Request) -> bool { request.url.path() == "/_matrix/client/unstable/org.matrix.msc3575/sync" - && request.method == Method::Post + && request.method == Method::POST } } diff --git a/crates/matrix-sdk/Cargo.toml b/crates/matrix-sdk/Cargo.toml index 9f061a56187..ece7a314359 100644 --- a/crates/matrix-sdk/Cargo.toml +++ b/crates/matrix-sdk/Cargo.toml @@ -46,6 +46,7 @@ uniffi = ["dep:uniffi", "matrix-sdk-base/uniffi"] experimental-oidc = [ "ruma/unstable-msc2967", "dep:chrono", + "dep:http_old", "dep:language-tags", "dep:mas-oidc-client", "dep:rand", @@ -83,6 +84,7 @@ eyre = { version = "0.6.8", optional = true } futures-core = { workspace = true } futures-util = { workspace = true } http = { workspace = true } +http_old = { package = "http", version = "0.2", optional = true } imbl = { workspace = true, features = ["serde"] } indexmap = "2.0.2" js_int = "0.2.2" @@ -120,14 +122,14 @@ optional = true [target.'cfg(target_arch = "wasm32")'.dependencies] gloo-timers = { version = "0.3.0", features = ["futures"] } -reqwest = { version = "0.11.10", default_features = false } +reqwest = { version = "0.12.4", default_features = false } tokio = { workspace = true, features = ["macros"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] backoff = { version = "0.4.0", features = ["tokio"] } # 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 = { version = "0.11.10", default_features = false, features = ["stream"] } +reqwest = { version = "0.12.4", default_features = false, features = ["stream"] } tokio = { workspace = true, features = ["fs", "rt", "macros"] } tokio-util = "0.7.9" wiremock = { workspace = true, optional = true } @@ -151,7 +153,7 @@ wasm-bindgen-test = "0.3.33" [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] tokio = { workspace = true, features = ["rt-multi-thread", "macros"] } -wiremock = { version = "0.5.13" } +wiremock = { workspace = true } [[test]] name = "integration" diff --git a/crates/matrix-sdk/src/http_client/http_helpers.rs b/crates/matrix-sdk/src/http_client/http_helpers.rs new file mode 100644 index 00000000000..ff89d21ea88 --- /dev/null +++ b/crates/matrix-sdk/src/http_client/http_helpers.rs @@ -0,0 +1,179 @@ +//! Helper traits to convert between http 0.2 and http 1.x. + +/// Convert from http 1.x to http 0.2 +pub trait ToHttpOld { + type Output; + + fn to_http_old(self) -> Self::Output; +} + +impl ToHttpOld for http::Response { + type Output = http_old::Response; + + fn to_http_old(self) -> Self::Output { + let (parts, body) = self.into_parts(); + let mut response = http_old::Response::new(body); + + *response.status_mut() = parts.status.to_http_old(); + *response.version_mut() = parts.version.to_http_old(); + *response.headers_mut() = parts.headers.to_http_old(); + // We cannot do anything about extensions because we cannot iterate over them. + + response + } +} + +impl ToHttpOld for http::StatusCode { + type Output = http_old::StatusCode; + + fn to_http_old(self) -> Self::Output { + http_old::StatusCode::from_u16(self.as_u16()) + .expect("status code should be valid between both versions") + } +} + +impl ToHttpOld for http::Version { + type Output = http_old::Version; + + fn to_http_old(self) -> Self::Output { + if self == http::Version::HTTP_09 { + http_old::Version::HTTP_09 + } else if self == http::Version::HTTP_10 { + http_old::Version::HTTP_10 + } else if self == http::Version::HTTP_11 { + http_old::Version::HTTP_11 + } else if self == http::Version::HTTP_2 { + http_old::Version::HTTP_2 + } else if self == http::Version::HTTP_3 { + http_old::Version::HTTP_3 + } else { + // Current http code doesn't have other variants. + unreachable!() + } + } +} + +impl ToHttpOld for http::HeaderMap { + type Output = http_old::HeaderMap; + + fn to_http_old(self) -> Self::Output { + let mut map = http_old::HeaderMap::new(); + map.extend( + self.into_iter() + .map(|(name, value)| (name.map(ToHttpOld::to_http_old), value.to_http_old())), + ); + + map + } +} + +impl ToHttpOld for http::HeaderName { + type Output = http_old::HeaderName; + + fn to_http_old(self) -> Self::Output { + http_old::HeaderName::from_bytes(self.as_ref()) + .expect("header name should be valid between both versions") + } +} + +impl ToHttpOld for http::HeaderValue { + type Output = http_old::HeaderValue; + + fn to_http_old(self) -> Self::Output { + http_old::HeaderValue::from_bytes(self.as_bytes()) + .expect("header value should be valid between both versions") + } +} + +/// Convert from http 0.2 to http 1.x +pub trait ToHttpNew { + type Output; + + fn to_http_new(self) -> Self::Output; +} + +impl ToHttpNew for http_old::Request { + type Output = http::Request; + + fn to_http_new(self) -> Self::Output { + let (parts, body) = self.into_parts(); + let mut request = http::Request::new(body); + + *request.method_mut() = parts.method.to_http_new(); + *request.uri_mut() = parts.uri.to_http_new(); + *request.version_mut() = parts.version.to_http_new(); + *request.headers_mut() = parts.headers.to_http_new(); + // We cannot do anything about extensions because we cannot iterate over them. + + request + } +} + +impl ToHttpNew for http_old::Method { + type Output = http::Method; + + fn to_http_new(self) -> Self::Output { + self.as_str().parse().expect("method should be valid between both versions") + } +} + +impl ToHttpNew for http_old::Uri { + type Output = http::Uri; + + fn to_http_new(self) -> Self::Output { + self.to_string().parse().expect("URI should be valid between both versions") + } +} + +impl ToHttpNew for http_old::Version { + type Output = http::Version; + + fn to_http_new(self) -> Self::Output { + if self == http_old::Version::HTTP_09 { + http::Version::HTTP_09 + } else if self == http_old::Version::HTTP_10 { + http::Version::HTTP_10 + } else if self == http_old::Version::HTTP_11 { + http::Version::HTTP_11 + } else if self == http_old::Version::HTTP_2 { + http::Version::HTTP_2 + } else if self == http_old::Version::HTTP_3 { + http::Version::HTTP_3 + } else { + // Current http code doesn't have other variants. + unreachable!() + } + } +} + +impl ToHttpNew for http_old::HeaderMap { + type Output = http::HeaderMap; + + fn to_http_new(self) -> Self::Output { + let mut map = http::HeaderMap::new(); + map.extend( + self.into_iter() + .map(|(name, value)| (name.map(ToHttpNew::to_http_new), value.to_http_new())), + ); + + map + } +} + +impl ToHttpNew for http_old::HeaderName { + type Output = http::HeaderName; + + fn to_http_new(self) -> Self::Output { + http::HeaderName::from_bytes(self.as_ref()) + .expect("header name should be valid between both versions") + } +} + +impl ToHttpNew for http_old::HeaderValue { + type Output = http::HeaderValue; + + fn to_http_new(self) -> Self::Output { + http::HeaderValue::from_bytes(self.as_bytes()) + .expect("header value should be valid between both versions") + } +} diff --git a/crates/matrix-sdk/src/http_client/mod.rs b/crates/matrix-sdk/src/http_client/mod.rs index 7d9d2f2d4ab..6a8a01d1d84 100644 --- a/crates/matrix-sdk/src/http_client/mod.rs +++ b/crates/matrix-sdk/src/http_client/mod.rs @@ -34,11 +34,15 @@ use tracing::{debug, field::debug, instrument, trace}; use crate::{config::RequestConfig, error::HttpError}; +#[cfg(feature = "experimental-oidc")] +mod http_helpers; #[cfg(not(target_arch = "wasm32"))] mod native; #[cfg(target_arch = "wasm32")] mod wasm; +#[cfg(feature = "experimental-oidc")] +use http_helpers::{ToHttpNew, ToHttpOld}; #[cfg(not(target_arch = "wasm32"))] pub(crate) use native::HttpSettings; @@ -225,8 +229,8 @@ async fn response_to_http_response( } #[cfg(feature = "experimental-oidc")] -impl tower::Service> for HttpClient { - type Response = http::Response; +impl tower::Service> for HttpClient { + type Response = http_old::Response; type Error = tower::BoxError; type Future = futures_core::future::BoxFuture<'static, Result>; @@ -237,13 +241,19 @@ impl tower::Service> for HttpClient { std::task::Poll::Ready(Ok(())) } - fn call(&mut self, req: http::Request) -> Self::Future { + fn call(&mut self, req: http_old::Request) -> Self::Future { let inner = self.inner.clone(); let fut = async move { - native::send_request(&inner, &req, DEFAULT_REQUEST_TIMEOUT, Default::default()) - .await - .map_err(Into::into) + native::send_request( + &inner, + &req.to_http_new(), + DEFAULT_REQUEST_TIMEOUT, + Default::default(), + ) + .await + .map(ToHttpOld::to_http_old) + .map_err(Into::into) }; Box::pin(fut) } diff --git a/crates/matrix-sdk/src/oidc/backend/mock.rs b/crates/matrix-sdk/src/oidc/backend/mock.rs index de357396705..69792c1f4da 100644 --- a/crates/matrix-sdk/src/oidc/backend/mock.rs +++ b/crates/matrix-sdk/src/oidc/backend/mock.rs @@ -16,7 +16,7 @@ use std::sync::{Arc, Mutex}; -use http::StatusCode; +use http_old::StatusCode; use mas_oidc_client::{ error::{ DiscoveryError, diff --git a/crates/matrix-sdk/src/sliding_sync/mod.rs b/crates/matrix-sdk/src/sliding_sync/mod.rs index b7c1aa29e59..bc96da38947 100644 --- a/crates/matrix-sdk/src/sliding_sync/mod.rs +++ b/crates/matrix-sdk/src/sliding_sync/mod.rs @@ -1093,7 +1093,7 @@ mod tests { impl Match for SlidingSyncMatcher { fn matches(&self, request: &Request) -> bool { request.url.path() == "/_matrix/client/unstable/org.matrix.msc3575/sync" - && request.method == Method::Post + && request.method == Method::POST } } @@ -1167,7 +1167,7 @@ mod tests { fn matches(&self, request: &Request) -> bool { request.url.path() == format!("/_matrix/client/r0/rooms/{room_id}/members", room_id = self.0) - && request.method == Method::Get + && request.method == Method::GET } } diff --git a/testing/matrix-sdk-integration-testing/Cargo.toml b/testing/matrix-sdk-integration-testing/Cargo.toml index 9b3976ff01d..470284b9610 100644 --- a/testing/matrix-sdk-integration-testing/Cargo.toml +++ b/testing/matrix-sdk-integration-testing/Cargo.toml @@ -15,14 +15,14 @@ eyeball-im = { workspace = true } futures = { version = "0.3.29", features = ["executor"] } futures-core = { workspace = true } futures-util = { workspace = true } -http = "0.2.11" +http = { workspace = true } matrix-sdk = { workspace = true, default-features = true, features = ["testing", "qrcode"] } matrix-sdk-ui = { workspace = true, default-features = true } matrix-sdk-test = { workspace = true } once_cell = { workspace = true } rand = { workspace = true } stream_assert = "0.1.1" -reqwest = "0.11.20" +reqwest = "0.12.4" serde_json = "1.0.108" tempfile = "3.3.0" tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] } diff --git a/testing/matrix-sdk-integration-testing/src/tests/sliding_sync/room.rs b/testing/matrix-sdk-integration-testing/src/tests/sliding_sync/room.rs index 02742e5c9f8..f1c4f058f8a 100644 --- a/testing/matrix-sdk-integration-testing/src/tests/sliding_sync/room.rs +++ b/testing/matrix-sdk-integration-testing/src/tests/sliding_sync/room.rs @@ -713,16 +713,11 @@ impl CustomResponder { impl wiremock::Respond for &CustomResponder { fn respond(&self, request: &wiremock::Request) -> wiremock::ResponseTemplate { // Convert the mocked request to an actual server request. - let mut req = self.client.request( - request.method.to_string().parse().expect("All methods exist"), - request.url.clone(), - ); - for header in &request.headers { - for value in header.1 { - req = req.header(header.0.to_string(), value.to_string()); - } - } - req = req.body(request.body.clone()); + let req = self + .client + .request(request.method.clone(), request.url.clone()) + .headers(request.headers.clone()) + .body(request.body.clone()); // Run await inside of non-async fn by spawning a new thread and creating a new // runtime. We need to do this because the current runtime can't run blocking