From 39d9cc9d3335cbd7bcb87438eed60a3ee2303ff5 Mon Sep 17 00:00:00 2001 From: strawberry Date: Sat, 9 Mar 2024 20:53:51 -0500 Subject: [PATCH] fix sqlite lints Signed-off-by: strawberry --- src/database/abstraction/sqlite.rs | 13 ++++++++++--- src/main.rs | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/database/abstraction/sqlite.rs b/src/database/abstraction/sqlite.rs index 9a524506..1544e406 100644 --- a/src/database/abstraction/sqlite.rs +++ b/src/database/abstraction/sqlite.rs @@ -33,6 +33,10 @@ impl Iterator for PreparedStatementIterator<'_> { struct NonAliasingBox(*mut T); impl Drop for NonAliasingBox { fn drop(&mut self) { + // TODO: figure out why this is necessary, but also this is sqlite so dont think + // i care that much. i tried checking commit history but couldn't find out why + // this was done. + #[allow(clippy::undocumented_unsafe_blocks)] unsafe { let _ = Box::from_raw(self.0); }; @@ -157,7 +161,10 @@ impl SqliteTable { //let name = self.name.clone(); let iterator = Box::new( - statement.query_map([], |row| Ok((row.get_unwrap(0), row.get_unwrap(1)))).unwrap().map(move |r| r.unwrap()), + statement + .query_map([], |row| Ok((row.get_unwrap(0), row.get_unwrap(1)))) + .unwrap() + .map(std::result::Result::unwrap), ); Box::new(PreparedStatementIterator { @@ -244,7 +251,7 @@ impl KvTree for SqliteTable { statement .query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1)))) .unwrap() - .map(move |r| r.unwrap()), + .map(std::result::Result::unwrap), ); Box::new(PreparedStatementIterator { iterator, @@ -266,7 +273,7 @@ impl KvTree for SqliteTable { statement .query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1)))) .unwrap() - .map(move |r| r.unwrap()), + .map(std::result::Result::unwrap), ); Box::new(PreparedStatementIterator { diff --git a/src/main.rs b/src/main.rs index 7311cb8c..479c491b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -393,6 +393,7 @@ async fn run_server() -> io::Result<()> { let app; + #[allow(clippy::unnecessary_operation)] // error[E0658]: attributes on expressions are experimental #[cfg(feature = "zstd_compression")] { app = if cfg!(feature = "zstd_compression") && config.zstd_compression {