From e196ba6e869793a37f0f5fa79f0f46c12ec3b40a Mon Sep 17 00:00:00 2001 From: Michael Powers Date: Thu, 16 Jan 2020 08:14:25 -0500 Subject: [PATCH] Switch error handling to ? operator instead of explicit handling. --- 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 index b730b182..b8b3a685 100644 --- 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)