studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix sqlite lints

Browse Source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry
2024-03-09 20:53:51 -05:00
committed by June
parent 82247f7ab9
commit 39d9cc9d33
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/database/abstraction/sqlite.rs
View File

@@ -33,6 +33,10 @@ impl Iterator for PreparedStatementIterator<'_> {
struct NonAliasingBox<T>(*mut T); struct NonAliasingBox<T>(*mut T);
impl<T> Drop for NonAliasingBox<T> { impl<T> Drop for NonAliasingBox<T> {
fn drop(&mut self) { 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 { unsafe {
let _ = Box::from_raw(self.0); let _ = Box::from_raw(self.0);
}; };
@@ -157,7 +161,10 @@ impl SqliteTable {
//let name = self.name.clone(); //let name = self.name.clone();
let iterator = Box::new( 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 { Box::new(PreparedStatementIterator {
@@ -244,7 +251,7 @@ impl KvTree for SqliteTable {
statement statement
.query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1)))) .query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
.unwrap() .unwrap()
.map(move |r| r.unwrap()), .map(std::result::Result::unwrap),
); );
Box::new(PreparedStatementIterator { Box::new(PreparedStatementIterator {
iterator, iterator,
@@ -266,7 +273,7 @@ impl KvTree for SqliteTable {
statement statement
.query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1)))) .query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
.unwrap() .unwrap()
.map(move |r| r.unwrap()), .map(std::result::Result::unwrap),
); );
Box::new(PreparedStatementIterator { Box::new(PreparedStatementIterator {

1
src/main.rs
View File

@@ -393,6 +393,7 @@ async fn run_server() -> io::Result<()> {
let app; let app;
#[allow(clippy::unnecessary_operation)] // error[E0658]: attributes on expressions are experimental
#[cfg(feature = "zstd_compression")] #[cfg(feature = "zstd_compression")]
{ {
app = if cfg!(feature = "zstd_compression") && config.zstd_compression { app = if cfg!(feature = "zstd_compression") && config.zstd_compression {