From dc49b28520c00b9dd62d10bf137dbd621221bdbb Mon Sep 17 00:00:00 2001 From: gwenn Date: Thu, 6 Dec 2018 19:00:55 +0100 Subject: [PATCH] Fix some clippy warnings --- src/error.rs | 2 +- src/row.rs | 2 +- src/types/from_sql.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/error.rs b/src/error.rs index ab768ff..8f324dd 100644 --- a/src/error.rs +++ b/src/error.rs @@ -8,7 +8,7 @@ use std::str; /// Enum listing possible errors from rusqlite. #[derive(Debug)] -#[allow(enum_variant_names)] +#[allow(clippy::enum_variant_names)] pub enum Error { /// An error from an underlying SQLite call. SqliteFailure(ffi::Error, Option), diff --git a/src/row.rs b/src/row.rs index b1911e6..545e190 100644 --- a/src/row.rs +++ b/src/row.rs @@ -27,7 +27,7 @@ impl<'stmt> Rows<'stmt> { /// This is a "streaming iterator". For a more natural interface, /// consider using `query_map` or `query_and_then` instead, which /// return types that implement `Iterator`. - #[cfg_attr(feature = "cargo-clippy", allow(should_implement_trait))] // cannot implement Iterator + #[allow(clippy::should_implement_trait)] // cannot implement Iterator pub fn next<'a>(&'a mut self) -> Option>> { self.stmt.and_then(|stmt| match stmt.step() { Ok(true) => Some(Ok(Row { diff --git a/src/types/from_sql.rs b/src/types/from_sql.rs index 7fa00ac..4feefdf 100644 --- a/src/types/from_sql.rs +++ b/src/types/from_sql.rs @@ -47,7 +47,7 @@ impl Error for FromSqlError { } } - #[cfg_attr(feature = "clippy", allow(match_same_arms))] + #[allow(clippy::match_same_arms)] fn cause(&self) -> Option<&Error> { match *self { FromSqlError::Other(ref err) => err.cause(),