From 14ec768b4520d4fc34dbf24e663ea7db940c18b7 Mon Sep 17 00:00:00 2001 From: Ellie Huxtable Date: Wed, 19 Mar 2025 12:44:20 +0000 Subject: chore: migrate to rust 2024 (#2635) * chore: upgrade to 2024 edition * ugh unsafe * format * nixxxxxxxxxxx why --- crates/atuin-server/src/handlers/health.rs | 2 +- crates/atuin-server/src/handlers/history.rs | 6 +++--- crates/atuin-server/src/handlers/mod.rs | 2 +- crates/atuin-server/src/handlers/record.rs | 2 +- crates/atuin-server/src/handlers/status.rs | 4 ++-- crates/atuin-server/src/handlers/user.rs | 25 +++++++++++++------------ crates/atuin-server/src/handlers/v0/record.rs | 2 +- 7 files changed, 22 insertions(+), 21 deletions(-) (limited to 'crates/atuin-server/src/handlers') diff --git a/crates/atuin-server/src/handlers/health.rs b/crates/atuin-server/src/handlers/health.rs index 1a3fc4d7..aebd1e8f 100644 --- a/crates/atuin-server/src/handlers/health.rs +++ b/crates/atuin-server/src/handlers/health.rs @@ -1,4 +1,4 @@ -use axum::{http, response::IntoResponse, Json}; +use axum::{Json, http, response::IntoResponse}; use serde::Serialize; diff --git a/crates/atuin-server/src/handlers/history.rs b/crates/atuin-server/src/handlers/history.rs index 05bbe740..5547a180 100644 --- a/crates/atuin-server/src/handlers/history.rs +++ b/crates/atuin-server/src/handlers/history.rs @@ -1,9 +1,9 @@ use std::{collections::HashMap, convert::TryFrom}; use axum::{ + Json, extract::{Path, Query, State}, http::{HeaderMap, StatusCode}, - Json, }; use metrics::counter; use time::{Month, UtcOffset}; @@ -15,9 +15,9 @@ use crate::{ utils::client_version_min, }; use atuin_server_database::{ + Database, calendar::{TimePeriod, TimePeriodInfo}, models::NewHistory, - Database, }; use atuin_common::api::*; @@ -223,7 +223,7 @@ pub async fn calendar( "day" => TimePeriod::Day { year, month }, _ => { return Err(ErrorResponse::reply("invalid focus: use year/month/day") - .with_status(StatusCode::BAD_REQUEST)) + .with_status(StatusCode::BAD_REQUEST)); } }; diff --git a/crates/atuin-server/src/handlers/mod.rs b/crates/atuin-server/src/handlers/mod.rs index a0d7ccc7..1b9fd162 100644 --- a/crates/atuin-server/src/handlers/mod.rs +++ b/crates/atuin-server/src/handlers/mod.rs @@ -1,6 +1,6 @@ use atuin_common::api::{ErrorResponse, IndexResponse}; use atuin_server_database::Database; -use axum::{extract::State, http, response::IntoResponse, Json}; +use axum::{Json, extract::State, http, response::IntoResponse}; use crate::router::AppState; diff --git a/crates/atuin-server/src/handlers/record.rs b/crates/atuin-server/src/handlers/record.rs index bf454949..1400a923 100644 --- a/crates/atuin-server/src/handlers/record.rs +++ b/crates/atuin-server/src/handlers/record.rs @@ -1,4 +1,4 @@ -use axum::{http::StatusCode, response::IntoResponse, Json}; +use axum::{Json, http::StatusCode, response::IntoResponse}; use serde_json::json; use tracing::instrument; diff --git a/crates/atuin-server/src/handlers/status.rs b/crates/atuin-server/src/handlers/status.rs index 7c127a81..9c152d51 100644 --- a/crates/atuin-server/src/handlers/status.rs +++ b/crates/atuin-server/src/handlers/status.rs @@ -1,4 +1,4 @@ -use axum::{extract::State, http::StatusCode, Json}; +use axum::{Json, extract::State, http::StatusCode}; use tracing::instrument; use super::{ErrorResponse, ErrorResponseStatus, RespExt}; @@ -28,7 +28,7 @@ pub async fn status( Ok(count) => count, Err(_) => { return Err(ErrorResponse::reply("failed to query history count") - .with_status(StatusCode::INTERNAL_SERVER_ERROR)) + .with_status(StatusCode::INTERNAL_SERVER_ERROR)); } }, }; diff --git a/crates/atuin-server/src/handlers/user.rs b/crates/atuin-server/src/handlers/user.rs index 50defc4a..135b0e0d 100644 --- a/crates/atuin-server/src/handlers/user.rs +++ b/crates/atuin-server/src/handlers/user.rs @@ -3,17 +3,17 @@ use std::collections::HashMap; use std::time::Duration; use argon2::{ - password_hash::SaltString, Algorithm, Argon2, Params, PasswordHash, PasswordHasher, - PasswordVerifier, Version, + Algorithm, Argon2, Params, PasswordHash, PasswordHasher, PasswordVerifier, Version, + password_hash::SaltString, }; use axum::{ + Json, extract::{Path, State}, http::StatusCode, - Json, }; use metrics::counter; -use postmark::{reqwest::PostmarkClient, Query}; +use postmark::{Query, reqwest::PostmarkClient}; use rand::rngs::OsRng; use tracing::{debug, error, info, instrument}; @@ -21,8 +21,8 @@ use tracing::{debug, error, info, instrument}; use super::{ErrorResponse, ErrorResponseStatus, RespExt}; use crate::router::{AppState, UserAuth}; use atuin_server_database::{ - models::{NewSession, NewUser}, Database, DbError, + models::{NewSession, NewUser}, }; use reqwest::header::CONTENT_TYPE; @@ -104,7 +104,7 @@ pub async fn register( return Err(ErrorResponse::reply( "Only alphanumeric and hyphens (-) are allowed in usernames", ) - .with_status(StatusCode::BAD_REQUEST)) + .with_status(StatusCode::BAD_REQUEST)); } } } @@ -201,12 +201,13 @@ pub async fn send_verification( } // TODO: if we ever add another mail provider, can match on them all here. - let postmark_token = if let Some(token) = settings.mail.postmark.token { - token - } else { - error!("Failed to verify email: got None for postmark token"); - return Err(ErrorResponse::reply("mail not configured") - .with_status(StatusCode::INTERNAL_SERVER_ERROR)); + let postmark_token = match settings.mail.postmark.token { + Some(token) => token, + _ => { + error!("Failed to verify email: got None for postmark token"); + return Err(ErrorResponse::reply("mail not configured") + .with_status(StatusCode::INTERNAL_SERVER_ERROR)); + } }; let db = &state.0.database; diff --git a/crates/atuin-server/src/handlers/v0/record.rs b/crates/atuin-server/src/handlers/v0/record.rs index 4a6bce16..01b91599 100644 --- a/crates/atuin-server/src/handlers/v0/record.rs +++ b/crates/atuin-server/src/handlers/v0/record.rs @@ -1,4 +1,4 @@ -use axum::{extract::Query, extract::State, http::StatusCode, Json}; +use axum::{Json, extract::Query, extract::State, http::StatusCode}; use metrics::counter; use serde::Deserialize; use tracing::{error, instrument}; -- cgit v1.3.1