From e2d2cebed83d1f558165f4ce078290658a043024 Mon Sep 17 00:00:00 2001 From: Akulij Date: Fri, 25 Apr 2025 21:05:54 +0300 Subject: [PATCH] cargo fmt --- src/admin.rs | 2 +- src/db/mod.rs | 17 +++++++++-------- src/main.rs | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/admin.rs b/src/admin.rs index f8a03fd..ea7754c 100644 --- a/src/admin.rs +++ b/src/admin.rs @@ -3,7 +3,7 @@ use teloxide::{ utils::{command::BotCommands, render::RenderMessageTextHelper}, }; -use crate::db::{DB, CallDB}; +use crate::db::{CallDB, DB}; use crate::LogMsg; // These are should not appear in /help diff --git a/src/db/mod.rs b/src/db/mod.rs index c3baa29..6730f8b 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -5,18 +5,18 @@ use std::os::unix::process::CommandExt; use self::models::*; +use async_trait::async_trait; +use bb8::PooledConnection; use chrono::Utc; use diesel::prelude::*; use diesel::query_builder::NoFromClause; use diesel::query_builder::SelectStatement; use diesel_async::pooled_connection::bb8::Pool; -use bb8::PooledConnection; use diesel_async::pooled_connection::AsyncDieselConnectionManager; use diesel_async::AsyncConnection; use diesel_async::AsyncPgConnection; use diesel_async::RunQueryDsl; use enum_stringify::EnumStringify; -use async_trait::async_trait; #[derive(EnumStringify)] #[enum_stringify(case = "flat")] @@ -50,7 +50,9 @@ impl DB { #[async_trait] impl CallDB for DB { - async fn get_pool(&mut self) -> PooledConnection<'_, AsyncDieselConnectionManager> { + async fn get_pool( + &mut self, + ) -> PooledConnection<'_, AsyncDieselConnectionManager> { self.pool.get().await.unwrap() } } @@ -58,7 +60,9 @@ impl CallDB for DB { #[async_trait] pub trait CallDB { //type C; - async fn get_pool(&mut self) -> PooledConnection<'_, AsyncDieselConnectionManager>; + async fn get_pool( + &mut self, + ) -> PooledConnection<'_, AsyncDieselConnectionManager>; //async fn get_pool(&mut self) -> PooledConnection<'_, AsyncDieselConnectionManager>; async fn get_users(&mut self) -> Vec { use self::schema::users::dsl::*; @@ -235,10 +239,7 @@ pub trait CallDB { Ok(new_event) } - async fn get_media( - &mut self, - literal: &str, - ) -> Result, Box> { + async fn get_media(&mut self, literal: &str) -> Result, Box> { use self::schema::media::dsl::*; let conn = &mut self.get_pool().await; diff --git a/src/main.rs b/src/main.rs index 0060772..9690692 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,7 @@ use std::time::Duration; use crate::admin::{admin_command_handler, AdminCommands}; use crate::admin::{secret_command_handler, SecretCommands}; -use crate::db::{DB, CallDB}; +use crate::db::{CallDB, DB}; use chrono::{DateTime, Utc}; use chrono_tz::Asia;