chore: apply latest clippy lints and formatting

Author: jacobtread

src/database/entities/game_report.rs

@@ -6,7 +6,7 @@ use crate::{
     },
 };
 use futures_util::future::BoxFuture;
-use sea_orm::{entity::prelude::*, ActiveValue::Set, FromJsonQueryResult};
+use sea_orm::{ActiveValue::Set, FromJsonQueryResult, entity::prelude::*};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 

src/database/entities/leaderboard_data.rs

@@ -2,10 +2,10 @@
 
 use crate::database::DbResult;
 use crate::utils::types::PlayerID;
-use sea_orm::sea_query::OnConflict;
 use sea_orm::ActiveValue::NotSet;
-use sea_orm::{prelude::*, FromQueryResult, InsertResult, QueryOrder, QuerySelect};
+use sea_orm::sea_query::OnConflict;
 use sea_orm::{ActiveValue::Set, DatabaseConnection, EntityTrait};
+use sea_orm::{FromQueryResult, InsertResult, QueryOrder, QuerySelect, prelude::*};
 use serde::{Deserialize, Serialize};
 use std::future::Future;
 
@@ -175,7 +175,7 @@ impl Model {
         // The number of ranks to start at before the centered rank
         let before = (count / 2)
             // Add 1 when the count is even
-            .saturating_add((count % 2 == 0) as u32);
+            .saturating_add(count.is_multiple_of(2) as u32);
 
         // Determine the starting rank saturating zero bounds
         let start = value.rank.saturating_sub(before);

src/database/entities/player_data.rs

@@ -1,9 +1,9 @@
 use crate::{database::DbResult, utils::types::PlayerID};
 use sea_orm::{
-    entity::prelude::*,
-    sea_query::OnConflict,
     ActiveValue::{NotSet, Set},
     DeleteResult, InsertResult,
+    entity::prelude::*,
+    sea_query::OnConflict,
 };
 use serde::Serialize;
 use std::future::Future;

src/database/entities/players.rs

@@ -101,7 +101,7 @@ impl Model {
     /// Deletes the provided player
     ///
     /// `db` The database connection
-    pub fn delete(self, db: &DatabaseConnection) -> BoxFuture<DbResult<DeleteResult>> {
+    pub fn delete(self, db: &DatabaseConnection) -> BoxFuture<'_, DbResult<DeleteResult>> {
         // Delete player itself
         self.into_active_model().delete(db)
     }

src/database/mod.rs

@@ -2,7 +2,7 @@ use log::{error, info, warn};
 use migration::{Migrator, MigratorTrait};
 use sea_orm::Database as SeaDatabase;
 use std::{
-    fs::{create_dir_all, File},
+    fs::{File, create_dir_all},
     path::Path,
 };
 
@@ -47,10 +47,10 @@ async fn connect_database() -> DatabaseConnection {
     let path = Path::new(&DATABASE_PATH);
 
     // Create path to database file if missing
-    if let Some(parent) = path.parent() {
-        if !parent.exists() {
-            create_dir_all(parent).expect("Unable to create parent directory for sqlite database");
-        }
+    if let Some(parent) = path.parent()
+        && !parent.exists()
+    {
+        create_dir_all(parent).expect("Unable to create parent directory for sqlite database");
     }
 
     // Create the database if file is missing

src/database/seed.rs

@@ -1,5 +1,5 @@
 use chrono::Local;
-use rand::{distr::Uniform, Rng};
+use rand::{Rng, distr::Uniform};
 use sea_orm::{
     ActiveModelTrait,
     ActiveValue::{NotSet, Set},
@@ -8,8 +8,8 @@ use tokio::{task::JoinSet, try_join};
 
 use crate::{
     database::entities::{
-        galaxy_at_war::ActiveModel as GawActiveModel, leaderboard_data::LeaderboardType,
-        players::ActiveModel as PlayerActiveModel, LeaderboardData, PlayerData, PlayerRole,
+        LeaderboardData, PlayerData, PlayerRole, galaxy_at_war::ActiveModel as GawActiveModel,
+        leaderboard_data::LeaderboardType, players::ActiveModel as PlayerActiveModel,
     },
     utils::hashing::hash_password,
 };

src/middleware/auth.rs

@@ -1,8 +1,8 @@
 use crate::{
     config::Config,
     database::{
-        entities::{players::PlayerRole, Player},
         DbErr,
+        entities::{Player, players::PlayerRole},
     },
     services::sessions::{Sessions, VerifyError},
 };

src/middleware/cors.rs

@@ -1,6 +1,6 @@
 use axum::{
     body::Body,
-    http::{header, HeaderValue, Method, StatusCode},
+    http::{HeaderValue, Method, StatusCode, header},
     middleware::Next,
     response::Response,
 };
@@ -44,12 +44,12 @@ pub async fn cors_layer(req: Request<Body>, next: Next) -> Response {
 #[cfg(test)]
 mod test {
     use super::cors_layer;
-    use axum::{body::Body, middleware::from_fn, routing::get, Router};
+    use axum::{Router, body::Body, middleware::from_fn, routing::get};
     use hyper::{
+        Method, Request, StatusCode,
         header::{
             ACCESS_CONTROL_ALLOW_HEADERS, ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN,
         },
-        Method, Request, StatusCode,
     };
     use tower::ServiceExt;
 

src/middleware/ip_address.rs

@@ -1,10 +1,10 @@
 use axum::{
-    extract::{rejection::ExtensionRejection, ConnectInfo, FromRequestParts},
+    Extension,
+    extract::{ConnectInfo, FromRequestParts, rejection::ExtensionRejection},
     http::request::Parts,
     response::{IntoResponse, Response},
-    Extension,
 };
-use hyper::{header::ToStrError, HeaderMap, StatusCode};
+use hyper::{HeaderMap, StatusCode, header::ToStrError};
 use log::warn;
 use std::{
     net::{AddrParseError, IpAddr, Ipv4Addr, SocketAddr},
@@ -47,7 +47,7 @@ where
         Extension::<ConnectInfo<SocketAddr>>::from_request_parts(parts, state)
             .await
             .map_err(IpAddressError::ConnectInfo)
-            .and_then(|value| try_socket_address(value.0 .0))
+            .and_then(|value| try_socket_address(value.0.0))
             .map(Self)
     }
 }
@@ -122,7 +122,7 @@ impl IntoResponse for IpAddressError {
 mod test {
     use crate::config::Config;
 
-    use super::{extract_ip_header, IpAddress, IpAddressError, REAL_IP_HEADER};
+    use super::{IpAddress, IpAddressError, REAL_IP_HEADER, extract_ip_header};
     use axum::{
         extract::{ConnectInfo, FromRequestParts},
         http::HeaderValue,

src/middleware/upgrade.rs

@@ -1,6 +1,6 @@
 use axum::{
     extract::FromRequestParts,
-    http::{request::Parts, Method, StatusCode},
+    http::{Method, StatusCode, request::Parts},
     response::IntoResponse,
 };
 use hyper::upgrade::OnUpgrade;