1 files changed, 20 insertions, 12 deletions
diff --git a/src/compat/option_test.cpp b/src/compat/option_test.cpp
index f9cec0e..69f3a60 100644
--- a/src/compat/option_test.cpp
+++ b/src/compat/option_test.cpp
@@ -398,24 +398,32 @@ TEST(Option, unwrap)
     v = None; TRY_UNWRAP(fcr(), v = Some(1));
 
     v = None;
-    if OPTION_IS_SOME_NOLOOP(o, v)
+    OMATCH_BEGIN (v)
     {
-        EXPECT_NE(o, o);
-    }
-    else
-    {
-        SUCCEED();
+        OMATCH_CASE_SOME (o)
+        {
+            EXPECT_NE(o, o);
+        }
+        OMATCH_CASE_NONE ()
+        {
+            SUCCEED();
+        }
     }
+    OMATCH_END ();
 
     v = Some(1);
-    if OPTION_IS_SOME_NOLOOP(o, v)
+    OMATCH_BEGIN (v)
     {
-        EXPECT_EQ(o, 1);
-    }
-    else
-    {
-        FAIL();
+        OMATCH_CASE_SOME (o)
+        {
+            EXPECT_EQ(o, 1);
+        }
+        OMATCH_CASE_NONE ()
+        {
+            FAIL();
+        }
     }
+    OMATCH_END ();
 }
 
 TEST(Option, flatten)