Skip to content

Commit 1e568ef

Browse files
zecakehpoljar
authored andcommitted
refactor: Remove unnecessary Raw casting
The types are already correct so there is no need for casting. Signed-off-by: Kévin Commaille <[email protected]>
1 parent f89ced3 commit 1e568ef

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

crates/matrix-sdk-crypto/src/types/events/room_key_withheld.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,8 +585,7 @@ pub(super) mod tests {
585585
sender_key,
586586
device_id.to_owned(),
587587
);
588-
let content: Raw<RoomKeyWithheldContent> =
589-
Raw::new(&content).expect("We can always serialize a withheld content info").cast();
588+
let content = Raw::new(&content).expect("We can always serialize a withheld content info");
590589

591590
messages
592591
.entry(user_id.to_owned())

crates/matrix-sdk-ui/src/timeline/event_item/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl EventTimelineItem {
146146
let raw_sync_event = latest_event.event().raw().clone();
147147
let encryption_info = latest_event.event().encryption_info().cloned();
148148

149-
let Ok(event) = raw_sync_event.deserialize_as::<AnySyncTimelineEvent>() else {
149+
let Ok(event) = raw_sync_event.deserialize() else {
150150
warn!("Unable to deserialize latest_event as an AnySyncTimelineEvent!");
151151
return None;
152152
};

crates/matrix-sdk-ui/tests/integration/timeline/pinned_event.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ async fn mock_events_endpoint(
660660
.mock_room_event()
661661
.room(room_id.to_owned())
662662
.match_event_id()
663-
.ok(TimelineEvent::from_plaintext(event.cast()))
663+
.ok(TimelineEvent::from_plaintext(event))
664664
.mount()
665665
.await;
666666
}

crates/matrix-sdk/src/encryption/secret_storage/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ impl SecretStorage {
192192
let maybe_default_key_id = self.fetch_default_key_id().await?;
193193

194194
if let Some(default_key_id) = maybe_default_key_id {
195-
let default_key_id =
196-
default_key_id.deserialize_as::<SecretStorageDefaultKeyEventContent>()?;
195+
let default_key_id = default_key_id.deserialize()?;
197196

198197
let event_type =
199198
GlobalAccountDataEventType::SecretStorageKey(default_key_id.key_id.to_owned());
@@ -273,7 +272,7 @@ impl SecretStorage {
273272
if let Some(content) = self.fetch_default_key_id().await? {
274273
// Since we can't delete account data events, we're going to treat
275274
// deserialization failures as secret storage being disabled.
276-
Ok(content.deserialize_as::<SecretStorageDefaultKeyEventContent>().is_ok())
275+
Ok(content.deserialize().is_ok())
277276
} else {
278277
// No account data event found, must be disabled.
279278
Ok(false)

crates/matrix-sdk/src/widget/matrix.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ impl MatrixDriver {
216216
let room_id = self.room.room_id().to_owned();
217217

218218
let handle = self.room.add_event_handler(move |raw: Raw<AnySyncTimelineEvent>| {
219-
let _ = tx.send(attach_room_id(raw.cast_ref(), &room_id));
219+
let _ = tx.send(attach_room_id(&raw, &room_id));
220220
async {}
221221
});
222222
let drop_guard = self.room.client().event_handler_drop_guard(handle);

0 commit comments

Comments
 (0)