chore: clippy fixes

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

Cargo.lock

@@ -1,6 +1,6 @@
-use eyre::{bail, Result};
+use eyre::{Result, bail};
 
-use crate::app::{models, SqlitePool};
+use crate::app::{SqlitePool, models};
 use crate::utils::validate;
 
 #[derive(Clone)]

src/app/core/entities.rs

@@ -2,11 +2,11 @@ use std::sync::Arc;
 
 use crossbeam_channel::Receiver;
 use crossbeam_utils::sync::ShardedLock;
-use eyre::{bail, Result};
+use eyre::{Result, bail};
 use time::OffsetDateTime;
 
-use crate::app::models::{event_params, Event};
-use crate::app::{DuckDBPool, SqlitePool, EVENT_BATCH_INTERVAL};
+use crate::app::models::{Event, event_params};
+use crate::app::{DuckDBPool, EVENT_BATCH_INTERVAL, SqlitePool};
 use crate::utils::hash::generate_salt;
 
 #[derive(Clone)]
@@ -106,7 +106,7 @@ impl LiwanEvents {
     }
 }
 
-use duckdb::{params, Connection, Result as DuckResult};
+use duckdb::{Connection, Result as DuckResult, params};
 
 pub fn update_event_times(conn: &Connection, from_time: OffsetDateTime) -> DuckResult<()> {
     // this can probably be simplified, sadly the where clause can't contain window functions

src/app/core/events.rs

@@ -3,8 +3,8 @@
 use std::collections::HashMap;
 use std::net::IpAddr;
 use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 
 use crate::app::SqlitePool;
 use crossbeam_utils::sync::ShardedLock;

src/app/core/geoip.rs

@@ -1,6 +1,6 @@
-use eyre::{bail, Result};
+use eyre::{Result, bail};
 
-use crate::app::{models, SqlitePool};
+use crate::app::{SqlitePool, models};
 use crate::utils::validate;
 
 #[derive(Clone)]

src/app/core/projects.rs

@@ -2,9 +2,9 @@ use std::collections::BTreeMap;
 use std::fmt::{Debug, Display};
 
 use crate::app::DuckDBConn;
-use crate::utils::duckdb::{repeat_vars, ParamVec};
+use crate::utils::duckdb::{ParamVec, repeat_vars};
 use duckdb::params_from_iter;
-use eyre::{bail, Result};
+use eyre::{Result, bail};
 use poem_openapi::{Enum, Object};
 
 pub use super::reports_cached::*;
@@ -143,11 +143,7 @@ fn filter_sql(filters: &[DimensionFilter]) -> Result<(String, ParamVec)> {
                         _ => bail!("Invalid filter type for value"),
                     };
 
-                    if inversed {
-                        format!("not {sql}")
-                    } else {
-                        sql.to_owned()
-                    }
+                    if inversed { format!("not {sql}") } else { sql.to_owned() }
                 }
                 (None, FilterType::IsNull, false) => "is null".into(),
                 (None, FilterType::IsNull, true) => "is not null".into(),