From 9019ebc9c5caea8c5a405faf9ac88ff951340749 Mon Sep 17 00:00:00 2001
From: Charlie-XIAO <yx2436@nyu.edu>
Date: Sat, 1 Feb 2025 17:32:51 -0500
Subject: [PATCH] chore: minor cleanups

---
 crates/deskulpt-core/src/events.rs        | 5 ++---
 crates/deskulpt-core/src/tray.rs          | 4 ++--
 crates/deskulpt-core/src/window/script.rs | 1 +
 crates/deskulpt/src/lib.rs                | 1 -
 packages/apis/rollup.config.ts            | 2 +-
 packages/react/rollup.config.ts           | 2 +-
 packages/ui/rollup.config.ts              | 2 +-
 packages/ui/src/jsx-runtime.js            | 4 +---
 8 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/crates/deskulpt-core/src/events.rs b/crates/deskulpt-core/src/events.rs
index 11001f18..80b4af2d 100644
--- a/crates/deskulpt-core/src/events.rs
+++ b/crates/deskulpt-core/src/events.rs
@@ -18,13 +18,12 @@ pub enum ShowToastPayload {
 pub trait EventsExt<R: Runtime>: Emitter<R> {
     /// Emit the `show-toast` event to the canvas.
     fn emit_show_toast_to_canvas(&self, payload: ShowToastPayload) -> Result<()> {
-        self.emit_to("canvas", "show-toast", payload)
-            .map_err(Into::into)
+        Ok(self.emit_to("canvas", "show-toast", payload)?)
     }
 
     /// Emit the `exit-app` event to the manager.
     fn emit_exit_app_to_manager(&self) -> Result<()> {
-        self.emit_to("manager", "exit-app", ()).map_err(Into::into)
+        Ok(self.emit_to("manager", "exit-app", ())?)
     }
 }
 
diff --git a/crates/deskulpt-core/src/tray.rs b/crates/deskulpt-core/src/tray.rs
index ca4b6657..6f03f1ec 100644
--- a/crates/deskulpt-core/src/tray.rs
+++ b/crates/deskulpt-core/src/tray.rs
@@ -6,7 +6,7 @@ use anyhow::Result;
 use tauri::image::Image;
 use tauri::menu::{MenuBuilder, MenuEvent, MenuItemBuilder};
 use tauri::tray::{MouseButton, MouseButtonState, TrayIcon, TrayIconBuilder, TrayIconEvent};
-use tauri::{App, AppHandle, Manager, Runtime};
+use tauri::{App, AppHandle, Runtime};
 use tokio::time::sleep;
 
 use crate::events::EventsExt;
@@ -14,7 +14,7 @@ use crate::states::StatesExtCanvasClickThrough;
 use crate::window::WindowExt;
 
 /// Extention trait for system tray-related operations.
-pub trait TrayExt<R: Runtime>: Manager<R> + StatesExtCanvasClickThrough<R> {
+pub trait TrayExt<R: Runtime>: StatesExtCanvasClickThrough<R> {
     /// Create the system tray.
     fn create_tray(&self, icon: Image) -> Result<()>
     where
diff --git a/crates/deskulpt-core/src/window/script.rs b/crates/deskulpt-core/src/window/script.rs
index 8890caa4..495d589f 100644
--- a/crates/deskulpt-core/src/window/script.rs
+++ b/crates/deskulpt-core/src/window/script.rs
@@ -1,4 +1,5 @@
 //! Window initialization scripts.
+
 use anyhow::Result;
 use serialize_to_javascript::{default_template, DefaultTemplate, Template};
 
diff --git a/crates/deskulpt/src/lib.rs b/crates/deskulpt/src/lib.rs
index 7699847e..8b084695 100644
--- a/crates/deskulpt/src/lib.rs
+++ b/crates/deskulpt/src/lib.rs
@@ -41,7 +41,6 @@ pub fn run() {
 
             app.create_manager(&settings)?;
             app.create_canvas(&settings)?;
-
             app.create_tray(DESKULPT_ICON)?;
 
             Ok(())
diff --git a/packages/apis/rollup.config.ts b/packages/apis/rollup.config.ts
index 52bcd6a8..7e45bbb7 100644
--- a/packages/apis/rollup.config.ts
+++ b/packages/apis/rollup.config.ts
@@ -70,7 +70,7 @@ function cleanDir(path: string) {
   let dir: Dir;
   try {
     dir = opendirSync(path);
-  } catch (err: unknown) {
+  } catch (err) {
     if (err instanceof Error && "code" in err) {
       switch (err.code) {
         case "ENOENT":
diff --git a/packages/react/rollup.config.ts b/packages/react/rollup.config.ts
index 02df1dbd..80a0076e 100644
--- a/packages/react/rollup.config.ts
+++ b/packages/react/rollup.config.ts
@@ -49,7 +49,7 @@ function cleanDir(path: string) {
   let dir: Dir;
   try {
     dir = opendirSync(path);
-  } catch (err: unknown) {
+  } catch (err) {
     if (err instanceof Error && "code" in err) {
       switch (err.code) {
         case "ENOENT":
diff --git a/packages/ui/rollup.config.ts b/packages/ui/rollup.config.ts
index 7bf40746..ab57bbe8 100644
--- a/packages/ui/rollup.config.ts
+++ b/packages/ui/rollup.config.ts
@@ -60,7 +60,7 @@ function cleanDir(path: string) {
   let dir: Dir;
   try {
     dir = opendirSync(path);
-  } catch (err: unknown) {
+  } catch (err) {
     if (err instanceof Error && "code" in err) {
       switch (err.code) {
         case "ENOENT":
diff --git a/packages/ui/src/jsx-runtime.js b/packages/ui/src/jsx-runtime.js
index 73d5955f..341a212a 100644
--- a/packages/ui/src/jsx-runtime.js
+++ b/packages/ui/src/jsx-runtime.js
@@ -1,3 +1 @@
-import { Fragment, jsx, jsxs } from "@emotion/react/jsx-runtime";
-
-export { jsx, jsxs, Fragment };
+export { Fragment, jsx, jsxs } from "@emotion/react/jsx-runtime";