From a64b0cced98fe68ac5d90f70dcc78c1852f96bb8 Mon Sep 17 00:00:00 2001 From: Raminder Singh Date: Mon, 13 Jan 2025 13:14:43 +0530 Subject: [PATCH] clippy fixes for the add command --- cli/src/commands/add.rs | 13 +++++-------- cli/src/main.rs | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cli/src/commands/add.rs b/cli/src/commands/add.rs index a900173..0d8a67d 100644 --- a/cli/src/commands/add.rs +++ b/cli/src/commands/add.rs @@ -1,4 +1,4 @@ -use std::{collections::HashSet, path::PathBuf}; +use std::{collections::HashSet, path::Path}; use sqlx::{types::chrono::Utc, PgConnection}; use tokio::fs; @@ -10,7 +10,7 @@ use crate::{ pub async fn add( payload: &Payload, - output_path: &PathBuf, + output_path: &Path, mut conn: PgConnection, ) -> anyhow::Result<()> { let existing_versions = extension_versions(&mut conn, &payload.metadata.extension_name).await?; @@ -35,7 +35,7 @@ pub async fn add( if let Some(comment) = &payload.metadata.comment { migration_content.push_str("-- Comment:"); - migration_content.push_str(&comment); + migration_content.push_str(comment); migration_content.push('\n'); } @@ -86,7 +86,7 @@ pub async fn add( migration_content.push_str("', '"); migration_content.push_str(&install_file.version); migration_content.push_str("', $COMMENT$"); - migration_content.push_str(&payload.metadata.comment.as_deref().unwrap_or("")); + migration_content.push_str(payload.metadata.comment.as_deref().unwrap_or("")); migration_content.push_str("$COMMENT$, $SQL$"); migration_content.push_str(&install_file.body); migration_content.push_str("$SQL$, ARRAY["); @@ -100,10 +100,7 @@ pub async fn add( } let existing_update_paths = - match update_paths(&mut conn, &payload.metadata.extension_name).await { - Ok(paths) => paths, - Err(_) => HashSet::new(), - }; + (update_paths(&mut conn, &payload.metadata.extension_name).await).unwrap_or_default(); for upgrade_file in &payload.upgrade_files { let update_path = UpdatePath { diff --git a/cli/src/main.rs b/cli/src/main.rs index 22be499..1ca7f67 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -166,7 +166,7 @@ async fn main() -> anyhow::Result<()> { let payload = models::Payload::from_path(extension_dir)?; let conn = util::get_connection(connection).await?; - commands::add::add(&payload, &output_path, conn).await?; + commands::add::add(&payload, output_path, conn).await?; Ok(()) }