Upgrade Ruma

Use the new release.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

Author: zecakeh

Cargo.lock

@@ -71,7 +71,7 @@ rand = { version = "0.10.1", default-features = false, features = ["std", "std_r
 regex = { version = "1.12.2", default-features = false }
 reqwest = { version = "0.13.1", default-features = false }
 rmp-serde = { version = "1.3.0", default-features = false }
-ruma = { git = "https://github.com/ruma/ruma", rev = "7680eebd9586669e1a4e5b1fd1c2c691221369d4", features = [
+ruma = { version = "0.15.1", features = [
     "client-api-c",
     "compat-unset-avatar",
     "compat-upload-signatures",
@@ -98,7 +98,7 @@ ruma = { git = "https://github.com/ruma/ruma", rev = "7680eebd9586669e1a4e5b1fd1
 sentry = { version = "0.47.0", default-features = false }
 sentry-tracing = { version = "0.47.0", default-features = false }
 serde = { version = "1.0.228", default-features = false, features = ["std", "rc", "derive"] }
-serde_html_form = { version = "0.2.8", default-features = false }
+serde_html_form = { version = "0.4.0", default-features = false }
 serde_json = { version = "1.0.145", default-features = false, features = ["std"] }
 sha2 = { version = "0.10.9", default-features = false }
 similar-asserts = { version = "1.7.0", default-features = false }

Cargo.toml

@@ -3054,7 +3054,7 @@ impl TryFrom<AllowRule> for RumaAllowRule {
                 let room_id = RoomId::parse(room_id)?;
                 Ok(Self::RoomMembership(ruma::room::RoomMembership::new(room_id)))
             }
-            AllowRule::Custom { json } => Ok(Self::_Custom(Box::new(serde_json::from_str(&json)?))),
+            AllowRule::Custom { json } => Ok(serde_json::from_str(&json)?),
         }
     }
 }

bindings/matrix-sdk-ffi/src/client.rs

@@ -318,10 +318,8 @@ impl TryFrom<SdkTweak> for Tweak {
                 Self::Highlight { value: matches!(highlight, HighlightTweakValue::Yes) }
             }
             _ => {
-                let json_string = value
-                    .custom_value()
-                    .ok_or_else(|| "Unsupported tweak type".to_owned())?
-                    .to_string();
+                let json_string =
+                    value.value().ok_or_else(|| "Unsupported tweak type".to_owned())?.to_string();
 
                 Self::Custom { name: value.set_tweak().to_owned(), value: json_string }
             }

bindings/matrix-sdk-ffi/src/notification_settings.rs

@@ -11,16 +11,18 @@ rust-version.workspace = true
 rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
 
 [package.metadata.cargo-machete]
-ignored = ["getrandom"] # We do manually enable a feature for it.
+ignored = ["getrandom", "getrandom_0_2"] # We manually enable a feature for each.
 
 [features]
-js = ["dep:getrandom", "getrandom?/wasm_js"]
+js = ["dep:getrandom", "getrandom?/wasm_js", "dep:getrandom_0_2", "getrandom_0_2?/js"]
 
 [dependencies]
 base64.workspace = true
 blake3 = { version = "1.8.2", default-features = false }
 chacha20poly1305 = { version = "0.10.1", default-features = false, features = ["std"] }
 getrandom = { workspace = true, optional = true }
+# This version is still in the dependency tree due to the chacha20poly1305 crate.
+getrandom_0_2 = { package = "getrandom", version = "0.2.5", default-features = false, optional = true }
 hmac.workspace = true
 pbkdf2.workspace = true
 rand = { workspace = true, features = ["thread_rng"] }

crates/matrix-sdk-store-encryption/Cargo.toml

@@ -187,6 +187,8 @@ All notable changes to this project will be documented in this file.
 
 ### Refactor
 
+- [**breaking**] Upgrade Ruma to 0.15.1.
+  ([#6503](https://github.com/matrix-org/matrix-rust-sdk/pull/6503))
 - Revert back to to determining lock dirtiness in `Encryption::{spin_lock_store, try_lock_once_store}`
   through logic defined in `OlmMachine`, rather than `CrossProcessLock`.
   ([#6496](https://github.com/matrix-org/matrix-rust-sdk/pull/6496))