From 46e945d571defaec6021843f052f2a86e11e2fa2 Mon Sep 17 00:00:00 2001 From: strawberry Date: Thu, 11 Apr 2024 18:29:27 -0400 Subject: [PATCH] bump ruma, deps, and add MSC4125 ruma feature Signed-off-by: strawberry --- Cargo.lock | 52 ++++++++++++++++++++++++++-------------------------- Cargo.toml | 5 ++++- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38d02168..6be278be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", @@ -718,9 +718,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -969,9 +969,9 @@ dependencies = [ [[package]] name = "hardened_malloc-rs" -version = "0.1.0+12" +version = "0.1.1+12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6924b51567f632a42bd894f3c568d7141680751ea899da1a665cbc3568593e" +checksum = "40505dfce340c2deec648b3b413c1f484b5b21f2aedb69e3ae68272a5f35d430" [[package]] name = "hashbrown" @@ -1347,9 +1347,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "f08474e32172238f2827bd160c67871cdb2801430f65c3979184dc362e3ca118" dependencies = [ "libc", ] @@ -2100,9 +2100,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.9.4" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "assign", "js_int", @@ -2284,7 +2284,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.9.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "js_int", "ruma-common", @@ -2296,7 +2296,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.17.4" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "as_variant", "assign", @@ -2318,7 +2318,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.12.1" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "as_variant", "base64 0.21.7", @@ -2348,7 +2348,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.27.11" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "as_variant", "indexmap", @@ -2370,7 +2370,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "js_int", "ruma-common", @@ -2382,7 +2382,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.3" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "js_int", "thiserror", @@ -2391,7 +2391,7 @@ dependencies = [ [[package]] name = "ruma-identity-service-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "js_int", "ruma-common", @@ -2401,7 +2401,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.12.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "once_cell", "proc-macro-crate", @@ -2416,7 +2416,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "js_int", "ruma-common", @@ -2428,7 +2428,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.14.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "base64 0.21.7", "ed25519-dalek", @@ -2444,7 +2444,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.10.0" -source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#23535bc153c989b95549c7c9c317ccc18688b4f7" +source = "git+https://github.com/girlbossceo/ruma?branch=conduwuit-changes#62fcc7361bb339f003b8c3db2e6a83837df4ddaa" dependencies = [ "itertools 0.11.0", "js_int", @@ -3212,9 +3212,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -3233,9 +3233,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", diff --git a/Cargo.toml b/Cargo.toml index 43e2dfa2..97a7a952 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,6 +37,8 @@ regex = "1.10.4" # Used to load forbidden room/user regex from config serde_regex = "1.1.0" + +# Used to make working with iterators easier, was already a transitive depdendency itertools = "0.12.1" # jwt jsonwebtokens @@ -51,7 +53,7 @@ serde_html_form = "0.2.6" hmac = "0.12.1" sha-1 = "0.10.1" -async-trait = "0.1.79" +async-trait = "0.1.80" # used for checking if an IP is in specific subnets / CIDR ranges easier ipaddress = "0.1.3" @@ -263,6 +265,7 @@ features = [ "unstable-msc3061", "unstable-msc3575", "unstable-msc4121", + "unstable-msc4125", "unstable-extensible-events", ]