From 9f9b0129f0605de2f7cb38dfadce42c4756fde7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 5 Apr 2025 19:38:15 +0200 Subject: [PATCH] Upgrade crate dependencies To get rid of the cargo-deny advisory. --- Cargo.lock | 54 +++++++++++-------- Cargo.toml | 6 +-- deny.toml | 9 +++- .../room_history/message_toolbar/mod.rs | 21 +++++--- 4 files changed, 56 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 343fa0d8..c6d11317 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -134,6 +134,12 @@ dependencies = [ "syn", ] +[[package]] +name = "archery" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae2ed21cd55021f05707a807a5fc85695dafb98832921f6cfa06db67ca5b869" + [[package]] name = "arrayref" version = "0.3.9" @@ -844,9 +850,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", ] @@ -1059,7 +1065,8 @@ dependencies = [ [[package]] name = "eyeball" version = "0.8.8" -source = "git+https://github.com/jplatte/eyeball?branch=main#b4ca8997db0ee3767bbc08a2aec788cac05c55ac" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93bd0ebf93d61d6332d3c09a96e97975968a44e19a64c947bde06e6baff383f" dependencies = [ "futures-core", "readlock", @@ -1071,8 +1078,9 @@ dependencies = [ [[package]] name = "eyeball-im" -version = "0.6.0" -source = "git+https://github.com/jplatte/eyeball?branch=main#b4ca8997db0ee3767bbc08a2aec788cac05c55ac" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43e8e9d31591be508826b875d8fe6056aebcaec3281ac0e45434ff303686c566" dependencies = [ "futures-core", "imbl", @@ -1082,8 +1090,9 @@ dependencies = [ [[package]] name = "eyeball-im-util" -version = "0.8.0" -source = "git+https://github.com/jplatte/eyeball?branch=main#b4ca8997db0ee3767bbc08a2aec788cac05c55ac" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda2d08a8fa99050bdb84d077193a371e9abd29696921971aa26ae076adb6023" dependencies = [ "arrayvec", "eyeball-im", @@ -2439,13 +2448,14 @@ dependencies = [ [[package]] name = "imbl" -version = "4.0.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae128b3bc67ed43ec0a7bb1c337a9f026717628b3c4033f07ded1da3e854951" +checksum = "e4308a675e4cfc1920f36a8f4d8fb62d5533b7da106844bd1ec51c6f1fa94a0c" dependencies = [ + "archery", "bitmaps", "imbl-sized-chunks", - "rand_core 0.6.4", + "rand_core 0.9.3", "rand_xoshiro", "serde", "version_check", @@ -3005,7 +3015,7 @@ dependencies = [ [[package]] name = "matrix-sdk" version = "0.10.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=192cf0154a5182847e38a621549313d54400b6d8#192cf0154a5182847e38a621549313d54400b6d8" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b4a8089b40c68f71f01678c3b54d392ce44e7c68#b4a8089b40c68f71f01678c3b54d392ce44e7c68" dependencies = [ "anymap2", "aquamarine", @@ -3062,7 +3072,7 @@ dependencies = [ [[package]] name = "matrix-sdk-base" version = "0.10.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=192cf0154a5182847e38a621549313d54400b6d8#192cf0154a5182847e38a621549313d54400b6d8" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b4a8089b40c68f71f01678c3b54d392ce44e7c68#b4a8089b40c68f71f01678c3b54d392ce44e7c68" dependencies = [ "as_variant", "async-trait", @@ -3089,7 +3099,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common" version = "0.10.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=192cf0154a5182847e38a621549313d54400b6d8#192cf0154a5182847e38a621549313d54400b6d8" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b4a8089b40c68f71f01678c3b54d392ce44e7c68#b4a8089b40c68f71f01678c3b54d392ce44e7c68" dependencies = [ "async-trait", "eyeball-im", @@ -3112,7 +3122,7 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" version = "0.10.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=192cf0154a5182847e38a621549313d54400b6d8#192cf0154a5182847e38a621549313d54400b6d8" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b4a8089b40c68f71f01678c3b54d392ce44e7c68#b4a8089b40c68f71f01678c3b54d392ce44e7c68" dependencies = [ "aes", "aquamarine", @@ -3153,7 +3163,7 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" version = "0.10.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=192cf0154a5182847e38a621549313d54400b6d8#192cf0154a5182847e38a621549313d54400b6d8" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b4a8089b40c68f71f01678c3b54d392ce44e7c68#b4a8089b40c68f71f01678c3b54d392ce44e7c68" dependencies = [ "anyhow", "async-trait", @@ -3181,7 +3191,7 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" version = "0.10.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=192cf0154a5182847e38a621549313d54400b6d8#192cf0154a5182847e38a621549313d54400b6d8" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b4a8089b40c68f71f01678c3b54d392ce44e7c68#b4a8089b40c68f71f01678c3b54d392ce44e7c68" dependencies = [ "byteorder", "qrcode", @@ -3193,7 +3203,7 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" version = "0.10.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=192cf0154a5182847e38a621549313d54400b6d8#192cf0154a5182847e38a621549313d54400b6d8" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b4a8089b40c68f71f01678c3b54d392ce44e7c68#b4a8089b40c68f71f01678c3b54d392ce44e7c68" dependencies = [ "async-trait", "deadpool-sqlite", @@ -3216,7 +3226,7 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" version = "0.10.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=192cf0154a5182847e38a621549313d54400b6d8#192cf0154a5182847e38a621549313d54400b6d8" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b4a8089b40c68f71f01678c3b54d392ce44e7c68#b4a8089b40c68f71f01678c3b54d392ce44e7c68" dependencies = [ "base64", "blake3", @@ -3235,7 +3245,7 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" version = "0.10.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=192cf0154a5182847e38a621549313d54400b6d8#192cf0154a5182847e38a621549313d54400b6d8" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b4a8089b40c68f71f01678c3b54d392ce44e7c68#b4a8089b40c68f71f01678c3b54d392ce44e7c68" dependencies = [ "as_variant", "async-once-cell", @@ -4032,11 +4042,11 @@ dependencies = [ [[package]] name = "rand_xoshiro" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" dependencies = [ - "rand_core 0.6.4", + "rand_core 0.9.3", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 6ce53332..8ed7e09c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,7 +71,7 @@ sourceview = { package = "sourceview5", version = "0.9" } [dependencies.matrix-sdk] # version = "0.10" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "192cf0154a5182847e38a621549313d54400b6d8" +rev = "b4a8089b40c68f71f01678c3b54d392ce44e7c68" features = [ "socks", "sso-login", @@ -82,12 +82,12 @@ features = [ [dependencies.matrix-sdk-store-encryption] # version = "0.10" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "192cf0154a5182847e38a621549313d54400b6d8" +rev = "b4a8089b40c68f71f01678c3b54d392ce44e7c68" [dependencies.matrix-sdk-ui] # version = "0.10" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "192cf0154a5182847e38a621549313d54400b6d8" +rev = "b4a8089b40c68f71f01678c3b54d392ce44e7c68" [dependencies.ruma] # version = "0.12.1" diff --git a/deny.toml b/deny.toml index e92830ec..8db0a5dc 100644 --- a/deny.toml +++ b/deny.toml @@ -26,4 +26,11 @@ allow = [ "MPL-2.0", "Unicode-3.0", "Zlib", -] \ No newline at end of file +] + +[sources] +required-git-spec="rev" +allow-git = [ + "https://github.com/ruma/ruma", + "https://github.com/matrix-org/matrix-rust-sdk", +] diff --git a/src/session/view/content/room_history/message_toolbar/mod.rs b/src/session/view/content/room_history/message_toolbar/mod.rs index 20e9a87c..36f8e363 100644 --- a/src/session/view/content/room_history/message_toolbar/mod.rs +++ b/src/session/view/content/room_history/message_toolbar/mod.rs @@ -10,7 +10,10 @@ use gtk::{ }; use matrix_sdk::{ attachment::{AttachmentConfig, AttachmentInfo, BaseFileInfo, Thumbnail}, - room::{edit::EditedContent, reply::EnforceThread}, + room::{ + edit::EditedContent, + reply::{EnforceThread, Reply}, + }, }; use matrix_sdk_ui::timeline::{AttachmentSource, TimelineEventItemId, TimelineItemContent}; use ruma::{ @@ -506,13 +509,15 @@ mod imp { // Send event depending on relation. match composer_state.related_to() { Some(RelationInfo::Reply(message_event)) => { - let event_id = message_event.event_id(); - - let handle = spawn_tokio!(async move { - matrix_timeline - .send_reply(content, event_id, EnforceThread::MaybeThreaded) - .await - }); + let reply = Reply { + event_id: message_event.event_id(), + enforce_thread: EnforceThread::MaybeThreaded, + }; + + let handle = + spawn_tokio!( + async move { matrix_timeline.send_reply(content, reply).await } + ); if let Err(error) = handle.await.expect("task was not aborted") { error!("Could not send reply: {error}");