File tree Expand file tree Collapse file tree 5 files changed +6
-8
lines changed
matrix-sdk-crypto/src/types/events
tests/integration/timeline
encryption/secret_storage Expand file tree Collapse file tree 5 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -585,8 +585,7 @@ pub(super) mod tests {
585
585
sender_key,
586
586
device_id. to_owned ( ) ,
587
587
) ;
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" ) ;
590
589
591
590
messages
592
591
. entry ( user_id. to_owned ( ) )
Original file line number Diff line number Diff line change @@ -146,7 +146,7 @@ impl EventTimelineItem {
146
146
let raw_sync_event = latest_event. event ( ) . raw ( ) . clone ( ) ;
147
147
let encryption_info = latest_event. event ( ) . encryption_info ( ) . cloned ( ) ;
148
148
149
- let Ok ( event) = raw_sync_event. deserialize_as :: < AnySyncTimelineEvent > ( ) else {
149
+ let Ok ( event) = raw_sync_event. deserialize ( ) else {
150
150
warn ! ( "Unable to deserialize latest_event as an AnySyncTimelineEvent!" ) ;
151
151
return None ;
152
152
} ;
Original file line number Diff line number Diff line change @@ -660,7 +660,7 @@ async fn mock_events_endpoint(
660
660
. mock_room_event ( )
661
661
. room ( room_id. to_owned ( ) )
662
662
. match_event_id ( )
663
- . ok ( TimelineEvent :: from_plaintext ( event. cast ( ) ) )
663
+ . ok ( TimelineEvent :: from_plaintext ( event) )
664
664
. mount ( )
665
665
. await ;
666
666
}
Original file line number Diff line number Diff line change @@ -192,8 +192,7 @@ impl SecretStorage {
192
192
let maybe_default_key_id = self . fetch_default_key_id ( ) . await ?;
193
193
194
194
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 ( ) ?;
197
196
198
197
let event_type =
199
198
GlobalAccountDataEventType :: SecretStorageKey ( default_key_id. key_id . to_owned ( ) ) ;
@@ -273,7 +272,7 @@ impl SecretStorage {
273
272
if let Some ( content) = self . fetch_default_key_id ( ) . await ? {
274
273
// Since we can't delete account data events, we're going to treat
275
274
// deserialization failures as secret storage being disabled.
276
- Ok ( content. deserialize_as :: < SecretStorageDefaultKeyEventContent > ( ) . is_ok ( ) )
275
+ Ok ( content. deserialize ( ) . is_ok ( ) )
277
276
} else {
278
277
// No account data event found, must be disabled.
279
278
Ok ( false )
Original file line number Diff line number Diff line change @@ -216,7 +216,7 @@ impl MatrixDriver {
216
216
let room_id = self . room . room_id ( ) . to_owned ( ) ;
217
217
218
218
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) ) ;
220
220
async { }
221
221
} ) ;
222
222
let drop_guard = self . room . client ( ) . event_handler_drop_guard ( handle) ;
You can’t perform that action at this time.
0 commit comments