From c4abca1eb554e1a1edb9b6adb8f968db5f9d53c2 Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Sat, 2 Aug 2025 17:45:42 -0700 Subject: [PATCH] Bump ruma to c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337 (refactor Capabilities) --- Cargo.lock | 34 +++++++++++++-------------- Cargo.toml | 2 +- src/api/client_server/capabilities.rs | 3 ++- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e744dc60..6c7c97d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2441,8 +2441,8 @@ dependencies = [ [[package]] name = "ruma" -version = "0.12.1" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +version = "0.12.2" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "assign", "js_int", @@ -2461,7 +2461,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.12.1" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "js_int", "ruma-common", @@ -2472,8 +2472,8 @@ dependencies = [ [[package]] name = "ruma-client-api" -version = "0.20.1" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +version = "0.20.2" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "as_variant", "assign", @@ -2495,8 +2495,8 @@ dependencies = [ [[package]] name = "ruma-common" -version = "0.15.1" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +version = "0.15.2" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "as_variant", "base64", @@ -2526,8 +2526,8 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.30.1" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +version = "0.30.2" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "as_variant", "indexmap 2.10.0", @@ -2549,8 +2549,8 @@ dependencies = [ [[package]] name = "ruma-federation-api" -version = "0.11.0" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +version = "0.11.1" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "bytes", "headers", @@ -2572,7 +2572,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.10.1" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "js_int", "thiserror 2.0.12", @@ -2581,7 +2581,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.15.1" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "cfg-if", "proc-macro-crate", @@ -2596,7 +2596,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.11.0" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "js_int", "ruma-common", @@ -2607,8 +2607,8 @@ dependencies = [ [[package]] name = "ruma-signatures" -version = "0.17.0" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +version = "0.17.1" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "base64", "ed25519-dalek", @@ -2624,7 +2624,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.13.0" -source = "git+https://github.com/ruma/ruma.git?rev=daa3c8b014a601fa277e8653dea86e8897b17552#daa3c8b014a601fa277e8653dea86e8897b17552" +source = "git+https://github.com/ruma/ruma.git?rev=c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337#c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" dependencies = [ "js_int", "ruma-common", diff --git a/Cargo.toml b/Cargo.toml index 78a5d948..3c722659 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -145,7 +145,7 @@ xdg = "2.5.2" [dependencies.ruma] git = "https://github.com/ruma/ruma.git" -rev = "daa3c8b014a601fa277e8653dea86e8897b17552" +rev = "c4f467781a7ef330dc0b7eb5d0d0cad77ebc3337" features = [ "compat-server-signing-key-version", "compat-empty-string-null", diff --git a/src/api/client_server/capabilities.rs b/src/api/client_server/capabilities.rs index 515ebfc1..f5542a10 100644 --- a/src/api/client_server/capabilities.rs +++ b/src/api/client_server/capabilities.rs @@ -1,7 +1,8 @@ use std::collections::BTreeMap; use ruma::api::client::discovery::get_capabilities::{ - self, Capabilities, RoomVersionStability, RoomVersionsCapability, + self, + v3::{Capabilities, RoomVersionStability, RoomVersionsCapability}, }; use crate::{services, Ar, Ra, Result};