geforkt von mirrored/vaultwarden
Fix some clippy warnings and remove unused function
Dieser Commit ist enthalten in:
Ursprung
ff2684dfee
Commit
aaba1e8368
2 geänderte Dateien mit 3 neuen und 2 gelöschten Zeilen
|
@ -136,6 +136,7 @@ macro_rules! db_run {
|
|||
|
||||
pub trait FromDb {
|
||||
type Output;
|
||||
#[allow(clippy::wrong_self_convention)]
|
||||
fn from_db(self) -> Self::Output;
|
||||
}
|
||||
|
||||
|
@ -173,7 +174,7 @@ macro_rules! db_object {
|
|||
)+ }
|
||||
|
||||
impl [<$name Db>] {
|
||||
#[inline(always)] pub fn from_db(self) -> super::$name { super::$name { $( $field: self.$field, )+ } }
|
||||
#[allow(clippy::wrong_self_convention)]
|
||||
#[inline(always)] pub fn to_db(x: &super::$name) -> Self { Self { $( $field: x.$field.clone(), )+ } }
|
||||
}
|
||||
|
||||
|
|
|
@ -320,7 +320,7 @@ impl Cipher {
|
|||
// and `hide_passwords` columns. This could ideally be done as part
|
||||
// of the query, but Diesel doesn't support a max() or bool_or()
|
||||
// function on booleans and this behavior isn't portable anyway.
|
||||
if let Some(vec) = query.load::<(bool, bool)>(conn).ok() {
|
||||
if let Ok(vec) = query.load::<(bool, bool)>(conn) {
|
||||
let mut read_only = false;
|
||||
let mut hide_passwords = false;
|
||||
for (ro, hp) in vec.iter() {
|
||||
|
|
Laden …
In neuem Issue referenzieren