refactor: generalize Loc, LocBuf, Uri, and Urn (#3295)

Author: sxyazi

Cargo.lock

@@ -24,7 +24,7 @@ ansi-to-tui         = "7.0.0"
 anyhow              = "1.0.100"
 base64              = "0.22.1"
 bitflags            = { version = "2.10.0", features = [ "serde" ] }
-clap                = { version = "4.5.50", features = [ "derive" ] }
+clap                = { version = "4.5.51", features = [ "derive" ] }
 core-foundation-sys = "0.8.7"
 crossterm           = { version = "0.29.0", features = [ "event-stream" ] }
 dirs                = "6.0.0"

Cargo.toml

@@ -51,7 +51,7 @@ impl Create {
 			&& let Some((parent, urn)) = real.pair()
 		{
 			ok_or_not_found!(provider::remove_file(&new).await);
-			FilesOp::Deleting(parent.into(), [urn.into()].into()).emit();
+			FilesOp::Deleting(parent.into(), [urn.to_owned()].into()).emit();
 			provider::create(&new).await?;
 		} else if let Some(parent) = new.parent() {
 			provider::create_dir_all(parent).await.ok();
@@ -65,7 +65,7 @@ impl Create {
 			&& let Some((parent, urn)) = real.pair()
 		{
 			let file = File::new(&real).await?;
-			FilesOp::Upserting(parent.into(), [(urn.into(), file)].into()).emit();
+			FilesOp::Upserting(parent.into(), [(urn.to_owned(), file)].into()).emit();
 			MgrProxy::reveal(&real);
 		}
 

yazi-actor/src/mgr/create.rs

@@ -26,7 +26,7 @@ impl Actor for Hover {
 
 		// Turn on tracing
 		if let (Some(h), Some(u)) = (tab.hovered(), opt.urn)
-			&& *h.urn() == u
+			&& h.urn() == u
 		{
 			// `hover(Some)` occurs after user actions, such as create, rename, reveal, etc.
 			// At this point, it's intuitive to track the location of the file regardless.

yazi-actor/src/mgr/hover.rs

@@ -73,18 +73,18 @@ impl Rename {
 			&& let Some((parent, urn)) = u.pair()
 		{
 			ok_or_not_found!(provider::rename(&u, &new).await);
-			FilesOp::Deleting(parent.to_owned(), [urn.into()].into()).emit();
+			FilesOp::Deleting(parent.to_owned(), [urn.to_owned()].into()).emit();
 		}
 
 		let new = provider::casefold(&new).await?;
 		let Some((new_p, new_n)) = new.pair() else { return Ok(()) };
 
 		let file = File::new(&new).await?;
 		if new_p == old_p {
-			FilesOp::Upserting(old_p.into(), [(old_n.into(), file)].into()).emit();
+			FilesOp::Upserting(old_p.into(), [(old_n.to_owned(), file)].into()).emit();
 		} else {
-			FilesOp::Deleting(old_p.into(), [old_n.into()].into()).emit();
-			FilesOp::Upserting(new_p.into(), [(new_n.into(), file)].into()).emit();
+			FilesOp::Deleting(old_p.into(), [old_n.to_owned()].into()).emit();
+			FilesOp::Upserting(new_p.into(), [(new_n.to_owned(), file)].into()).emit();
 		}
 
 		MgrProxy::reveal(&new);

yazi-actor/src/mgr/rename.rs

@@ -31,7 +31,7 @@ impl Actor for Reveal {
 		}
 
 		// Now, we can safely hover on the target
-		act!(mgr:hover, cx, Some(child.into()))?;
+		act!(mgr:hover, cx, Some(child.to_owned()))?;
 
 		act!(mgr:peek, cx)?;
 		act!(mgr:watch, cx)?;

yazi-actor/src/mgr/reveal.rs

@@ -1,26 +1,39 @@
-use std::ops::Deref;
+use std::{ops::Deref, path::PathBuf};
 
 use mlua::{ExternalError, FromLua, Lua, UserData, Value};
+use yazi_shared::path::PathBufLike;
 
-pub struct Urn {
-	inner: yazi_shared::url::UrnBuf,
+pub struct Urn<P: PathBufLike = PathBuf> {
+	inner: yazi_shared::url::UrnBuf<P>,
 }
 
-impl Deref for Urn {
-	type Target = yazi_shared::url::UrnBuf;
+impl<P> Deref for Urn<P>
+where
+	P: PathBufLike,
+{
+	type Target = yazi_shared::url::UrnBuf<P>;
 
 	fn deref(&self) -> &Self::Target { &self.inner }
 }
 
-impl From<Urn> for yazi_shared::url::UrnBuf {
-	fn from(value: Urn) -> Self { value.inner }
+impl<P> From<Urn<P>> for yazi_shared::url::UrnBuf<P>
+where
+	P: PathBufLike,
+{
+	fn from(value: Urn<P>) -> Self { value.inner }
 }
 
-impl Urn {
-	pub fn new(urn: impl Into<yazi_shared::url::UrnBuf>) -> Self { Self { inner: urn.into() } }
+impl<P> Urn<P>
+where
+	P: PathBufLike,
+{
+	pub fn new(urn: impl Into<yazi_shared::url::UrnBuf<P>>) -> Self { Self { inner: urn.into() } }
 }
 
-impl FromLua for Urn {
+impl<P> FromLua for Urn<P>
+where
+	P: PathBufLike,
+{
 	fn from_lua(value: Value, _: &Lua) -> mlua::Result<Self> {
 		Ok(match value {
 			Value::UserData(ud) => ud.take()?,
@@ -29,4 +42,4 @@ impl FromLua for Urn {
 	}
 }
 
-impl UserData for Urn {}
+impl<P> UserData for Urn<P> where P: PathBufLike {}

yazi-binding/src/urn.rs

@@ -28,7 +28,7 @@ yazi-shared = { path = "../yazi-shared", version = "25.9.15" }
 
 # External dependencies
 clap                  = { workspace = true }
-clap_complete         = "4.5.59"
+clap_complete         = "4.5.60"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.9"
 vergen-gitcl          = { version = "1.0.8", features = [ "build", "rustc" ] }

yazi-boot/Cargo.toml

@@ -38,7 +38,7 @@ impl Boot {
 			};
 
 			if provider::metadata(&entry).await.is_ok_and(|m| m.is_file()) {
-				(parent.into(), child.into())
+				(parent.into(), child.to_owned())
 			} else {
 				(entry, UrnBuf::default())
 			}

yazi-boot/src/boot.rs

@@ -41,7 +41,7 @@ yazi-shared = { path = "../yazi-shared", version = "25.9.15" }
 # External build dependencies
 anyhow                = { workspace = true }
 clap                  = { workspace = true }
-clap_complete         = "4.5.59"
+clap_complete         = "4.5.60"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.9"
 serde_json            = { workspace = true }