summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel GarcĂ­a <[email protected]>2024-06-20 20:25:40 +0200
committerGitHub <[email protected]>2024-06-20 20:25:40 +0200
commit8f05a90b96adfe06722d01510923759fe61a8bd6 (patch)
tree18ceb663f4d439fa37ebd130ef0da5130fbb5ebf /src
parent9082e7cebb5b3c507f189f4438fd78ee1df1e6b2 (diff)
downloadvaultwarden-8f05a90b96adfe06722d01510923759fe61a8bd6.tar.gz
vaultwarden-8f05a90b96adfe06722d01510923759fe61a8bd6.zip
Fix some more nightly errors and remove lint that will become an error by default (#4661)
Diffstat (limited to 'src')
-rw-r--r--src/db/models/org_policy.rs2
-rw-r--r--src/db/models/two_factor.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/db/models/org_policy.rs b/src/db/models/org_policy.rs
index 18bbdcd3..e3e7e31a 100644
--- a/src/db/models/org_policy.rs
+++ b/src/db/models/org_policy.rs
@@ -114,7 +114,7 @@ impl OrgPolicy {
// We need to make sure we're not going to violate the unique constraint on org_uuid and atype.
// This happens automatically on other DBMS backends due to replace_into(). PostgreSQL does
// not support multiple constraints on ON CONFLICT clauses.
- diesel::delete(
+ let _: () = diesel::delete(
org_policies::table
.filter(org_policies::org_uuid.eq(&self.org_uuid))
.filter(org_policies::atype.eq(&self.atype)),
diff --git a/src/db/models/two_factor.rs b/src/db/models/two_factor.rs
index 530e35b4..352fbed1 100644
--- a/src/db/models/two_factor.rs
+++ b/src/db/models/two_factor.rs
@@ -95,7 +95,7 @@ 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.
- diesel::delete(twofactor::table.filter(twofactor::user_uuid.eq(&self.user_uuid)).filter(twofactor::atype.eq(&self.atype)))
+ let _: () = 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")?;