From 38a4dc5fdb4aeb4e65d6a95cb459b5e54eb463e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Mon, 16 Dec 2024 11:30:30 +0100 Subject: [PATCH] feat!: Upgrade Ruma to 0.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- Cargo.lock | 56 +++++++++++-------------- Cargo.toml | 9 ++-- bindings/matrix-sdk-ffi/src/client.rs | 2 +- crates/matrix-sdk-base/src/rooms/mod.rs | 1 - examples/custom_events/src/main.rs | 2 - 5 files changed, 32 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a44bc67e1c0..80776af1992 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3755,7 +3755,7 @@ version = "5.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d385da3c602d29036d2f70beed71c36604df7570be17fed4c5b839616785bf" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "getrandom", "http", @@ -4752,8 +4752,9 @@ dependencies = [ [[package]] name = "ruma" -version = "0.11.1" -source = "git+https://github.com/ruma/ruma?rev=c91499fc464adc865a7c99d0ce0b35982ad96711#c91499fc464adc865a7c99d0ce0b35982ad96711" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5100fcaf13d18b9c5c2dfdee5632c428e3201b04ddefd82c930953b461d000a" dependencies = [ "assign", "js_int", @@ -4763,14 +4764,14 @@ dependencies = [ "ruma-events", "ruma-federation-api", "ruma-html", - "ruma-push-gateway-api", "web-time", ] [[package]] name = "ruma-client-api" -version = "0.19.0" -source = "git+https://github.com/ruma/ruma?rev=c91499fc464adc865a7c99d0ce0b35982ad96711#c91499fc464adc865a7c99d0ce0b35982ad96711" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25f5929f675a96adb22dcfbab1c527862d7f92a6346a280f2ddcfc6380b19391" dependencies = [ "as_variant", "assign", @@ -4792,8 +4793,9 @@ dependencies = [ [[package]] name = "ruma-common" -version = "0.14.1" -source = "git+https://github.com/ruma/ruma?rev=c91499fc464adc865a7c99d0ce0b35982ad96711#c91499fc464adc865a7c99d0ce0b35982ad96711" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c537899b20312655aa9bf4cd825aaf00dd13203f215df2007bc4fbbeac8d8ba" dependencies = [ "as_variant", "base64 0.22.1", @@ -4824,8 +4826,9 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.29.1" -source = "git+https://github.com/ruma/ruma?rev=c91499fc464adc865a7c99d0ce0b35982ad96711#c91499fc464adc865a7c99d0ce0b35982ad96711" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34e4f72eb598c62f51a199bd9218f3fc36a5d50361ecc7a30d864df7bfcef220" dependencies = [ "as_variant", "indexmap 2.6.0", @@ -4849,8 +4852,9 @@ dependencies = [ [[package]] name = "ruma-federation-api" -version = "0.10.0" -source = "git+https://github.com/ruma/ruma?rev=c91499fc464adc865a7c99d0ce0b35982ad96711#c91499fc464adc865a7c99d0ce0b35982ad96711" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d70c3d37a8e42992aeaa5786cb406ad302bcd05c0e7e3073d5316b4574340dd" dependencies = [ "http", "js_int", @@ -4863,8 +4867,9 @@ dependencies = [ [[package]] name = "ruma-html" -version = "0.3.0" -source = "git+https://github.com/ruma/ruma?rev=c91499fc464adc865a7c99d0ce0b35982ad96711#c91499fc464adc865a7c99d0ce0b35982ad96711" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3257ce3398e171ff15245767b1a3d201cfc5cce75f5af7ec7f6b8b5e1d2bdb" dependencies = [ "as_variant", "html5ever", @@ -4876,19 +4881,20 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.10.0" -source = "git+https://github.com/ruma/ruma?rev=c91499fc464adc865a7c99d0ce0b35982ad96711#c91499fc464adc865a7c99d0ce0b35982ad96711" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7f9b534a65698d7db3c08d94bf91de0046fe6c7893a7b360502f65e7011ac4" dependencies = [ "js_int", - "thiserror 2.0.3", + "thiserror 1.0.63", ] [[package]] name = "ruma-macros" -version = "0.14.0" -source = "git+https://github.com/ruma/ruma?rev=c91499fc464adc865a7c99d0ce0b35982ad96711#c91499fc464adc865a7c99d0ce0b35982ad96711" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff7bc55ea278668253c9898dd905325bf1f72df4bf2abddd04ff1c99b7b3c4fb" dependencies = [ "cfg-if", - "once_cell", "proc-macro-crate", "proc-macro2", "quote", @@ -4898,18 +4904,6 @@ dependencies = [ "toml 0.8.15", ] -[[package]] -name = "ruma-push-gateway-api" -version = "0.10.0" -source = "git+https://github.com/ruma/ruma?rev=c91499fc464adc865a7c99d0ce0b35982ad96711#c91499fc464adc865a7c99d0ce0b35982ad96711" -dependencies = [ - "js_int", - "ruma-common", - "ruma-events", - "serde", - "serde_json", -] - [[package]] name = "rusqlite" version = "0.32.1" diff --git a/Cargo.toml b/Cargo.toml index 79ae1c835cc..d9f068ae18b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ proptest = { version = "1.5.0", default-features = false, features = ["std"] } rand = "0.8.5" reqwest = { version = "0.12.4", default-features = false } rmp-serde = "1.3.0" -ruma = { git = "https://github.com/ruma/ruma", rev = "c91499fc464adc865a7c99d0ce0b35982ad96711", features = [ +ruma = { version = "0.12.0", features = [ "client-api-c", "compat-upload-signatures", "compat-user-id", @@ -71,7 +71,7 @@ ruma = { git = "https://github.com/ruma/ruma", rev = "c91499fc464adc865a7c99d0ce "unstable-msc4140", "unstable-msc4171", ] } -ruma-common = { git = "https://github.com/ruma/ruma", rev = "c91499fc464adc865a7c99d0ce0b35982ad96711" } +ruma-common = "0.15.0" serde = "1.0.151" serde_html_form = "0.2.0" serde_json = "1.0.91" @@ -149,7 +149,10 @@ paranoid-android = { git = "https://github.com/element-hq/paranoid-android.git", [workspace.lints.rust] rust_2018_idioms = "warn" semicolon_in_expressions_from_macros = "warn" -unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] } +unexpected_cfgs = { level = "warn", check-cfg = [ + 'cfg(tarpaulin_include)', # Used by tarpaulin (code coverage) + 'cfg(ruma_unstable_exhaustive_types)', # Used by Ruma's EventContent derive macro +] } unused_extern_crates = "warn" unused_import_braces = "warn" unused_qualifications = "warn" diff --git a/bindings/matrix-sdk-ffi/src/client.rs b/bindings/matrix-sdk-ffi/src/client.rs index 848d5544c16..54e6ac79bda 100644 --- a/bindings/matrix-sdk-ffi/src/client.rs +++ b/bindings/matrix-sdk-ffi/src/client.rs @@ -120,7 +120,7 @@ impl TryFrom for RumaPusherKind { let mut ruma_data = RumaHttpPusherData::new(data.url); if let Some(payload) = data.default_payload { let json: Value = serde_json::from_str(&payload)?; - ruma_data.default_payload = json; + ruma_data.data.insert("default_payload".to_owned(), json); } ruma_data.format = data.format.map(Into::into); Ok(Self::Http(ruma_data)) diff --git a/crates/matrix-sdk-base/src/rooms/mod.rs b/crates/matrix-sdk-base/src/rooms/mod.rs index d86ba3f665b..a426ca7133e 100644 --- a/crates/matrix-sdk-base/src/rooms/mod.rs +++ b/crates/matrix-sdk-base/src/rooms/mod.rs @@ -1,5 +1,4 @@ #![allow(clippy::assign_op_pattern)] // Triggered by bitflags! usage -#![allow(unexpected_cfgs)] // Triggered by the `EventContent` macro usage mod members; pub(crate) mod normal; diff --git a/examples/custom_events/src/main.rs b/examples/custom_events/src/main.rs index c2c54a76923..d88dc5ffa43 100644 --- a/examples/custom_events/src/main.rs +++ b/examples/custom_events/src/main.rs @@ -1,5 +1,3 @@ -#![allow(unexpected_cfgs)] // Triggered by the `EventContent` macro usage - /// /// This is an example showcasing how to build a very simple bot with custom /// events using the matrix-sdk. To try it, you need a rust build setup, then