From cb7b62a09289514db94c788f45ef2a07e20bf9c0 Mon Sep 17 00:00:00 2001 From: Felipe Diniello Date: Fri, 21 Jul 2023 20:15:57 +0200 Subject: [PATCH] formating --- kairo-common/src/lib.rs | 3 +-- kairo-common/src/postgres.rs | 8 ++------ xyz-engine/src/main.rs | 4 +--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/kairo-common/src/lib.rs b/kairo-common/src/lib.rs index 0610a16..24bdebf 100644 --- a/kairo-common/src/lib.rs +++ b/kairo-common/src/lib.rs @@ -6,11 +6,10 @@ pub mod influx; pub mod postgres; -// random functions for mqtt +// random functions for mqtt pub mod mqtt; pub mod unit_conversion; - // Commonly used types across the services mod types { pub mod mac; // deprecated for the time being. diff --git a/kairo-common/src/postgres.rs b/kairo-common/src/postgres.rs index 06ac973..68d5acc 100644 --- a/kairo-common/src/postgres.rs +++ b/kairo-common/src/postgres.rs @@ -1,14 +1,10 @@ -use diesel::r2d2::{ConnectionManager, Pool, PooledConnection}; use diesel::prelude::*; +use diesel::r2d2::{ConnectionManager, Pool, PooledConnection}; pub type DbConn = diesel::pg::PgConnection; - -// pub type DbPooledConn = PooledConnection>; pub type DbPool = Pool>; - pub struct DbPooledConn(pub PooledConnection>); - pub fn establish_connection() -> DbConn { let database_url = dotenv::var("DATABASE_URL").expect("DATABASE_URL must be set"); PgConnection::establish(&database_url) @@ -26,4 +22,4 @@ impl std::ops::Deref for DbPooledConn { fn deref(&self) -> &Self::Target { &self.0 } -} \ No newline at end of file +} diff --git a/xyz-engine/src/main.rs b/xyz-engine/src/main.rs index 4e08638..240fbcf 100644 --- a/xyz-engine/src/main.rs +++ b/xyz-engine/src/main.rs @@ -3,9 +3,7 @@ use futures::stream::StreamExt; mod handler; mod position_solver; -use kairo_common::mqtt::for_async::{ - get_mqtt_cli_and_stream, mqtt_cli_reconnect, mqtt_subscribe, -}; +use kairo_common::mqtt::for_async::{get_mqtt_cli_and_stream, mqtt_cli_reconnect, mqtt_subscribe}; #[tokio::main] async fn main() {