fix: clippy + fmt

SpikeHD · Nov 11, 2024 · d0e23a8 · d0e23a8
1 parent f9ef4b1
commit d0e23a8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 28 deletions.
diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs
@@ -101,38 +101,42 @@ impl Config {
       themes: other.themes.or(self.themes.clone()),
       zoom: other.zoom.or(self.zoom.clone()),
       client_type: other.client_type.or(self.client_type.clone()),
-      sys_tray: other.sys_tray.or(self.sys_tray.clone()),
-      push_to_talk: other.push_to_talk.or(self.push_to_talk.clone()),
+      sys_tray: other.sys_tray.or(self.sys_tray),
+      push_to_talk: other.push_to_talk.or(self.push_to_talk),
       push_to_talk_keys: other.push_to_talk_keys.or(self.push_to_talk_keys.clone()),
-      cache_css: other.cache_css.or(self.cache_css.clone()),
-      use_native_titlebar: other.use_native_titlebar.or(self.use_native_titlebar.clone()),
-      start_maximized: other.start_maximized.or(self.start_maximized.clone()),
+      cache_css: other.cache_css.or(self.cache_css),
+      use_native_titlebar: other.use_native_titlebar.or(self.use_native_titlebar),
+      start_maximized: other.start_maximized.or(self.start_maximized),
       profile: other.profile.or(self.profile.clone()),
-      streamer_mode_detection: other.streamer_mode_detection.or(self.streamer_mode_detection.clone()),
-      rpc_server: other.rpc_server.or(self.rpc_server.clone()),
-      open_on_startup: other.open_on_startup.or(self.open_on_startup.clone()),
-      startup_minimized: other.startup_minimized.or(self.startup_minimized.clone()),
-      autoupdate: other.autoupdate.or(self.autoupdate.clone()),
-      update_notify: other.update_notify.or(self.update_notify.clone()),
-      desktop_notifications: other.desktop_notifications.or(self.desktop_notifications.clone()),
-      auto_clear_cache: other.auto_clear_cache.or(self.auto_clear_cache.clone()),
-      multi_instance: other.multi_instance.or(self.multi_instance.clone()),
-      disable_hardware_accel: other.disable_hardware_accel.or(self.disable_hardware_accel.clone()),
+      streamer_mode_detection: other
+        .streamer_mode_detection
+        .or(self.streamer_mode_detection),
+      rpc_server: other.rpc_server.or(self.rpc_server),
+      open_on_startup: other.open_on_startup.or(self.open_on_startup),
+      startup_minimized: other.startup_minimized.or(self.startup_minimized),
+      autoupdate: other.autoupdate.or(self.autoupdate),
+      update_notify: other.update_notify.or(self.update_notify),
+      desktop_notifications: other.desktop_notifications.or(self.desktop_notifications),
+      auto_clear_cache: other.auto_clear_cache.or(self.auto_clear_cache),
+      multi_instance: other.multi_instance.or(self.multi_instance),
+      disable_hardware_accel: other.disable_hardware_accel.or(self.disable_hardware_accel),
       blur: other.blur.or(self.blur.clone()),
-      blur_css: other.blur_css.or(self.blur_css.clone()),
+      blur_css: other.blur_css.or(self.blur_css),
       client_mods: other.client_mods.or(self.client_mods.clone()),
-      unread_badge: other.unread_badge.or(self.unread_badge.clone()),
-      client_plugins: other.client_plugins.or(self.client_plugins.clone()),
-      tray_icon_enabled: other.tray_icon_enabled.or(self.tray_icon_enabled.clone()),
+      unread_badge: other.unread_badge.or(self.unread_badge),
+      client_plugins: other.client_plugins.or(self.client_plugins),
+      tray_icon_enabled: other.tray_icon_enabled.or(self.tray_icon_enabled),
       proxy_uri: other.proxy_uri.or(self.proxy_uri.clone()),
 
       keybinds: other.keybinds.or(self.keybinds.clone()),
-      keybinds_enabled: other.keybinds_enabled.or(self.keybinds_enabled.clone()),
-
-      rpc_process_scanner: other.rpc_process_scanner.or(self.rpc_process_scanner.clone()),
-      rpc_ipc_connector: other.rpc_ipc_connector.or(self.rpc_ipc_connector.clone()),
-      rpc_websocket_connector: other.rpc_websocket_connector.or(self.rpc_websocket_connector.clone()),
-      rpc_secondary_events: other.rpc_secondary_events.or(self.rpc_secondary_events.clone()),
+      keybinds_enabled: other.keybinds_enabled.or(self.keybinds_enabled),
+
+      rpc_process_scanner: other.rpc_process_scanner.or(self.rpc_process_scanner),
+      rpc_ipc_connector: other.rpc_ipc_connector.or(self.rpc_ipc_connector),
+      rpc_websocket_connector: other
+        .rpc_websocket_connector
+        .or(self.rpc_websocket_connector),
+      rpc_secondary_events: other.rpc_secondary_events.or(self.rpc_secondary_events),
     }
   }
 
@@ -148,7 +152,7 @@ impl Config {
       Ok(config) => {
         let config = Self::default().merge(config);
         Ok(config)
-      },
+      }
       Err(e) => {
         log!("Failed to parse config, using default config!");
         log!("Error: {}", e);
@@ -176,7 +180,7 @@ impl Config {
       Ok(config) => {
         let config = Self::default().merge(config);
         Ok(config)
-      },
+      }
       Err(e) => {
         log!("Failed to parse config, using default config!");
         log!("Error: {}", e);

diff --git a/src-tauri/src/functionality/rpc.rs b/src-tauri/src/functionality/rpc.rs
@@ -1,5 +1,6 @@
 use rsrpc::{
-  detection::{DetectableActivity, Executable}, RPCConfig, RPCServer
+  detection::{DetectableActivity, Executable},
+  RPCConfig, RPCServer,
 };
 use std::sync::{Arc, Mutex};
 use sysinfo::{ProcessRefreshKind, RefreshKind, System};