diff --git a/db/db-core/src/tests.rs b/db/db-core/src/tests.rs index da9de2d1..d71ac032 100644 --- a/db/db-core/src/tests.rs +++ b/db/db-core/src/tests.rs @@ -17,8 +17,6 @@ //! Test utilities use crate::prelude::*; -pub async fn database_works<'a, T: MCDatabase>( - db: &T, -) { +pub async fn database_works<'a, T: MCDatabase>(db: &T) { unimplemented!("database tests"); } diff --git a/db/db-sqlx-postgres/src/lib.rs b/db/db-sqlx-postgres/src/lib.rs index 00bfb6a9..f351addd 100644 --- a/db/db-sqlx-postgres/src/lib.rs +++ b/db/db-sqlx-postgres/src/lib.rs @@ -18,8 +18,8 @@ use db_core::dev::*; use std::str::FromStr; use sqlx::postgres::PgPoolOptions; -use sqlx::PgPool; use sqlx::types::time::OffsetDateTime; +use sqlx::PgPool; pub mod errors; #[cfg(test)] diff --git a/db/db-sqlx-postgres/src/tests.rs b/db/db-sqlx-postgres/src/tests.rs index 6d1624db..e143edb1 100644 --- a/db/db-sqlx-postgres/src/tests.rs +++ b/db/db-sqlx-postgres/src/tests.rs @@ -1,4 +1,3 @@ - /* * Copyright (C) 2022 Aravinth Manivannan * diff --git a/src/docs.rs b/src/docs.rs index d627f5bf..d3cbb15a 100644 --- a/src/docs.rs +++ b/src/docs.rs @@ -72,7 +72,6 @@ pub fn handle_embedded_file(path: &str) -> HttpResponse { } } - #[my_codegen::get(path = "DOCS.assets")] async fn dist(path: web::Path) -> impl Responder { handle_embedded_file(&path) diff --git a/src/settings.rs b/src/settings.rs index df874b0b..ee71cfdf 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -121,7 +121,6 @@ impl Settings { pub fn new() -> Result { let mut s = Config::new(); - const CURRENT_DIR: &str = "./config/default.toml"; const ETC: &str = "/etc/mcaptcha/config.toml"; @@ -163,8 +162,6 @@ impl Settings { s.set("database.pool", 2.to_string()) .expect("Couldn't set database pool count"); - - match s.try_into() { Ok(val) => Ok(val), Err(e) => Err(ConfigError::Message(format!("\n\nError: {}. If it says missing fields, then please refer to https://github.com/mCaptcha/mcaptcha#configuration to learn more about how mcaptcha reads configuration\n\n", e))), diff --git a/src/static_assets/static_files.rs b/src/static_assets/static_files.rs index 995dc050..d6829d62 100644 --- a/src/static_assets/static_files.rs +++ b/src/static_assets/static_files.rs @@ -100,7 +100,6 @@ fn handle_assets(path: &str) -> HttpResponse { } } - #[get("/assets/{_:.*}")] pub async fn static_files(path: web::Path) -> impl Responder { handle_assets(&path) @@ -131,7 +130,6 @@ fn handle_favicons(path: &str) -> HttpResponse { } } - #[get("/{file}")] pub async fn favicons(path: web::Path) -> impl Responder { debug!("searching favicons"); diff --git a/src/tests/mod.rs b/src/tests/mod.rs index b15bf53b..359168c6 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -2,8 +2,10 @@ use std::sync::Arc; use actix_web::test; use actix_web::{ - dev::ServiceResponse, error::ResponseError, http::StatusCode, - body::{EitherBody, BoxBody}, + body::{BoxBody, EitherBody}, + dev::ServiceResponse, + error::ResponseError, + http::StatusCode, middleware as actix_middleware, }; use libmcaptcha::defense::Level; @@ -110,7 +112,10 @@ pub async fn register(name: &str, email: &str, password: &str) { } /// signin util -pub async fn signin(name: &str, password: &str) -> (Arc, Login, ServiceResponse>) { +pub async fn signin( + name: &str, + password: &str, +) -> (Arc, Login, ServiceResponse>) { let data = Data::new().await; let app = get_app!(data.clone()).await; @@ -173,7 +178,12 @@ pub fn get_level_data() -> CreateCaptcha { pub async fn add_levels_util( name: &str, password: &str, -) -> (Arc, Login, ServiceResponse>, MCaptchaDetails) { +) -> ( + Arc, + Login, + ServiceResponse>, + MCaptchaDetails, +) { let (data, creds, signin_resp) = signin(name, password).await; let cookies = get_cookie!(signin_resp); let app = get_app!(data).await;