From 7caf8289f5d3dea230d83d9eb0a732bdaa09a6b7 Mon Sep 17 00:00:00 2001 From: Tolmachev Igor Date: Wed, 10 Sep 2025 23:22:37 +0300 Subject: Change imports style --- src/auth.rs | 7 ++++--- src/error.rs | 6 ++++-- src/extract/auth.rs | 3 +-- src/extract/json.rs | 3 +-- src/main.rs | 2 +- src/response.rs | 6 ++++-- src/routers/account.rs | 14 ++++++++------ 7 files changed, 23 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/auth.rs b/src/auth.rs index 418f64e..38b7a24 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -1,6 +1,7 @@ -use argon2::password_hash::rand_core::OsRng; -use argon2::password_hash::{PasswordHasher, SaltString}; -use argon2::{Argon2, PasswordHash, PasswordVerifier}; +use argon2::{ + Argon2, PasswordHash, PasswordVerifier, + password_hash::{PasswordHasher, SaltString, rand_core::OsRng}, +}; use jsonwebtoken::{self as jwt, DecodingKey, EncodingKey, Header, Validation}; use serde::{Deserialize, Serialize}; diff --git a/src/error.rs b/src/error.rs index 2d0f911..1eb54ef 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,5 +1,7 @@ -use axum::extract::rejection::JsonRejection; -use axum::response::{IntoResponse, Response}; +use axum::{ + extract::rejection::JsonRejection, + response::{IntoResponse, Response}, +}; use axum_extra::typed_header::TypedHeaderRejection; use crate::response::{ErrorResponse, FailResponse, SuccessResponse}; diff --git a/src/extract/auth.rs b/src/extract/auth.rs index cc357fd..1feb985 100644 --- a/src/extract/auth.rs +++ b/src/extract/auth.rs @@ -1,5 +1,4 @@ -use axum::extract::FromRequestParts; -use axum::http::request::Parts; +use axum::{extract::FromRequestParts, http::request::Parts}; use axum_extra::TypedHeader; use entity::users; use headers::authorization::{Authorization, Bearer}; diff --git a/src/extract/json.rs b/src/extract/json.rs index cfde15b..751df71 100644 --- a/src/extract/json.rs +++ b/src/extract/json.rs @@ -1,5 +1,4 @@ -use axum::extract::rejection::JsonRejection; -use axum::extract::{FromRequest, Request}; +use axum::extract::{FromRequest, Request, rejection::JsonRejection}; use crate::error::ApiError; diff --git a/src/main.rs b/src/main.rs index 090fd75..4ab5aeb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,11 +6,11 @@ mod routers; mod state; pub use auth::{JwtClaims, create_jwt, create_password, validate_jwt, validate_password}; -use axum::Router; pub use error::{ApiError, ApiResult}; pub use response::{ErrorResponse, FailResponse, SuccessResponse}; pub use state::AppState; +use axum::Router; use sea_orm::Database; use tokio::net::TcpListener; use tower_http::trace::TraceLayer; diff --git a/src/response.rs b/src/response.rs index 25c3008..a633570 100644 --- a/src/response.rs +++ b/src/response.rs @@ -1,5 +1,7 @@ -use axum::http::StatusCode; -use axum::response::{IntoResponse, Response}; +use axum::{ + http::StatusCode, + response::{IntoResponse, Response}, +}; use serde::Serialize; use serde_json::json; diff --git a/src/routers/account.rs b/src/routers/account.rs index 98ee61d..1498b73 100644 --- a/src/routers/account.rs +++ b/src/routers/account.rs @@ -1,17 +1,19 @@ -use axum::Router; -use axum::extract::State; -use axum::routing::{delete, get, post, put}; +use axum::{ + Router, + extract::State, + routing::{delete, get, post, put}, +}; use chrono::{DateTime, Duration, Utc}; use entity::users::{self}; -use sea_orm::ActiveValue::Set; use sea_orm::{ - ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, ModelTrait, QueryFilter, + ActiveModelTrait, ActiveValue::Set, ColumnTrait, EntityTrait, IntoActiveModel, ModelTrait, + QueryFilter, }; use serde::{Deserialize, Serialize}; -use crate::extract::{ApiJson, Auth}; use crate::{ ApiError, ApiResult, AppState, JwtClaims, SuccessResponse, create_jwt, create_password, + extract::{ApiJson, Auth}, validate_password, }; -- cgit v1.2.3