From 26f2b8bd77786c977f7c54a6573f636677f9c4d9 Mon Sep 17 00:00:00 2001 From: Daniel Boros Date: Mon, 20 May 2024 10:44:32 +0200 Subject: [PATCH] chore: add some clippy fix --- src/dashboard/index.rs | 2 +- src/databases/pgsql/driver.rs | 4 ++-- src/modals/add_custom_query.rs | 3 +-- src/store/tabs.rs | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/dashboard/index.rs b/src/dashboard/index.rs index f347015..e181d1e 100644 --- a/src/dashboard/index.rs +++ b/src/dashboard/index.rs @@ -1,4 +1,4 @@ -use leptos::{logging::log, *}; +use leptos::*; use leptos_icons::Icon; use thaw::{Tab, TabLabel, Tabs}; diff --git a/src/databases/pgsql/driver.rs b/src/databases/pgsql/driver.rs index 624806e..c279834 100644 --- a/src/databases/pgsql/driver.rs +++ b/src/databases/pgsql/driver.rs @@ -103,7 +103,7 @@ impl<'a> Pgsql<'a> { let project_id = selected_projects.get(tabs_store.convert_selected_tab_to_index()); if !selected_projects.is_empty() - && project_id.is_some_and(|id| id.as_str() != &self.project_id.get()) + && project_id.is_some_and(|id| id.as_str() != self.project_id.get()) { tabs_store.add_tab(&self.project_id.get()); } @@ -112,7 +112,7 @@ impl<'a> Pgsql<'a> { tabs_store.selected_projects.update(|prev| { let index = tabs_store.convert_selected_tab_to_index(); match prev.get_mut(index) { - Some(project) => *project = self.project_id.get().clone(), + Some(project) => project.clone_from(&self.project_id.get()), None => prev.push(self.project_id.get().clone()), } }); diff --git a/src/modals/add_custom_query.rs b/src/modals/add_custom_query.rs index 9f9c52e..5da8c7c 100644 --- a/src/modals/add_custom_query.rs +++ b/src/modals/add_custom_query.rs @@ -17,7 +17,7 @@ pub fn AddCustomQuery(show: RwSignal, project_id: String, driver: Drivers) let query_db_clone = *query_db; let project_id = project_id.clone(); let title = title.clone(); - let driver = driver.clone(); + let driver = *driver; async move { query_db_clone .insert_query(&project_id, &title, &driver) @@ -45,7 +45,6 @@ pub fn AddCustomQuery(show: RwSignal, project_id: String, driver: Drivers) class="px-4 py-2 border-1 border-neutral-200 hover:bg-neutral-200 rounded-md" on:click={ let project_id = project_id.clone(); - let driver = driver.clone(); move |_| { insert_query .dispatch((query_store, project_id.to_string(), title(), driver)); diff --git a/src/store/tabs.rs b/src/store/tabs.rs index a7b5b87..3d9717f 100644 --- a/src/store/tabs.rs +++ b/src/store/tabs.rs @@ -69,7 +69,7 @@ impl TabsStore { .find_query_for_line(&sql, position.line_number()) .unwrap(); let (cols, rows, query_time) = invoke::<_, (Vec, Vec>, f32)>( - &Invoke::PgsqlRunQuery.to_string(), + Invoke::PgsqlRunQuery.as_ref(), &InvokePgsqlRunQueryArgs { project_id, sql: &sql.query, @@ -99,7 +99,7 @@ impl TabsStore { if !self.selected_projects.get().is_empty() && project_id.is_some_and(|id| id.as_str() != splitted_key[0]) { - self.add_tab(&splitted_key[0]); + self.add_tab(splitted_key[0]); } self.set_editor_value(sql); self.selected_projects.update(|prev| {