fix: formatting and redundant borrows in format args

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: ctron

common/src/db/change.rs

@@ -1,4 +1,4 @@
-use sea_orm::{ConnectionTrait, DbBackend, DbErr, Statement};
+use sea_orm::{ConnectionTrait, DbErr, Statement};
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::broadcast;
@@ -80,7 +80,7 @@ pub async fn record_change(
 ) -> Result<(), DbErr> {
     let id = Uuid::now_v7();
     conn.execute(Statement::from_sql_and_values(
-        DbBackend::Postgres,
+        conn.get_database_backend(),
         "INSERT INTO change_log (id, entity_type, entity_id, operation) VALUES ($1, $2, $3, $4)",
         vec![
             id.into(),
@@ -271,9 +271,10 @@ impl ChangeListener {
     /// Deletes change_log entries older than the retention period.
     async fn cleanup(&self) {
         let retention_secs = self.retention.as_secs() as i64;
-        let result = sqlx::query(&format!(
-            "DELETE FROM change_log WHERE created_at < NOW() - INTERVAL '{retention_secs} seconds'"
-        ))
+        let result = sqlx::query(
+            "DELETE FROM change_log WHERE created_at < NOW() - ($1 * INTERVAL '1 second')",
+        )
+        .bind(retention_secs)
         .execute(&self.pool)
         .await;
 

modules/fundamental/src/common/test.rs

@@ -227,7 +227,7 @@ impl UpdateAssignments {
         let initial_etag = self.etag.clone();
 
         let request = TestRequest::put()
-            .uri(&format!("/api/v3/group/sbom-assignment/{}", &self.sbom_id))
+            .uri(&format!("/api/v3/group/sbom-assignment/{}", self.sbom_id))
             .set_json(&self.group_ids);
 
         let request = match self.etag {

modules/fundamental/src/sbom_group/endpoints/test/mod.rs

@@ -76,7 +76,7 @@ impl Update {
         }
 
         let request = TestRequest::put()
-            .uri(&format!("/api/v3/group/sbom/{}", &self.id))
+            .uri(&format!("/api/v3/group/sbom/{}", self.id))
             .set_json(update_body);
 
         let request = add_if_match(request, self.if_match_type, &self.etag);

modules/notification/src/config.rs

@@ -2,10 +2,6 @@
 #[derive(clap::Args, Debug, Clone)]
 pub struct NotificationConfig {
     /// Retention period for change_log entries (humantime, e.g. "1h", "30m", "1d")
-    #[arg(
-        long,
-        env = "TRUSTD_CHANGE_LOG_RETENTION",
-        default_value = "1d"
-    )]
+    #[arg(long, env = "TRUSTD_CHANGE_LOG_RETENTION", default_value = "1d")]
     pub change_log_retention: humantime::Duration,
 }

modules/notification/src/endpoints.rs

@@ -156,7 +156,7 @@ async fn run_ws_session(
                         }
                     }
                     Err(broadcast::error::RecvError::Lagged(n)) => {
-                        tracing::warn!(n, "WebSocket notification client lagged");
+                        tracing::warn!(lagged = n, "WebSocket notification client lagged");
                     }
                     Err(broadcast::error::RecvError::Closed) => {
                         break;

modules/notification/src/inject_token.rs

@@ -50,7 +50,6 @@ where
 }
 
 pub(crate) fn extract_token(query: &str) -> Option<String> {
-    url::form_urlencoded::parse(query.as_bytes()).find_map(|(key, value)| {
-        (key == "token" && !value.is_empty()).then(|| value.into_owned())
-    })
+    url::form_urlencoded::parse(query.as_bytes())
+        .find_map(|(key, value)| (key == "token" && !value.is_empty()).then(|| value.into_owned()))
 }

modules/notification/src/test.rs

@@ -223,7 +223,8 @@ fn user_with_permissions(perms: &[&str]) -> UserDetails {
 #[test(actix_web::test)]
 async fn ws_anonymous_forbidden(ctx: TrustifyContext) {
     let db_rw = db::ReadWrite::new(ctx.db.clone());
-    let broadcaster = ChangeBroadcaster::new(&db_rw, Duration::from_secs(86400)).expect("broadcaster");
+    let broadcaster =
+        ChangeBroadcaster::new(&db_rw, Duration::from_secs(86400)).expect("broadcaster");
     let authorizer = Authorizer::new(Some(AuthorizerConfig {}));
 
     let app = actix::init_service(
@@ -248,7 +249,8 @@ async fn ws_anonymous_forbidden(ctx: TrustifyContext) {
 #[test(actix_web::test)]
 async fn ws_no_permissions_forbidden(ctx: TrustifyContext) {
     let db_rw = db::ReadWrite::new(ctx.db.clone());
-    let broadcaster = ChangeBroadcaster::new(&db_rw, Duration::from_secs(86400)).expect("broadcaster");
+    let broadcaster =
+        ChangeBroadcaster::new(&db_rw, Duration::from_secs(86400)).expect("broadcaster");
     let authorizer = Authorizer::new(Some(AuthorizerConfig {}));
 
     let app = actix::init_service(
@@ -274,7 +276,8 @@ async fn ws_no_permissions_forbidden(ctx: TrustifyContext) {
 #[test(actix_web::test)]
 async fn ws_read_sbom_accepted(ctx: TrustifyContext) {
     let db_rw = db::ReadWrite::new(ctx.db.clone());
-    let broadcaster = ChangeBroadcaster::new(&db_rw, Duration::from_secs(86400)).expect("broadcaster");
+    let broadcaster =
+        ChangeBroadcaster::new(&db_rw, Duration::from_secs(86400)).expect("broadcaster");
     let authorizer = Authorizer::new(Some(AuthorizerConfig {}));
 
     let app = actix::init_service(
@@ -301,7 +304,8 @@ async fn ws_read_sbom_accepted(ctx: TrustifyContext) {
 #[test(actix_web::test)]
 async fn ws_read_advisory_accepted(ctx: TrustifyContext) {
     let db_rw = db::ReadWrite::new(ctx.db.clone());
-    let broadcaster = ChangeBroadcaster::new(&db_rw, Duration::from_secs(86400)).expect("broadcaster");
+    let broadcaster =
+        ChangeBroadcaster::new(&db_rw, Duration::from_secs(86400)).expect("broadcaster");
     let authorizer = Authorizer::new(Some(AuthorizerConfig {}));
 
     let app = actix::init_service(
@@ -329,7 +333,8 @@ async fn ws_read_advisory_accepted(ctx: TrustifyContext) {
 #[test(tokio::test)]
 async fn fetch_after_returns_newer_entries(ctx: TrustifyContext) {
     let db_rw = db::ReadWrite::new(ctx.db.clone());
-    let broadcaster = ChangeBroadcaster::new(&db_rw, Duration::from_secs(86400)).expect("broadcaster");
+    let broadcaster =
+        ChangeBroadcaster::new(&db_rw, Duration::from_secs(86400)).expect("broadcaster");
 
     // Insert 3 entries with small delays so UUIDv7 ordering is preserved
     record_change(

server/src/profile/api.rs

@@ -33,8 +33,8 @@ use trustify_infrastructure::{
     otel::{Metrics as OtelMetrics, Tracing},
 };
 use trustify_module_analysis::{config::AnalysisConfig, service::AnalysisService};
-use trustify_module_notification::config::NotificationConfig;
 use trustify_module_ingestor::graph::Graph;
+use trustify_module_notification::config::NotificationConfig;
 use trustify_module_storage::{config::StorageConfig, service::dispatch::DispatchBackend};
 use trustify_module_ui::{UI, endpoints::UiResources};
 use utoipa::openapi::{Info, License};

xtask/src/openapi.rs

@@ -57,7 +57,7 @@ pub async fn generate_openapi(base: Option<&Path>) -> anyhow::Result<()> {
 
     // write
 
-    println!("Writing openapi to {:?}", &path);
+    println!("Writing openapi to {:?}", path);
 
     fs::write(path, doc).context("Failed to write openapi spec")?;