fix: clippy warnings

Author: dancixx

src/query_editor.rs

@@ -1,9 +1,6 @@
-use std::{
-  cell::RefCell,
-  rc::Rc,
-  sync::{Arc, Mutex},
-};
+use std::{cell::RefCell, rc::Rc, sync::Arc};
 
+use futures::lock::Mutex;
 use leptos::{html::*, *};
 use leptos_use::{use_document, use_event_listener};
 use monaco::{
@@ -17,26 +14,15 @@ use crate::{modals, store::tabs::TabsStore};
 pub type ModelCell = Rc<RefCell<Option<CodeEditor>>>;
 
 pub fn component() -> impl IntoView {
-  let tabs_store = Arc::new(Mutex::new(use_context::<TabsStore>().unwrap()));
-  let run_query = create_action(move |tabs_store: &Arc<Mutex<TabsStore>>| {
-    let tabs_store = tabs_store.clone();
-    async move {
-      tabs_store.lock().unwrap().run_query().await.unwrap();
-    }
-  });
+  let tabs_store = Rc::new(RefCell::new(use_context::<TabsStore>().unwrap()));
   let show = create_rw_signal(false);
   let _ = use_event_listener(use_document(), ev::keydown, move |event| {
     if event.key() == "Escape" {
       show.set(false);
     }
   });
   let node_ref = create_node_ref();
-  let tabs_store_clone = tabs_store.clone();
-  let _ = use_event_listener(node_ref, ev::keydown, move |event| {
-    if event.key() == "Enter" && event.ctrl_key() {
-      run_query.dispatch(tabs_store_clone.clone());
-    }
-  });
+
   let tabs_store_clone = tabs_store.clone();
   node_ref.on_load(move |node| {
     let div_element: &web_sys::HtmlDivElement = &node;
@@ -62,7 +48,20 @@ pub fn component() -> impl IntoView {
 
     // TODO: Fix this
     let e = Rc::new(RefCell::new(Some(e)));
-    tabs_store_clone.lock().unwrap().add_editor(e);
+    tabs_store_clone.borrow_mut().add_editor(e);
+  });
+  let tabs_store = Arc::new(Mutex::new(use_context::<TabsStore>().unwrap()));
+  let run_query = create_action(move |tabs_store: &Arc<Mutex<TabsStore>>| {
+    let tabs_store = tabs_store.clone();
+    async move {
+      tabs_store.lock().await.run_query().await.unwrap();
+    }
+  });
+  let tabs_store_clone = tabs_store.clone();
+  let _ = use_event_listener(node_ref, ev::keydown, move |event| {
+    if event.key() == "Enter" && event.ctrl_key() {
+      run_query.dispatch(tabs_store_clone.clone());
+    }
   });
 
   div()

src/sidebar/table.rs

@@ -1,5 +1,6 @@
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 
+use futures::lock::Mutex;
 use leptos::{html::*, *};
 use leptos_icons::*;
 
@@ -10,16 +11,19 @@ pub fn component(table: (String, String), project: String, schema: String) -> im
   let active_project = use_context::<ActiveProjectStore>().unwrap();
   let query = create_action(
     move |(schema, table, tabs_store): &(String, String, Arc<Mutex<TabsStore>>)| {
+      let tabs_store = tabs_store.clone();
       let project = project.clone();
       let schema = schema.clone();
       let table = table.clone();
       active_project.0.set(Some(project.clone()));
-      tabs_store
-        .lock()
-        .unwrap()
-        .set_editor_value(&format!("SELECT * FROM {}.{} LIMIT 100;", schema, table));
-      let tabs_store = tabs_store.clone();
-      async move { tabs_store.lock().unwrap().run_query().await.unwrap() }
+
+      async move {
+        tabs_store
+          .lock()
+          .await
+          .set_editor_value(&format!("SELECT * FROM {}.{} LIMIT 100;", schema, table));
+        tabs_store.lock().await.run_query().await.unwrap()
+      }
     },
   );
 

src/store/tabs.rs

@@ -28,10 +28,14 @@ pub struct TabsStore {
   pub active_tabs: RwSignal<usize>,
   pub selected_tab: RwSignal<String>,
   pub editors: RwSignal<BTreeMap<String, ModelCell>>,
+  #[allow(clippy::type_complexity)]
   pub sql_results: RwSignal<BTreeMap<String, (Vec<String>, Vec<Vec<String>>)>>,
   pub is_loading: RwSignal<bool>,
 }
 
+unsafe impl Send for TabsStore {}
+unsafe impl Sync for TabsStore {}
+
 impl Default for TabsStore {
   fn default() -> Self {
     Self::new()
@@ -89,15 +93,16 @@ impl TabsStore {
     let query_store = use_context::<QueryStore>().unwrap();
     let query_store = query_store.0.get_untracked();
     let query = query_store.get(key).unwrap();
-    self.set_editor_value(&query);
+    self.set_editor_value(query);
     Ok(())
   }
 
   pub fn select_active_editor_sql_result(&self) -> Option<(Vec<String>, Vec<Vec<String>>)> {
-    match self.sql_results.get().get(&self.selected_tab.get()) {
-      Some(result) => Some(result.clone()),
-      None => None,
-    }
+    self
+      .sql_results
+      .get()
+      .get(&self.selected_tab.get())
+      .cloned()
   }
 
   pub fn add_editor(&mut self, editor: Rc<RefCell<Option<CodeEditor>>>) {