From 5154b9aa857ceb3c21a41199332b362bd12370de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 21:00:30 +0000 Subject: [PATCH] Update Rust crate ruma to 0.9.2 --- Cargo.lock | 227 ++++++++++++++++++++++++++++++++++++++++++++++------- Cargo.toml | 2 +- 2 files changed, 199 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index da3ef7b..270e081 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -337,6 +337,12 @@ version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +[[package]] +name = "as_variant" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" + [[package]] name = "assign" version = "1.1.1" @@ -473,7 +479,7 @@ dependencies = [ "base64 0.13.1", "bitvec", "hex", - "indexmap", + "indexmap 1.9.2", "js-sys", "lazy_static", "rand 0.8.5", @@ -987,6 +993,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.2.8" @@ -1302,7 +1314,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.2", "slab", "tokio", "tokio-util", @@ -1324,6 +1336,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" + [[package]] name = "heck" version = "0.3.3" @@ -1557,6 +1575,17 @@ dependencies = [ "serde", ] +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", + "serde", +] + [[package]] name = "indoc" version = "1.0.9" @@ -1673,6 +1702,15 @@ dependencies = [ "serde", ] +[[package]] +name = "js_option" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" +dependencies = [ + "serde", +] + [[package]] name = "language-tags" version = "0.3.2" @@ -1816,7 +1854,7 @@ dependencies = [ "matrix-sdk-common", "mime", "reqwest", - "ruma", + "ruma 0.2.0", "serde_json", "thiserror", "tokio", @@ -1841,7 +1879,7 @@ dependencies = [ "matrix-sdk-crypto", "pbkdf2 0.8.0", "rand 0.8.5", - "ruma", + "ruma 0.2.0", "serde", "serde_json", "sha2 0.9.9", @@ -1862,7 +1900,7 @@ dependencies = [ "futures", "futures-locks", "instant", - "ruma", + "ruma 0.2.0", "serde", "tokio", "uuid 0.8.2", @@ -1888,7 +1926,7 @@ dependencies = [ "matrix-sdk-common", "olm-rs", "pbkdf2 0.8.0", - "ruma", + "ruma 0.2.0", "serde", "serde_json", "sha2 0.9.9", @@ -1913,7 +1951,7 @@ dependencies = [ "matrix-sdk", "md5", "mongodb", - "ruma", + "ruma 0.9.2", "serde", "serde_json", "serde_yaml", @@ -2369,7 +2407,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.7", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.2", ] [[package]] @@ -2656,7 +2703,7 @@ dependencies = [ "js_int", "ruma-api", "ruma-client-api", - "ruma-common", + "ruma-common 0.5.4", "ruma-events", "ruma-federation-api", "ruma-identifiers", @@ -2665,6 +2712,18 @@ dependencies = [ "ruma-state-res", ] +[[package]] +name = "ruma" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc39664df66d707506b1dd318c30e600f25ebc1e7feadf4804ae45db67922c53" +dependencies = [ + "assign", + "js_int", + "js_option", + "ruma-common 0.12.0", +] + [[package]] name = "ruma-api" version = "0.17.1" @@ -2688,7 +2747,7 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85286e2c65897079e7dcc120964cca47d5a3c23b7d1e9f730f533060919fedf7" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2 1.0.52", "quote 1.0.26", "syn 1.0.109", @@ -2707,7 +2766,7 @@ dependencies = [ "maplit", "percent-encoding", "ruma-api", - "ruma-common", + "ruma-common 0.5.4", "ruma-events", "ruma-identifiers", "ruma-serde", @@ -2721,7 +2780,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "146a88f34b7a084d54eaf790aaf4c25f5d2366ca8f3d1f326985fa5d31d72595" dependencies = [ - "indexmap", + "indexmap 1.9.2", "js_int", "ruma-identifiers", "ruma-serde", @@ -2731,6 +2790,31 @@ dependencies = [ "wildmatch", ] +[[package]] +name = "ruma-common" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bd6a9c0dd0dc4986bf5fb963765f59fb0e3f462b7ca8ba466f47d217688865c" +dependencies = [ + "as_variant", + "base64 0.21.0", + "bytes", + "form_urlencoded", + "indexmap 2.0.2", + "js_int", + "percent-encoding", + "regex", + "ruma-identifiers-validation 0.9.3", + "ruma-macros", + "serde", + "serde_html_form", + "serde_json", + "thiserror", + "tracing", + "url", + "wildmatch", +] + [[package]] name = "ruma-events" version = "0.23.3" @@ -2739,7 +2823,7 @@ checksum = "7da5f1472d60803e06744f83040a055948fd5bc1f4344d3e555ea378d0d6c96d" dependencies = [ "indoc", "js_int", - "ruma-common", + "ruma-common 0.5.4", "ruma-events-macros", "ruma-identifiers", "ruma-serde", @@ -2753,7 +2837,7 @@ version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85929d84b29c4ce034bd1742e13d7ca25d885831f0185b73f7f9a9094296e1c4" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2 1.0.52", "quote 1.0.26", "syn 1.0.109", @@ -2767,7 +2851,7 @@ checksum = "9d5206d4922c5dbd3b6faf2aaec9b5551fdf710ef73cc2145f13d0a5bb3945dc" dependencies = [ "js_int", "ruma-api", - "ruma-common", + "ruma-common 0.5.4", "ruma-events", "ruma-identifiers", "ruma-serde", @@ -2783,7 +2867,7 @@ checksum = "9be9ce339ce206dd5eb5eb29b7ad1b964652d46345bc46f25d68105effc75f4b" dependencies = [ "paste", "ruma-identifiers-macros", - "ruma-identifiers-validation", + "ruma-identifiers-validation 0.4.0", "ruma-serde", "ruma-serde-macros", "serde", @@ -2796,7 +2880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c7bc7e132a84f8d03924cf63d3a37bd87ffee5c29fee69b9125d045c7e4020" dependencies = [ "quote 1.0.26", - "ruma-identifiers-validation", + "ruma-identifiers-validation 0.4.0", "syn 1.0.109", ] @@ -2806,6 +2890,32 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8edeb165c4dcb8c93d1b7396b32fd5f52c5d9c7e7898ab87d772f824fe642f7c" +[[package]] +name = "ruma-identifiers-validation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf8ad1259274f2f57c20901bd1cc5e4a8f23169d1c1d887b6338b02f058e9b41" +dependencies = [ + "js_int", + "thiserror", +] + +[[package]] +name = "ruma-macros" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0280534a4b3e34416f883285fac4f9c408cd0b737890ae66f3e7a7056d14be80" +dependencies = [ + "once_cell", + "proc-macro-crate 2.0.0", + "proc-macro2 1.0.52", + "quote 1.0.26", + "ruma-identifiers-validation 0.9.3", + "serde", + "syn 2.0.4", + "toml", +] + [[package]] name = "ruma-serde" version = "0.4.2" @@ -2827,7 +2937,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6af6e7156da1a4b0bd4b13dbe8c5a725878595a7962345393b3f171c75bd7cc" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2 1.0.52", "quote 1.0.26", "syn 1.0.109", @@ -2860,7 +2970,7 @@ dependencies = [ "itertools", "js_int", "maplit", - "ruma-common", + "ruma-common 0.5.4", "ruma-events", "ruma-identifiers", "ruma-serde", @@ -3028,9 +3138,9 @@ checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] @@ -3046,27 +3156,49 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2 1.0.52", "quote 1.0.26", "syn 2.0.4", ] +[[package]] +name = "serde_html_form" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde65b75f2603066b78d6fa239b2c07b43e06ead09435f60554d3912962b4a3c" +dependencies = [ + "form_urlencoded", + "indexmap 2.0.2", + "itoa 1.0.6", + "ryu", + "serde", +] + [[package]] name = "serde_json" version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ - "indexmap", + "indexmap 1.9.2", "itoa 1.0.6", "ryu", "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3107,7 +3239,7 @@ version = "0.9.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" dependencies = [ - "indexmap", + "indexmap 1.9.2", "itoa 1.0.6", "ryu", "serde", @@ -3511,11 +3643,26 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", +] + [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -3523,9 +3670,22 @@ version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" dependencies = [ - "indexmap", + "indexmap 1.9.2", "toml_datetime", - "winnow", + "winnow 0.3.6", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.0.2", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.17", ] [[package]] @@ -4017,6 +4177,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.10.1" diff --git a/Cargo.toml b/Cargo.toml index 3b32163..657702f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ serde = "1.0.158" serde_json = "1.0.94" serde_yaml = "0.9.19" matrix-sdk = "0.3.0" -ruma = "0.2.0" +ruma = "0.9.2" actix = "0.13.0" actix-web = "4.3.1" url = "2.2.2"