vividboarder/bitwarden_rs
1
0
Fork 0
mirror of https://github.com/ViViDboarder/bitwarden_rs.git synced 2024-11-22 13:16:39 +00:00
Code Issues Releases Wiki Activity

Switch error handling to ? operator instead of explicit handling.

Browse Source
This commit is contained in:
Michael Powers 2020-01-16 08:14:25 -05:00
parent 76743aee48
commit e196ba6e86
No known key found for this signature in database
GPG Key ID: 081A665ADB3123BD
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/db/models/two_factor.rs
View File

@ -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. // 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 // This happens automatically on other DBMS backends due to replace_into(). PostgreSQL does
// not support multiple constraints on ON CONFLICT clauses. // 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) .execute(&**conn)
.map_res("Error deleting twofactor for insert"); .map_res("Error deleting twofactor for insert")?;
if result.is_err() {
return result;
}
diesel::insert_into(twofactor::table) diesel::insert_into(twofactor::table)
.values(self) .values(self)