MyFavMirrors
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some more nightly errors and remove lint that will become an error by default (#4661)

This commit is contained in:
Daniel García 2024-06-20 20:25:40 +02:00 committed by GitHub
parent 9082e7cebb
commit 8f05a90b96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -211,7 +211,6 @@ non_ascii_idents = "forbid"
# Deny # Deny
future_incompatible = { level = "deny", priority = -1 } future_incompatible = { level = "deny", priority = -1 }
noop_method_call = "deny" noop_method_call = "deny"
pointer_structural_match = "deny"
rust_2018_idioms = { level = "deny", priority = -1 } rust_2018_idioms = { level = "deny", priority = -1 }
rust_2021_compatibility = { level = "deny", priority = -1 } rust_2021_compatibility = { level = "deny", priority = -1 }
trivial_casts = "deny" trivial_casts = "deny"

2
src/db/models/org_policy.rs
View File

@ -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. // 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 // 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.
diesel::delete( let _: () = diesel::delete(
org_policies::table org_policies::table
.filter(org_policies::org_uuid.eq(&self.org_uuid)) .filter(org_policies::org_uuid.eq(&self.org_uuid))
.filter(org_policies::atype.eq(&self.atype)), .filter(org_policies::atype.eq(&self.atype)),

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

@ -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. // 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.
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) .execute(conn)
.map_res("Error deleting twofactor for insert")?; .map_res("Error deleting twofactor for insert")?;