From 6619e6a20a554d572281c92b2585cb57dfd10b9a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 6 Jul 2026 05:04:59 +0000 Subject: [PATCH] chore(deps): Update ruma digest to 89cce34 Co-Authored-By: Ginger --- Cargo.lock | 43 +++++++++++++------------ Cargo.toml | 2 +- src/core/error/mod.rs | 2 -- src/core/matrix/state_res/event_auth.rs | 4 +-- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f4a1bfcb..d1c4a189c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4600,8 +4600,8 @@ dependencies = [ [[package]] name = "ruma" -version = "0.15.1" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +version = "0.16.0" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "assign", "js_int", @@ -4619,8 +4619,8 @@ dependencies = [ [[package]] name = "ruma-appservice-api" -version = "0.15.0" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +version = "0.16.0" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "js_int", "ruma-common", @@ -4631,8 +4631,8 @@ dependencies = [ [[package]] name = "ruma-client-api" -version = "0.23.1" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +version = "0.24.0" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "as_variant", "assign", @@ -4653,8 +4653,8 @@ dependencies = [ [[package]] name = "ruma-common" -version = "0.18.0" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +version = "0.19.0" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "as_variant", "base64 0.22.1", @@ -4686,8 +4686,8 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.33.0" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +version = "0.34.0" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "as_variant", "indexmap 2.14.0", @@ -4707,8 +4707,8 @@ dependencies = [ [[package]] name = "ruma-federation-api" -version = "0.14.0" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +version = "0.15.0" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "bytes", "headers", @@ -4731,7 +4731,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.12.1" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "js_int", "thiserror 2.0.18", @@ -4739,8 +4739,8 @@ dependencies = [ [[package]] name = "ruma-macros" -version = "0.18.0" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +version = "0.19.0" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "as_variant", "cfg-if", @@ -4755,8 +4755,8 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" -version = "0.14.0" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +version = "0.15.0" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "js_int", "ruma-common", @@ -4767,8 +4767,8 @@ dependencies = [ [[package]] name = "ruma-signatures" -version = "0.20.0" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +version = "0.21.0" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "base64 0.22.1", "ed25519-dalek", @@ -4776,6 +4776,7 @@ dependencies = [ "pkcs8", "rand 0.10.2", "ruma-common", + "ruma-events", "serde_json", "sha2 0.10.9", "thiserror 2.0.18", @@ -4783,8 +4784,8 @@ dependencies = [ [[package]] name = "ruma-state-res" -version = "0.16.0" -source = "git+https://github.com/ruma/ruma.git?rev=3ecd80b92794d2d93f657a7b3db62d4be237526b#3ecd80b92794d2d93f657a7b3db62d4be237526b" +version = "0.17.0" +source = "git+https://github.com/ruma/ruma.git?rev=89cce34f3d498525769973243122914910c00ce5#89cce34f3d498525769973243122914910c00ce5" dependencies = [ "js_int", "ruma-common", diff --git a/Cargo.toml b/Cargo.toml index 7e68f6a9b..5189751ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -350,7 +350,7 @@ version = "1.1.1" [workspace.dependencies.ruma] # version = "0.14.1" git = "https://github.com/ruma/ruma.git" -rev = "3ecd80b92794d2d93f657a7b3db62d4be237526b" +rev = "89cce34f3d498525769973243122914910c00ce5" features = [ "appservice-api-c", "client-api", diff --git a/src/core/error/mod.rs b/src/core/error/mod.rs index 1ae5ba04f..e4e54488c 100644 --- a/src/core/error/mod.rs +++ b/src/core/error/mod.rs @@ -119,8 +119,6 @@ pub enum Error { Mxc(#[from] ruma::MxcUriError), #[error(transparent)] Mxid(#[from] ruma::IdParseError), - #[error("from {0}: {1}")] - Redaction(ruma::OwnedServerName, ruma::canonical_json::RedactionError), #[error("{0:?}: {1}")] Request(ErrorKind, Cow<'static, str>, http::StatusCode), #[error(transparent)] diff --git a/src/core/matrix/state_res/event_auth.rs b/src/core/matrix/state_res/event_auth.rs index b40babc36..8abc4a25e 100644 --- a/src/core/matrix/state_res/event_auth.rs +++ b/src/core/matrix/state_res/event_auth.rs @@ -1,4 +1,4 @@ -use std::{borrow::Borrow, collections::BTreeSet}; +use std::collections::BTreeSet; use futures::{ Future, @@ -824,7 +824,7 @@ where let prev_event_is_create_event = prev_events .next() - .is_some_and(|event_id| event_id.borrow() == create_room.event_id().borrow()); + .is_some_and(|event_id| event_id == create_room.event_id()); let no_more_prev_events = prev_events.next().is_none(); if prev_event_is_create_event && no_more_prev_events {