Skip to content

Commit 281faa7

Browse files
committed
refactor(ffi): simplify From<TimelineDetails<Profile>> for ProfileDetails
1 parent 7962253 commit 281faa7

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

bindings/matrix-sdk-ffi/src/timeline/mod.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ impl Timeline {
692692
EmbeddedEventDetails::Ready {
693693
content: replied_to.content.clone().into(),
694694
sender: replied_to.sender.to_string(),
695-
sender_profile: (&replied_to.sender_profile).into(),
695+
sender_profile: replied_to.sender_profile.into(),
696696
},
697697
))),
698698

@@ -1103,7 +1103,7 @@ impl From<matrix_sdk_ui::timeline::EventTimelineItem> for EventTimelineItem {
11031103
is_remote: !item.is_local_echo(),
11041104
event_or_transaction_id: item.identifier().into(),
11051105
sender: item.sender().to_string(),
1106-
sender_profile: item.sender_profile().into(),
1106+
sender_profile: item.sender_profile().clone().into(),
11071107
is_own: item.is_own(),
11081108
is_editable: item.is_editable(),
11091109
content: item.content().clone().into(),
@@ -1144,14 +1144,13 @@ pub enum ProfileDetails {
11441144
Error { message: String },
11451145
}
11461146

1147-
// TODO try to !use &
1148-
impl From<&TimelineDetails<Profile>> for ProfileDetails {
1149-
fn from(details: &TimelineDetails<Profile>) -> Self {
1147+
impl From<TimelineDetails<Profile>> for ProfileDetails {
1148+
fn from(details: TimelineDetails<Profile>) -> Self {
11501149
match details {
11511150
TimelineDetails::Unavailable => Self::Unavailable,
11521151
TimelineDetails::Pending => Self::Pending,
11531152
TimelineDetails::Ready(profile) => Self::Ready {
1154-
display_name: profile.display_name.clone(),
1153+
display_name: profile.display_name,
11551154
display_name_ambiguous: profile.display_name_ambiguous,
11561155
avatar_url: profile.avatar_url.as_ref().map(ToString::to_string),
11571156
},

bindings/matrix-sdk-ffi/src/timeline/reply.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl From<TimelineDetails<Box<EmbeddedEvent>>> for EmbeddedEventDetails {
6262
TimelineDetails::Ready(event) => EmbeddedEventDetails::Ready {
6363
content: event.content.into(),
6464
sender: event.sender.to_string(),
65-
sender_profile: (&event.sender_profile).into(),
65+
sender_profile: event.sender_profile.into(),
6666
},
6767
TimelineDetails::Error(err) => EmbeddedEventDetails::Error { message: err.to_string() },
6868
}

0 commit comments

Comments
 (0)