vw_small

commit e196ba6e869793a37f0f5fa79f0f46c12ec3b40a
parent 76743aee48263f459ad4c8f3fc6a77bd2e482f35
Author: Michael Powers <swedishborgie@gmail.com>
Date:   Thu, 16 Jan 2020 08:14:25 -0500

Switch error handling to ? operator instead of explicit handling.

Diffstat:
M
src/db/models/two_factor.rs
 | 
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/db/models/two_factor.rs b/src/db/models/two_factor.rs
@@ -76,12 +76,9 @@ impl TwoFactor {
         // We need to make sure we're not going to violate the unique constraint on user_uuid and atype.
         // This happens automatically on other DBMS backends due to replace_into(). PostgreSQL does
         // not support multiple constraints on ON CONFLICT clauses.
-        let result: EmptyResult = diesel::delete(twofactor::table.filter(twofactor::user_uuid.eq(&self.user_uuid)).filter(twofactor::atype.eq(&self.atype)))
+        diesel::delete(twofactor::table.filter(twofactor::user_uuid.eq(&self.user_uuid)).filter(twofactor::atype.eq(&self.atype)))
             .execute(&**conn)
-            .map_res("Error deleting twofactor for insert");
-        if result.is_err() {
-            return result;
-        }
+            .map_res("Error deleting twofactor for insert")?;
 
         diesel::insert_into(twofactor::table)
             .values(self)