From c2c6a54b8d7b8c792da8256007c1d08ca014f2b1 Mon Sep 17 00:00:00 2001
From: cdrani <charlesdrani@gmail.com>
Date: Wed, 8 May 2024 11:17:38 -0600
Subject: [PATCH] chore: run fmt + clippy

---
 src-tauri/src/cmd.rs           | 12 ++++++------
 src-tauri/src/persona/mod.rs   | 19 ++++++++-----------
 src-tauri/src/persona/sites.rs |  4 ++--
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src-tauri/src/cmd.rs b/src-tauri/src/cmd.rs
index 442e9e8..be1005d 100644
--- a/src-tauri/src/cmd.rs
+++ b/src-tauri/src/cmd.rs
@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use tauri::{Error as TauriError, LogicalPosition, LogicalSize, Manager, State, Window, AppHandle, EventTarget};
+use tauri::{Error as TauriError, LogicalPosition, LogicalSize, Manager, State, Window};
 
 use crate::app::setup::{create_webview, PORTAL};
 use crate::config::Config;
@@ -47,13 +47,13 @@ pub async fn update_history(window: Window, state: History) {
 }
 
 #[tauri::command]
-pub async fn get_persona(personas: State<'_, PersonasState>, id: Option<&str>) -> Result<Persona, TauriError> {
+pub async fn get_persona(
+    personas: State<'_, PersonasState>,
+    id: Option<&str>,
+) -> Result<Persona, TauriError> {
     let persona_guard = personas.0.lock().await;
 
-    let id = match id {
-        Some(id) => id,
-        None => "me"
-    };
+    let id = id.unwrap_or("me");
 
     let persona = persona_guard.get_persona(id);
     Ok(persona)
diff --git a/src-tauri/src/persona/mod.rs b/src-tauri/src/persona/mod.rs
index de8fd8e..e5122da 100644
--- a/src-tauri/src/persona/mod.rs
+++ b/src-tauri/src/persona/mod.rs
@@ -1,6 +1,6 @@
-use std::collections::HashMap;
 use futures_util::lock::Mutex;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 
 pub mod sites;
 
@@ -8,12 +8,12 @@ use sites::Site;
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Persona {
-    sites: Vec<Site>
+    sites: Vec<Site>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Personas {
-    personas: HashMap::<String, Persona>
+    personas: HashMap<String, Persona>,
 }
 
 pub struct PersonasState(pub Mutex<Personas>);
@@ -53,7 +53,8 @@ impl Personas {
             return None;
         }
 
-        let personas_contents = Self::read_personas_file(personas_file_path.to_string_lossy().as_ref());
+        let personas_contents =
+            Self::read_personas_file(personas_file_path.to_string_lossy().as_ref());
 
         Some(Self::get_yaml_content(&personas_contents))
     }
@@ -76,12 +77,8 @@ impl Personas {
 
     pub fn get_yaml_content(personas_content: &str) -> Self {
         match serde_yaml::from_str(personas_content) {
-            Ok(contents) => {
-                Self { ..contents }
-            }
-            Err(_) => {
-                Self::get_default_personas()
-            },
+            Ok(contents) => Self { ..contents },
+            Err(_) => Self::get_default_personas(),
         }
     }
 
diff --git a/src-tauri/src/persona/sites.rs b/src-tauri/src/persona/sites.rs
index 1da8f46..f7fbf5a 100644
--- a/src-tauri/src/persona/sites.rs
+++ b/src-tauri/src/persona/sites.rs
@@ -1,7 +1,7 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Site {
     id: String,
-    url: String,    
+    url: String,
 }