From a2c47fb4d623599752b1d7f0ac8d0e039ce274d2 Mon Sep 17 00:00:00 2001
From: WATANABE Shinya <nabetti1720@gmail.com>
Date: Sat, 9 Nov 2024 13:27:45 +0900
Subject: [PATCH] Refactor

---
 modules/llrt_assert/src/lib.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/llrt_assert/src/lib.rs b/modules/llrt_assert/src/lib.rs
index 4a20ea0676..5c91b96805 100644
--- a/modules/llrt_assert/src/lib.rs
+++ b/modules/llrt_assert/src/lib.rs
@@ -31,13 +31,14 @@ fn assert(ctx: Ctx, value: Value, message: Opt<Value>) -> Result<()> {
     }
 
     if let Some(obj) = message.0 {
-        if let Some(msg) = obj.as_string() {
-            let msg = msg.to_string().unwrap();
-            return Err(Exception::throw_message(&ctx, &msg));
-        }
-        if let Some(err) = obj.as_exception() {
-            return Err(err.clone().throw());
-        }
+        match obj.type_of() {
+            Type::String => {
+                let msg = obj.as_string().unwrap().to_string().unwrap();
+                return Err(Exception::throw_message(&ctx, &msg));
+            },
+            Type::Exception => return Err(obj.as_exception().cloned().unwrap().throw()),
+            _ => {},
+        };
     }
 
     Err(Exception::throw_message(