..

yazi-core/src/mgr/commands/watch.rs

@@ -6,7 +6,7 @@ use crate::mgr::Mgr;
 
 impl Mgr {
 	#[yazi_codegen::command]
-	pub fn watch(&mut self, _: Opt) {
+	pub fn watch(&mut self, _: WatchOpt) {
 		let it = iter::once(self.tabs.active().cwd())
 			.chain(self.tabs.parent().map(|p| &p.url))
 			.chain(self.tabs.hovered().filter(|h| h.is_dir()).map(|h| &h.url));

yazi-core/src/mgr/watcher.rs

@@ -52,7 +52,7 @@ impl Watcher {
 	}
 
 	pub(super) fn watch<'a>(&mut self, it: impl Iterator<Item = &'a Url>) {
-		self.in_tx.send(it.into_iter().filter(|u| u.is_regular()).cloned().collect()).ok();
+		self.in_tx.send(it.filter(|u| u.is_regular()).cloned().collect()).ok();
 	}
 
 	pub(super) fn push_files(&self, urls: Vec<Url>) {

yazi-parser/src/input/escape.rs

@@ -1,11 +1 @@
-use yazi_shared::event::CmdCow;
+pub type EscapeOpt = crate::VoidOpt;
-
-pub struct EscapeOpt;
-
-impl From<CmdCow> for EscapeOpt {
-	fn from(_: CmdCow) -> Self { Self }
-}
-
-impl From<()> for EscapeOpt {
-	fn from(_: ()) -> Self { Self }
-}

yazi-parser/src/lib.rs

@@ -1 +1,3 @@
 yazi_macro::mod_pub!(cmp confirm help input mgr notify pick spot tab tasks which);
+
+yazi_macro::mod_flat!(void);

yazi-parser/src/mgr/unyank.rs

@@ -1,11 +1 @@
-use yazi_shared::event::CmdCow;
+pub type UnyankOpt = crate::VoidOpt;
-
-pub struct UnyankOpt;
-
-impl From<CmdCow> for UnyankOpt {
-	fn from(_: CmdCow) -> Self { Self }
-}
-
-impl From<()> for UnyankOpt {
-	fn from(_: ()) -> Self { Self }
-}

yazi-parser/src/mgr/watch.rs

@@ -1,11 +1 @@
-use yazi_shared::event::CmdCow;
+pub type WatchOpt = crate::VoidOpt;
-
-pub struct WatchOpt;
-
-impl From<CmdCow> for WatchOpt {
-	fn from(_: CmdCow) -> Self { Self }
-}
-
-impl From<()> for WatchOpt {
-	fn from((): ()) -> Self { Self }
-}

yazi-parser/src/spot/close.rs

@@ -1,11 +1 @@
-use yazi_shared::event::CmdCow;
+pub type CloseOpt = crate::VoidOpt;
-
-pub struct CloseOpt;
-
-impl From<CmdCow> for CloseOpt {
-	fn from(_: CmdCow) -> Self { Self }
-}
-
-impl From<()> for CloseOpt {
-	fn from(_: ()) -> Self { Self }
-}

yazi-parser/src/tab/follow.rs

@@ -1,7 +1 @@
-use yazi_shared::event::CmdCow;
+pub type FollowOpt = crate::VoidOpt;
-
-pub struct FollowOpt;
-
-impl From<CmdCow> for FollowOpt {
-	fn from(_: CmdCow) -> Self { Self }
-}

yazi-parser/src/tab/leave.rs

@@ -1,11 +1 @@
-use yazi_shared::event::CmdCow;
+pub type LeaveOpt = crate::VoidOpt;
-
-pub struct LeaveOpt;
-
-impl From<()> for LeaveOpt {
-	fn from(_: ()) -> Self { Self }
-}
-
-impl From<CmdCow> for LeaveOpt {
-	fn from(_: CmdCow) -> Self { Self }
-}

yazi-parser/src/tasks/close.rs

@@ -1,11 +1 @@
-use yazi_shared::event::CmdCow;
+pub type CloseOpt = crate::VoidOpt;
-
-pub struct CloseOpt;
-
-impl From<CmdCow> for CloseOpt {
-	fn from(_: CmdCow) -> Self { Self }
-}
-
-impl From<()> for CloseOpt {
-	fn from(_: ()) -> Self { Self }
-}

yazi-parser/src/tasks/show.rs

@@ -1,11 +1 @@
-use yazi_shared::event::CmdCow;
+pub type ShowOpt = crate::VoidOpt;
-
-pub struct ShowOpt;
-
-impl From<CmdCow> for ShowOpt {
-	fn from(_: CmdCow) -> Self { Self }
-}
-
-impl From<()> for ShowOpt {
-	fn from(_: ()) -> Self { Self }
-}

yazi-parser/src/void.rs

@@ -0,0 +1,11 @@
+use yazi_shared::event::CmdCow;
+
+pub struct VoidOpt;
+
+impl From<CmdCow> for VoidOpt {
+	fn from(_: CmdCow) -> Self { Self }
+}
+
+impl From<()> for VoidOpt {
+	fn from(_: ()) -> Self { Self }
+}