From a31cff5c860cbc088eed3333b3abf0621ca9cd17 Mon Sep 17 00:00:00 2001 From: Daniel Vigovszky Date: Thu, 10 Oct 2024 12:50:10 +0200 Subject: [PATCH] Clippy/format --- golem-component-service-base/src/repo/component.rs | 2 +- golem-service-base/src/config.rs | 2 +- golem-worker-service-base/src/repo/api_definition.rs | 2 +- golem-worker-service-base/src/repo/api_deployment.rs | 10 ++++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/golem-component-service-base/src/repo/component.rs b/golem-component-service-base/src/repo/component.rs index 9786f8373..89275dd62 100644 --- a/golem-component-service-base/src/repo/component.rs +++ b/golem-component-service-base/src/repo/component.rs @@ -18,6 +18,7 @@ use conditional_trait_gen::{trait_gen, when}; use golem_common::model::component_metadata::ComponentMetadata; use golem_common::model::{ComponentId, ComponentType}; use golem_service_base::model::{ComponentName, VersionedComponentId}; +use golem_service_base::repo::RepoError; use sqlx::{Database, Pool, Row}; use std::fmt::Display; use std::ops::Deref; @@ -25,7 +26,6 @@ use std::result::Result; use std::sync::Arc; use tracing::{debug, error}; use uuid::Uuid; -use golem_service_base::repo::RepoError; #[derive(sqlx::FromRow, Debug, Clone)] pub struct ComponentRecord { diff --git a/golem-service-base/src/config.rs b/golem-service-base/src/config.rs index 4d6d705bb..295324cdc 100644 --- a/golem-service-base/src/config.rs +++ b/golem-service-base/src/config.rs @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -use std::time::Duration; use serde::{Deserialize, Serialize}; +use std::time::Duration; #[derive(Clone, Debug, Serialize, Deserialize)] #[serde(tag = "type", content = "config")] diff --git a/golem-worker-service-base/src/repo/api_definition.rs b/golem-worker-service-base/src/repo/api_definition.rs index f13304793..3df3f25f0 100644 --- a/golem-worker-service-base/src/repo/api_definition.rs +++ b/golem-worker-service-base/src/repo/api_definition.rs @@ -15,11 +15,11 @@ use crate::api_definition::http::{CompiledHttpApiDefinition, HttpApiDefinition}; use async_trait::async_trait; use conditional_trait_gen::{trait_gen, when}; +use golem_service_base::repo::RepoError; use sqlx::{Database, Pool, Row}; use std::fmt::Display; use std::ops::Deref; use std::sync::Arc; -use golem_service_base::repo::RepoError; #[derive(sqlx::FromRow, Debug, Clone)] pub struct ApiDefinitionRecord { diff --git a/golem-worker-service-base/src/repo/api_deployment.rs b/golem-worker-service-base/src/repo/api_deployment.rs index 7df10a1e0..2f09fe940 100644 --- a/golem-worker-service-base/src/repo/api_deployment.rs +++ b/golem-worker-service-base/src/repo/api_deployment.rs @@ -16,12 +16,12 @@ use crate::api_definition::ApiSite; use crate::repo::api_definition::ApiDefinitionRecord; use crate::service::api_definition::ApiDefinitionIdWithVersion; use async_trait::async_trait; +use conditional_trait_gen::{trait_gen, when}; +use golem_service_base::repo::RepoError; use sqlx::{Database, Pool}; use std::fmt::Display; use std::ops::Deref; use std::sync::Arc; -use conditional_trait_gen::{trait_gen, when}; -use golem_service_base::repo::RepoError; #[derive(sqlx::FromRow, Debug, Clone)] pub struct ApiDeploymentRecord { @@ -225,9 +225,11 @@ impl ApiDeploymentRepo for DbApiDeploymentRepo { .map_err(|e| e.into()) } - #[when(sqlx::Postgres -> get_by_site)] - async fn get_by_site_postgres(&self, site: &str) -> Result, RepoError> { + async fn get_by_site_postgres( + &self, + site: &str, + ) -> Result, RepoError> { sqlx::query_as::<_, ApiDeploymentRecord>( r#" SELECT namespace, site, host, subdomain, definition_id, definition_version, created_at::timestamptz