refactor: Fully replace matches crate with assert_matches

crates/matrix-sdk-crypto/Cargo.toml

@@ -59,10 +59,10 @@ tokio = { version = "1.23", default-features = false, features = ["time"] }
 
 [dev-dependencies]
 anyhow = "1.0.65"
+assert_matches = "1.5.0"
 futures = { version = "0.3.21", default-features = false, features = ["executor"] }
 http = "0.2.6"
 indoc = "1.0.4"
-matches = "0.1.9"
 matrix-sdk-test = { version = "0.6.0", path = "../../testing/matrix-sdk-test" }
 proptest = { version = "1.0.0", default-features = false, features = ["std"] }
 # required for async_test macro

crates/matrix-sdk-crypto/src/gossiping/machine.rs

@@ -1006,8 +1006,8 @@ impl GossipMachine {
 mod tests {
     use std::sync::Arc;
 
+    use assert_matches::assert_matches;
     use dashmap::DashMap;
-    use matches::assert_matches;
     use matrix_sdk_common::locks::Mutex;
     use matrix_sdk_test::async_test;
     use ruma::{

crates/matrix-sdk-crypto/src/machine.rs

@@ -1545,7 +1545,7 @@ pub(crate) mod testing {
 pub(crate) mod tests {
     use std::{collections::BTreeMap, iter, sync::Arc};
 
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     use matrix_sdk_test::{async_test, test_json};
     use ruma::{
         api::{

crates/matrix-sdk-crypto/src/olm/mod.rs

@@ -38,7 +38,7 @@ pub use vodozemac::{olm::IdentityKeys, Curve25519PublicKey};
 
 #[cfg(test)]
 pub(crate) mod tests {
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     use matrix_sdk_test::async_test;
     use ruma::{
         device_id, event_id,

crates/matrix-sdk-crypto/src/types/backup.rs

@@ -100,7 +100,7 @@ impl Serialize for RoomKeyBackupInfo {
 
 #[cfg(test)]
 mod test {
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     use serde_json::json;
 
     use super::RoomKeyBackupInfo;

crates/matrix-sdk-crypto/src/types/events/room/encrypted.rs

@@ -392,7 +392,7 @@ scheme_serialization!(
 
 #[cfg(test)]
 pub(crate) mod test {
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     use serde_json::{json, Value};
     use vodozemac::Curve25519PublicKey;
 

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

@@ -203,7 +203,7 @@ impl Serialize for RoomKeyContent {
 
 #[cfg(test)]
 pub(super) mod test {
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     use serde_json::{json, Value};
 
     use super::RoomKeyEvent;

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

@@ -286,7 +286,7 @@ impl TryFrom<RequestedKeyInfoHelper> for RequestedKeyInfo {
 
 #[cfg(test)]
 mod test {
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     use serde_json::{json, Value};
 
     use super::{Action, RequestedKeyInfo, RoomKeyRequestEvent};

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

@@ -394,7 +394,7 @@ impl Serialize for ToDeviceEvents {
 
 #[cfg(test)]
 mod test {
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     use serde_json::{json, Value};
 
     use super::ToDeviceEvents;

crates/matrix-sdk-crypto/src/types/one_time_keys.rs

@@ -114,7 +114,7 @@ pub enum OneTimeKey {
 
 #[cfg(test)]
 mod tests {
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     use ruma::{device_id, user_id, DeviceKeyAlgorithm, DeviceKeyId};
     use serde_json::json;
     use vodozemac::{Curve25519PublicKey, Ed25519Signature};

crates/matrix-sdk-crypto/src/verification/qrcode.rs

@@ -847,7 +847,7 @@ impl QrState<Reciprocated> {
 mod tests {
     use std::sync::Arc;
 
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     use matrix_sdk_common::locks::Mutex;
     use matrix_sdk_qrcode::QrVerificationData;
     use matrix_sdk_test::async_test;

crates/matrix-sdk-crypto/src/verification/requests.rs

@@ -1340,7 +1340,7 @@ mod tests {
 
     use std::convert::{TryFrom, TryInto};
 
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     #[cfg(feature = "qrcode")]
     use matrix_sdk_qrcode::QrVerificationData;
     use matrix_sdk_test::async_test;

crates/matrix-sdk-crypto/src/verification/sas/mod.rs

@@ -853,7 +853,7 @@ impl AcceptSettings {
 mod tests {
     use std::sync::Arc;
 
-    use matches::assert_matches;
+    use assert_matches::assert_matches;
     use matrix_sdk_common::locks::Mutex;
     use matrix_sdk_test::async_test;
     use ruma::{device_id, user_id, DeviceId, TransactionId, UserId};

crates/matrix-sdk/Cargo.toml

@@ -125,7 +125,6 @@ anyhow = "1.0.57"
 assert_matches = "1.5.0"
 dirs = "4.0.0"
 futures = { version = "0.3.21", default-features = false, features = ["executor"] }
-matches = "0.1.9"
 matrix-sdk-test = { version = "0.6.0", path = "../../testing/matrix-sdk-test" }
 once_cell = "1.10.0"
 serde_json = "1.0.79"

crates/matrix-sdk/tests/integration/refresh_token.rs

@@ -1,11 +1,11 @@
 use std::time::Duration;
 
+use assert_matches::assert_matches;
 use futures::{
     channel::{mpsc, oneshot},
     StreamExt,
 };
 use futures_signals::signal::SignalExt;
-use matches::assert_matches;
 use matrix_sdk::{config::RequestConfig, executor::spawn, HttpError, RefreshTokenError, Session};
 use matrix_sdk_test::{async_test, test_json};
 use ruma::{

crates/matrix-sdk/tests/integration/room/common.rs

@@ -166,7 +166,7 @@ async fn test_state_event_getting() {
         .deserialize()
         .unwrap();
 
-    matches::assert_matches!(encryption_event, AnySyncStateEvent::RoomEncryption(_));
+    assert_matches::assert_matches!(encryption_event, AnySyncStateEvent::RoomEncryption(_));
 }
 
 #[async_test]