chore: linting

This commit is contained in:
Aravinth Manivannan
2023-07-02 21:51:24 +05:30
parent 1b05cdc391
commit 1e0aedad61
8 changed files with 20 additions and 20 deletions

View File

@@ -21,7 +21,7 @@ use sqlx::types::time::OffsetDateTime;
fn main() { fn main() {
// note: add error checking yourself. // note: add error checking yourself.
let output = Command::new("git") let output = Command::new("git")
.args(&["rev-parse", "HEAD"]) .args(["rev-parse", "HEAD"])
.output() .output()
.unwrap(); .unwrap();
let git_hash = String::from_utf8(output.stdout).unwrap(); let git_hash = String::from_utf8(output.stdout).unwrap();

View File

@@ -109,8 +109,8 @@ pub async fn init_mcaptcha(data: &AppData, key: &str) -> ServiceResult<()> {
for level in levels.iter() { for level in levels.iter() {
let level = LevelBuilder::default() let level = LevelBuilder::default()
.visitor_threshold(level.visitor_threshold as u32) .visitor_threshold(level.visitor_threshold)
.difficulty_factor(level.difficulty_factor as u32) .difficulty_factor(level.difficulty_factor)
.unwrap() .unwrap()
.build() .build()
.unwrap(); .unwrap();
@@ -268,11 +268,11 @@ pub mod tests {
key: token_key.key.clone(), key: token_key.key.clone(),
}; };
let url = V1_API_ROUTES.pow.get_config; let _url = V1_API_ROUTES.pow.get_config;
let mut prev = 0; let mut prev = 0;
for (count, l) in levels.iter().enumerate() { for (count, l) in levels.iter().enumerate() {
for l in prev..l.visitor_threshold * 2 { for _l in prev..l.visitor_threshold * 2 {
let get_config_resp = test::call_service( let _get_config_resp = test::call_service(
&app, &app,
post_request!(&get_config_payload, V1_API_ROUTES.pow.get_config) post_request!(&get_config_payload, V1_API_ROUTES.pow.get_config)
.to_request(), .to_request(),

View File

@@ -59,7 +59,7 @@ impl From<ApiWork> for Work {
/// if verification is successful /// if verification is successful
#[my_codegen::post(path = "V1_API_ROUTES.pow.verify_pow()")] #[my_codegen::post(path = "V1_API_ROUTES.pow.verify_pow()")]
pub async fn verify_pow( pub async fn verify_pow(
req: HttpRequest, _req: HttpRequest,
payload: web::Json<ApiWork>, payload: web::Json<ApiWork>,
data: AppData, data: AppData,
) -> ServiceResult<impl Responder> { ) -> ServiceResult<impl Responder> {

View File

@@ -207,9 +207,9 @@ impl Data {
}; };
let stats: Box<dyn Stats> = if s.captcha.enable_stats { let stats: Box<dyn Stats> = if s.captcha.enable_stats {
Box::new(Real::default()) Box::<Real>::default()
} else { } else {
Box::new(Dummy::default()) Box::<Dummy>::default()
}; };
let data = Data { let data = Data {

View File

@@ -132,7 +132,7 @@ mod tests {
let duration = Duration::from_secs(DURATION); let duration = Duration::from_secs(DURATION);
// register works // register works
let _ = DemoUser::register_demo_user(&data).await.unwrap(); DemoUser::register_demo_user(&data).await.unwrap();
let payload = AccountCheckPayload { let payload = AccountCheckPayload {
val: DEMO_USER.into(), val: DEMO_USER.into(),
}; };

View File

@@ -117,9 +117,9 @@ pub async fn easy(
let publish_benchmarks = let publish_benchmarks =
data.db.analytics_captcha_is_published(&key).await?; data.db.analytics_captcha_is_published(&key).await?;
let pattern = TrafficPatternRequest { let pattern = TrafficPatternRequest {
peak_sustainable_traffic: c.peak_sustainable_traffic as u32, peak_sustainable_traffic: c.peak_sustainable_traffic,
avg_traffic: c.avg_traffic as u32, avg_traffic: c.avg_traffic,
broke_my_site_traffic: c.broke_my_site_traffic.map(|n| n as u32), broke_my_site_traffic: c.broke_my_site_traffic.map(|n| n),
description: config.description, description: config.description,
publish_benchmarks, publish_benchmarks,
}; };

View File

@@ -19,7 +19,7 @@ use std::{env, fs};
use config::{Config, ConfigError, Environment, File}; use config::{Config, ConfigError, Environment, File};
use derive_more::Display; use derive_more::Display;
use log::{debug, warn};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use url::Url; use url::Url;
@@ -191,7 +191,7 @@ impl Settings {
.unwrap(); .unwrap();
log::info!("Overriding [database].url and [database].database_type with environment variable"); log::info!("Overriding [database].url and [database].database_type with environment variable");
} }
Err(e) => { Err(_e) => {
set_database_url(&mut s); set_database_url(&mut s);
} }
} }

View File

@@ -52,8 +52,8 @@ pub mod pg {
settings.captcha.runners = Some(1); settings.captcha.runners = Some(1);
settings.database.url = url.clone(); settings.database.url = url.clone();
settings.database.database_type = DBType::Postgres; settings.database.database_type = DBType::Postgres;
let data = Data::new(&settings).await;
data Data::new(&settings).await
} }
} }
pub mod maria { pub mod maria {
@@ -71,8 +71,8 @@ pub mod maria {
settings.captcha.runners = Some(1); settings.captcha.runners = Some(1);
settings.database.url = url.clone(); settings.database.url = url.clone();
settings.database.database_type = DBType::Maria; settings.database.database_type = DBType::Maria;
let data = Data::new(&settings).await;
data Data::new(&settings).await
} }
} }
//pub async fn get_data() -> ArcData { //pub async fn get_data() -> ArcData {
@@ -118,7 +118,7 @@ macro_rules! get_app {
.wrap(actix_middleware::NormalizePath::new( .wrap(actix_middleware::NormalizePath::new(
actix_middleware::TrailingSlash::Trim, actix_middleware::TrailingSlash::Trim,
)) ))
.configure(crate::routes::services), .configure($crate::routes::services),
) )
}; };
($data:expr) => { ($data:expr) => {