Skip to content

Commit 8f05a90

Browse files
authored
Fix some more nightly errors and remove lint that will become an error by default (dani-garcia#4661)
1 parent 9082e7c commit 8f05a90

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ non_ascii_idents = "forbid"
211211
# Deny
212212
future_incompatible = { level = "deny", priority = -1 }
213213
noop_method_call = "deny"
214-
pointer_structural_match = "deny"
215214
rust_2018_idioms = { level = "deny", priority = -1 }
216215
rust_2021_compatibility = { level = "deny", priority = -1 }
217216
trivial_casts = "deny"

src/db/models/org_policy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl OrgPolicy {
114114
// We need to make sure we're not going to violate the unique constraint on org_uuid and atype.
115115
// This happens automatically on other DBMS backends due to replace_into(). PostgreSQL does
116116
// not support multiple constraints on ON CONFLICT clauses.
117-
diesel::delete(
117+
let _: () = diesel::delete(
118118
org_policies::table
119119
.filter(org_policies::org_uuid.eq(&self.org_uuid))
120120
.filter(org_policies::atype.eq(&self.atype)),

src/db/models/two_factor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl TwoFactor {
9595
// We need to make sure we're not going to violate the unique constraint on user_uuid and atype.
9696
// This happens automatically on other DBMS backends due to replace_into(). PostgreSQL does
9797
// not support multiple constraints on ON CONFLICT clauses.
98-
diesel::delete(twofactor::table.filter(twofactor::user_uuid.eq(&self.user_uuid)).filter(twofactor::atype.eq(&self.atype)))
98+
let _: () = diesel::delete(twofactor::table.filter(twofactor::user_uuid.eq(&self.user_uuid)).filter(twofactor::atype.eq(&self.atype)))
9999
.execute(conn)
100100
.map_res("Error deleting twofactor for insert")?;
101101

0 commit comments

Comments
 (0)