From aaba1e836838a6dd75d65d83d47346d733e3e752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
<dani-garcia@users.noreply.github.com>
Date: Fri, 28 Aug 2020 22:10:28 +0200
Subject: [PATCH] Fix some clippy warnings and remove unused function
---
src/db/mod.rs | 3 ++-
src/db/models/cipher.rs | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/db/mod.rs b/src/db/mod.rs
index ec86efaf..e6ee3f8c 100644
--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -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(), )+ } }
}
diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
index cadb4134..5fdd98fa 100644
--- a/src/db/models/cipher.rs
+++ b/src/db/models/cipher.rs
@@ -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() {
--
GitLab