From e1eed94bef6dbfe4e155c12f522ac7a5b02dd563 Mon Sep 17 00:00:00 2001 From: gwenn Date: Sun, 28 Feb 2021 13:19:58 +0100 Subject: [PATCH] Fix clippy warnings Allow `unnecessary_wraps` for `check_update` and `check_no_tail`. Remove `check_readonly` (`sqlite3-parser` may help). --- src/raw_statement.rs | 1 + src/statement.rs | 18 ++---------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/raw_statement.rs b/src/raw_statement.rs index 28395a8..eda47fb 100644 --- a/src/raw_statement.rs +++ b/src/raw_statement.rs @@ -170,6 +170,7 @@ impl RawStatement { r } + // does not work for PRAGMA #[inline] #[cfg(all(feature = "extra_check", feature = "modern_sqlite"))] // 3.7.4 pub fn readonly(&self) -> bool { diff --git a/src/statement.rs b/src/statement.rs index e6419dc..e7171e7 100644 --- a/src/statement.rs +++ b/src/statement.rs @@ -220,7 +220,6 @@ impl Statement<'_> { /// Will return `Err` if binding parameters fails. #[inline] pub fn query(&mut self, params: P) -> Result> { - self.check_readonly()?; params.__bind_in(self)?; Ok(Rows::new(self)) } @@ -718,21 +717,6 @@ impl Statement<'_> { self.conn.decode_result(stmt.finalize()) } - #[cfg(not(feature = "modern_sqlite"))] - #[inline] - fn check_readonly(&self) -> Result<()> { - Ok(()) - } - - #[cfg(feature = "modern_sqlite")] - #[inline] - fn check_readonly(&self) -> Result<()> { - /*if !self.stmt.readonly() { does not work for PRAGMA - return Err(Error::InvalidQuery); - }*/ - Ok(()) - } - #[cfg(all(feature = "modern_sqlite", feature = "extra_check"))] #[inline] fn check_update(&self) -> Result<()> { @@ -755,6 +739,7 @@ impl Statement<'_> { #[cfg(not(feature = "extra_check"))] #[inline] + #[allow(clippy::unnecessary_wraps)] fn check_update(&self) -> Result<()> { Ok(()) } @@ -793,6 +778,7 @@ impl Statement<'_> { #[cfg(not(feature = "extra_check"))] #[inline] + #[allow(clippy::unnecessary_wraps)] pub(crate) fn check_no_tail(&self) -> Result<()> { Ok(()) }