Skip to content

refactor(sdk-ui): remove expect() with better borrow #6513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hywan merged 2 commits into from
May 1, 2026
+34 −59
Merged

refactor(sdk-ui): remove expect() with better borrow #6513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44771bc
refactor(sdk-ui): use ok_or_else instead of if/expect
BillCarsonFr Apr 28, 2026
7273568
review: another shade of borrow
BillCarsonFr Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions crates/matrix-sdk-ui/src/timeline/controller/aggregations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@

use std::{borrow::Cow, collections::HashMap, sync::Arc};

use as_variant::as_variant;
use matrix_sdk::{check_validity_of_replacement_events, deserialized_responses::EncryptionInfo};
use ruma::{
MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedTransactionId, OwnedUserId,
Expand Down Expand Up @@ -183,18 +182,16 @@ pub(crate) struct Aggregation {
fn poll_state_from_item<'a>(
event: &'a mut Cow<'_, EventTimelineItem>,
) -> Result<&'a mut PollState, AggregationError> {
if event.content().is_poll() {
Copy link
Copy Markdown
Member

@Hywan Hywan Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if the following works but it seems ok:

if let TimelineItemContent::MsgLike(MsgLikeContent { kind: MsgLikeKind::Poll(state), ..}) = event.to_mut().content_mut() {
    Ok(state)
} else {
    Err(AggregationError::InvalidType {
        expected: "a poll".to_owned(),
        actual: event.content().debug_string().to_owned(),
    })
}

Copy link
Copy Markdown
Member Author

@BillCarsonFr BillCarsonFr Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You will have the borrow issue :/ event.to_mut() borrows event mutably for the lifetime 'a so for all the function scope, thus you cannot borrow again in the else

Copy link
Copy Markdown
Member Author

@BillCarsonFr BillCarsonFr Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is what is described here? https://rust-lang.github.io/rfcs/2094-nll.html#problem-case-3-conditional-control-flow-across-functions

Copy link
Copy Markdown
Member

@Hywan Hywan Apr 28, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested the following and it works:

let content = event.to_mut().content_mut();

if let TimelineItemContent::MsgLike(MsgLikeContent { kind: MsgLikeKind::Poll(state), .. }) =
    content
{
    Ok(state)
} else {
    Err(AggregationError::InvalidType {
        expected: "a poll".to_owned(),
        actual: content.debug_string().to_owned(),
    })
}

// It was a poll! Now return the state as mutable.
let state = as_variant!(
event.to_mut().content_mut(),
TimelineItemContent::MsgLike(MsgLikeContent { kind: MsgLikeKind::Poll(s), ..}) => s
)
.expect("it was a poll just above");
let content = event.to_mut().content_mut();

if let TimelineItemContent::MsgLike(MsgLikeContent { kind: MsgLikeKind::Poll(state), .. }) =
content
{
Ok(state)
} else {
Err(AggregationError::InvalidType {
expected: "a poll".to_owned(),
actual: event.content().debug_string().to_owned(),
actual: content.debug_string().to_owned(),
})
}
}
Expand All @@ -203,18 +200,18 @@ fn poll_state_from_item<'a>(
fn live_location_state_from_item<'a>(
event: &'a mut Cow<'_, EventTimelineItem>,
) -> Result<&'a mut LiveLocationState, AggregationError> {
if event.content().is_live_location() {
// It was a live location! Now return the state as mutable.
let state = event
.to_mut()
.content_mut()
.as_live_location_state_mut()
.expect("it was a live location just above");
let content = event.to_mut().content_mut();

if let TimelineItemContent::MsgLike(MsgLikeContent {
kind: MsgLikeKind::LiveLocation(state),
..
}) = content
{
Ok(state)
} else {
Err(AggregationError::InvalidType {
expected: "a live location".to_owned(),
actual: event.content().debug_string().to_owned(),
actual: content.debug_string().to_owned(),
})
}
}
Expand All @@ -223,13 +220,16 @@ fn live_location_state_from_item<'a>(
fn rtc_notification_declinations_from_item<'a>(
event: &'a mut Cow<'_, EventTimelineItem>,
) -> Result<&'a mut Vec<OwnedUserId>, AggregationError> {
let debug_string = event.content().debug_string().to_owned();
event.to_mut().content_mut().as_rtc_notification_mut().ok_or_else(|| {
AggregationError::InvalidType {
let content = event.to_mut().content_mut();

if let TimelineItemContent::RtcNotification { declined_by, .. } = content {
Ok(declined_by)
} else {
Err(AggregationError::InvalidType {
expected: "an rtc notification".to_owned(),
actual: debug_string,
}
})
actual: content.debug_string().to_owned(),
})
}
}

impl Aggregation {
Expand Down
32 changes: 0 additions & 32 deletions crates/matrix-sdk-ui/src/timeline/event_item/content/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,38 +223,6 @@ impl TimelineItemContent {
}) => state)
}

/// If `self` is of the [`MsgLike`][Self::MsgLike] variant with a
/// [`LiveLocation`][MsgLikeKind::LiveLocation] kind, return the inner
/// [`LiveLocationState`] mutably.
pub(in crate::timeline) fn as_live_location_state_mut(
&mut self,
) -> Option<&mut LiveLocationState> {
as_variant!(self, Self::MsgLike(MsgLikeContent {
kind: MsgLikeKind::LiveLocation(state),
..
}) => state)
}

pub(in crate::timeline) fn as_rtc_notification_mut(&mut self) -> Option<&mut Vec<OwnedUserId>> {
if let TimelineItemContent::RtcNotification { declined_by, .. } = self {
Some(declined_by)
} else {
None
}
}

/// Check whether this item's content is a
/// [`LiveLocation`][MsgLikeKind::LiveLocation].
pub fn is_live_location(&self) -> bool {
matches!(self, Self::MsgLike(MsgLikeContent { kind: MsgLikeKind::LiveLocation(_), .. }))
}

/// Check whether this item's content is an
/// [`RtcNotification`][Self::RtcNotification].
pub fn is_rtc_notification(&self) -> bool {
matches!(self, Self::RtcNotification { .. })
}

/// If `self` is of the [`MsgLike`][Self::MsgLike] variant, return the
/// inner [`Message`].
pub fn as_message(&self) -> Option<&Message> {
Expand Down
11 changes: 9 additions & 2 deletions crates/matrix-sdk-ui/src/timeline/tests/shields.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ use ruma::{
use stream_assert::{assert_next_matches, assert_pending};

use crate::timeline::{
EventSendState, TimelineEventShieldState, TimelineEventShieldStateCode,
EventSendState, MsgLikeContent, MsgLikeKind, TimelineEventShieldState,
TimelineEventShieldStateCode, TimelineItemContent,
tests::{TestTimeline, TestTimelineBuilder},
};

Expand Down Expand Up @@ -156,7 +157,13 @@ async fn test_live_location_no_sent_in_clear_shield() {

// No beacons yet → shield should be None.
let item = assert_next_matches!(stream, VectorDiff::PushBack { value } => value);
assert!(item.content().is_live_location(), "timeline item should be a live location");
assert!(
matches!(
item.content(),
TimelineItemContent::MsgLike(MsgLikeContent { kind: MsgLikeKind::LiveLocation(_), .. })
),
"timeline item should be a live location"
);

let shield = item.get_shield(false);
assert_eq!(shield, TimelineEventShieldState::None);
Expand Down
4 changes: 2 additions & 2 deletions crates/matrix-sdk-ui/tests/integration/timeline/rtc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ async fn test_decline_call() {

assert_let!(VectorDiff::PushBack { value: message } = &timeline_updates[0]);
let event_item = message.as_event().unwrap();
assert!(event_item.content().is_rtc_notification());
assert!(matches!(event_item.content(), TimelineItemContent::RtcNotification { .. }));
assert_let!(
TimelineItemContent::RtcNotification { call_intent: _, declined_by } = event_item.content()
);
Expand Down Expand Up @@ -116,7 +116,7 @@ async fn test_multiple_decline_call() {

assert_let!(VectorDiff::PushBack { value: message } = &timeline_updates[0]);
let event_item = message.as_event().unwrap();
assert!(event_item.content().is_rtc_notification());
assert!(matches!(event_item.content(), TimelineItemContent::RtcNotification { .. }));
assert_let!(
TimelineItemContent::RtcNotification { call_intent: _, declined_by } = event_item.content()
);
Expand Down
Loading