From 4189bf6bf0f7f6b4150ef9902e0bc5008f3d1482 Mon Sep 17 00:00:00 2001 From: Gabriel do Carmo Vieira <48625433+gvieira18@users.noreply.github.com> Date: Fri, 20 Dec 2024 08:17:40 -0300 Subject: [PATCH] refactor: reorder imports for consistency across modules Signed-off-by: Gabriel do Carmo Vieira <48625433+gvieira18@users.noreply.github.com> --- src/http/mod.rs | 2 +- src/http/v0/settings_controller.rs | 2 +- src/http/v1/auth_controller.rs | 4 ++-- src/http/v1/metrics_controller.rs | 8 ++++---- src/http/v1/settings_controller.rs | 2 +- src/models/v1/throttle.rs | 2 +- tests/http/settings_controller_test.rs | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/http/mod.rs b/src/http/mod.rs index e448cd8..e451f35 100644 --- a/src/http/mod.rs +++ b/src/http/mod.rs @@ -1,7 +1,7 @@ pub mod v0; pub mod v1; -use actix_web::{HttpResponse, ResponseError, get}; +use actix_web::{get, HttpResponse, ResponseError}; use charybdis::errors::CharybdisError; use serde_json::json; use thiserror::Error; diff --git a/src/http/v0/settings_controller.rs b/src/http/v0/settings_controller.rs index 8960e74..60d7731 100644 --- a/src/http/v0/settings_controller.rs +++ b/src/http/v0/settings_controller.rs @@ -1,4 +1,4 @@ -use actix_web::{HttpResponse, Responder, get, put, web}; +use actix_web::{get, put, web, HttpResponse, Responder}; use charybdis::operations::{Find, Insert}; use log::debug; use serde_json::json; diff --git a/src/http/v1/auth_controller.rs b/src/http/v1/auth_controller.rs index 59c47fd..23d6641 100644 --- a/src/http/v1/auth_controller.rs +++ b/src/http/v1/auth_controller.rs @@ -1,8 +1,8 @@ use crate::config::app::AppState; -use crate::http::SomeError; use crate::http::v1::validate_token; +use crate::http::SomeError; use crate::models::v1::users::UserToken; -use actix_web::{HttpResponse, Responder, post, web}; +use actix_web::{post, web, HttpResponse, Responder}; use charybdis::operations::Insert; use serde::{Deserialize, Serialize}; use serde_json::json; diff --git a/src/http/v1/metrics_controller.rs b/src/http/v1/metrics_controller.rs index 8621dc2..6d894df 100644 --- a/src/http/v1/metrics_controller.rs +++ b/src/http/v1/metrics_controller.rs @@ -1,13 +1,13 @@ use crate::config::app::AppState; -use crate::http::SomeError; use crate::http::v1::is_authenticated; +use crate::http::SomeError; use crate::models::v1::metrics::{ + delete_user_most_watched_category_leaderboard, delete_user_most_watched_channels_leaderboard, UserMetrics, UserMetricsByCategory, UserMetricsByStream, UserMostWatchedCategoryLeaderboard, - UserMostWatchedChannelsLeaderboard, delete_user_most_watched_category_leaderboard, - delete_user_most_watched_channels_leaderboard, + UserMostWatchedChannelsLeaderboard, }; use crate::models::v1::throttle::Throttle; -use actix_web::{HttpResponse, Responder, get, post, web}; +use actix_web::{get, post, web, HttpResponse, Responder}; use charybdis::operations::{Find, Insert}; use charybdis::types::Text; use chrono::Utc; diff --git a/src/http/v1/settings_controller.rs b/src/http/v1/settings_controller.rs index 2028f01..49cc660 100644 --- a/src/http/v1/settings_controller.rs +++ b/src/http/v1/settings_controller.rs @@ -1,4 +1,4 @@ -use actix_web::{HttpResponse, Responder, get, put, web}; +use actix_web::{get, put, web, HttpResponse, Responder}; use charybdis::operations::{Find, Insert}; use charybdis::options::Consistency; use log::info; diff --git a/src/models/v1/throttle.rs b/src/models/v1/throttle.rs index b1dde73..1ddea29 100644 --- a/src/models/v1/throttle.rs +++ b/src/models/v1/throttle.rs @@ -1,7 +1,7 @@ use charybdis::macros::charybdis_model; use charybdis::types::{Int, Text, Timestamp}; -use scylla::CachingSession; use scylla::query::Query; +use scylla::CachingSession; use serde::{Deserialize, Serialize}; static INSERT_THROTTLE_WITH_TTL: &str = diff --git a/tests/http/settings_controller_test.rs b/tests/http/settings_controller_test.rs index 65e2f57..c1af363 100644 --- a/tests/http/settings_controller_test.rs +++ b/tests/http/settings_controller_test.rs @@ -2,8 +2,8 @@ mod tests { use std::sync::Arc; - use actix_web::App; use actix_web::web::Data; + use actix_web::App; use charybdis::operations::{Delete, Insert}; use twitch_extension_api::config::app::AppState; use twitch_extension_api::http::v1::settings_controller::{get_settings, put_settings};