change from basic if statement to matches

SeaQL · Jun 20, 2023 · 240ec4f · 240ec4f
1 parent e5a6241
commit 240ec4f
Showing 1 changed file with 12 additions and 18 deletions.
diff --git a/src/executor/insert.rs b/src/executor/insert.rs
@@ -53,13 +53,11 @@ where
             TryInsertResult::Empty
         } else {
             let temp = self.insert_struct.exec(db).await;
-            if temp.is_err()
-                && temp.as_ref().expect_err("must be error by previous check")
-                    == &DbErr::RecordNotInserted
-            {
-                return TryInsertResult::Conflicted;
+            if matches!(temp, Err(DbErr::RecordNotInserted)) {
+                TryInsertResult::Conflicted
+            } else {
+                TryInsertResult::Inserted(temp)
             }
-            TryInsertResult::Inserted(temp)
         }
     }
 
@@ -78,13 +76,11 @@ where
             TryInsertResult::Empty
         } else {
             let temp = self.insert_struct.exec_without_returning(db).await;
-            if temp.is_err()
-                && temp.as_ref().expect_err("must be error by previous check")
-                    == &DbErr::RecordNotInserted
-            {
-                return TryInsertResult::Conflicted;
+            if matches!(temp, Err(DbErr::RecordNotInserted)) {
+                TryInsertResult::Conflicted
+            } else {
+                TryInsertResult::Inserted(temp)
             }
-            TryInsertResult::Inserted(temp)
         }
     }
 
@@ -102,13 +98,11 @@ where
             TryInsertResult::Empty
         } else {
             let temp = self.insert_struct.exec_with_returning(db).await;
-            if temp.is_err()
-                && temp.as_ref().expect_err("must be error by previous check")
-                    == &DbErr::RecordNotInserted
-            {
-                return TryInsertResult::Conflicted;
+            if matches!(temp, Err(DbErr::RecordNotInserted)) {
+                TryInsertResult::Conflicted
+            } else {
+                TryInsertResult::Inserted(temp)
             }
-            TryInsertResult::Inserted(temp)
         }
     }
 }