From 35d6b90aeb4969de9d3b75237746728aaf94ad15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Sat, 4 Jun 2022 19:24:57 +0200
Subject: [PATCH] serde: Split test assertions

---
 crates/ruma-common/src/serde/strings.rs       | 36 ++++++++-----------
 .../src/serde/urlencoded/de/val_or_vec.rs     |  8 +++--
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/crates/ruma-common/src/serde/strings.rs b/crates/ruma-common/src/serde/strings.rs
index 4e79bb11..9bc50f0c 100644
--- a/crates/ruma-common/src/serde/strings.rs
+++ b/crates/ruma-common/src/serde/strings.rs
@@ -179,7 +179,6 @@ where
 
 #[cfg(test)]
 mod tests {
-    use assert_matches::assert_matches;
     use js_int::{int, Int};
     use serde::Deserialize;
 
@@ -192,32 +191,25 @@ mod tests {
     }
 
     #[test]
-    fn int_or_string() -> serde_json::Result<()> {
-        assert_matches!(
-            serde_json::from_value::<Test>(serde_json::json!({ "num": "0" }))?,
-            Test { num } if num == int!(0)
-        );
-
-        Ok(())
+    fn int_or_string() {
+        let test = serde_json::from_value::<Test>(serde_json::json!({ "num": "0" })).unwrap();
+        assert_eq!(test.num, int!(0));
     }
 
     #[test]
-    fn weird_plus_string() -> serde_json::Result<()> {
-        assert_matches!(
-            serde_json::from_value::<Test>(serde_json::json!({ "num": "  +0000000001000   " }))?,
-            Test { num } if num == int!(1000)
-        );
-
-        Ok(())
+    fn weird_plus_string() {
+        let test =
+            serde_json::from_value::<Test>(serde_json::json!({ "num": "  +0000000001000   " }))
+                .unwrap();
+        assert_eq!(test.num, int!(1000));
     }
 
     #[test]
-    fn weird_minus_string() -> serde_json::Result<()> {
-        assert_matches!(
-            serde_json::from_value::<Test>(serde_json::json!({ "num": "  \n\n-0000000000000001000   " }))?,
-            Test { num } if num == int!(-1000)
-        );
-
-        Ok(())
+    fn weird_minus_string() {
+        let test = serde_json::from_value::<Test>(
+            serde_json::json!({ "num": "  \n\n-0000000000000001000   " }),
+        )
+        .unwrap();
+        assert_eq!(test.num, int!(-1000));
     }
 }
diff --git a/crates/ruma-common/src/serde/urlencoded/de/val_or_vec.rs b/crates/ruma-common/src/serde/urlencoded/de/val_or_vec.rs
index 62c5d001..0249bd91 100644
--- a/crates/ruma-common/src/serde/urlencoded/de/val_or_vec.rs
+++ b/crates/ruma-common/src/serde/urlencoded/de/val_or_vec.rs
@@ -238,7 +238,8 @@ mod tests {
         let mut x = ValOrVec::Val(Cow::Borrowed("a"));
         x.push(Cow::Borrowed("b"));
         x.push(Cow::Borrowed("c"));
-        assert_matches!(x, ValOrVec::Vec(v) if v == vec!["a", "b", "c"]);
+        let v = assert_matches!(x, ValOrVec::Vec(v) => v);
+        assert_eq!(v, vec!["a", "b", "c"]);
     }
 
     #[test]
@@ -246,9 +247,10 @@ mod tests {
         let mut x = ValOrVec::Val(Cow::from("a".to_owned()));
         x.push(Cow::from("b".to_owned()));
         x.push(Cow::from("c".to_owned()));
-        assert_matches!(
+        let v = assert_matches!(
             x,
-            ValOrVec::Vec(v) if v == vec!["a".to_owned(), "b".to_owned(), "c".to_owned()]
+            ValOrVec::Vec(v) => v
         );
+        assert_eq!(v, vec!["a".to_owned(), "b".to_owned(), "c".to_owned()]);
     }
 }