From 8f05a90b96adfe06722d01510923759fe61a8bd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Thu, 20 Jun 2024 20:25:40 +0200 Subject: [PATCH] Fix some more nightly errors and remove lint that will become an error by default (#4661) --- Cargo.toml | 1 - src/db/models/org_policy.rs | 2 +- src/db/models/two_factor.rs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5ab84350..9094801b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -211,7 +211,6 @@ non_ascii_idents = "forbid" # Deny future_incompatible = { level = "deny", priority = -1 } noop_method_call = "deny" -pointer_structural_match = "deny" rust_2018_idioms = { level = "deny", priority = -1 } rust_2021_compatibility = { level = "deny", priority = -1 } trivial_casts = "deny" 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")?;