refactor: refine PathLike and StrandLike traits (#3340)

Author: sxyazi

Cargo.toml

@@ -59,8 +59,11 @@ unicode-width       = { version = "0.2.0", default-features = false }
 uzers               = "0.12.1"
 
 [workspace.lints.clippy]
-format_push_string = "warn"
-implicit_clone     = "warn"
-module_inception   = "allow"
-unit_arg           = "allow"
-use_self           = "warn"
+format_push_string   = "warn"
+if_same_then_else    = "allow"
+implicit_clone       = "warn"
+len_without_is_empty = "allow"
+missing_safety_doc   = "allow"
+module_inception     = "allow"
+unit_arg             = "allow"
+use_self             = "warn"

yazi-actor/src/cmp/show.rs

@@ -3,7 +3,7 @@ use std::{mem, ops::ControlFlow};
 use anyhow::Result;
 use yazi_macro::{render, succ};
 use yazi_parser::cmp::{CmpItem, ShowOpt};
-use yazi_shared::{data::Data, path::{AsPathDyn, PathDyn, PathLike}, strand::{AsStrand, StrandLike}};
+use yazi_shared::{data::Data, path::{AsPath, PathDyn}, strand::StrandLike};
 
 use crate::{Actor, Ctx};
 
@@ -30,7 +30,7 @@ impl Actor for Show {
 		};
 
 		cmp.ticket = opt.ticket;
-		cmp.cands = Self::match_candidates(opt.word.as_path_dyn(), cache);
+		cmp.cands = Self::match_candidates(opt.word.as_path(), cache);
 		if cmp.cands.is_empty() {
 			succ!(render!(mem::replace(&mut cmp.visible, false)));
 		}
@@ -47,16 +47,15 @@ impl Show {
 		let smart = !word.encoded_bytes().iter().any(|&b| b.is_ascii_uppercase());
 
 		let flow = cache.iter().try_fold((Vec::new(), Vec::new()), |(mut exact, mut fuzzy), item| {
-			let name = item.name.as_strand();
 			let starts_with =
-				if smart { name.eq_ignore_ascii_case(word) } else { name.starts_with(word) };
+				if smart { item.name.eq_ignore_ascii_case(word) } else { item.name.starts_with(word) };
 
 			if starts_with {
 				exact.push(item);
 				if exact.len() >= LIMIT {
 					return ControlFlow::Break((exact, fuzzy));
 				}
-			} else if fuzzy.len() < LIMIT - exact.len() && name.contains(word) {
+			} else if fuzzy.len() < LIMIT - exact.len() && item.name.contains(word) {
 				// Here we don't break the control flow, since we want more exact matching.
 				fuzzy.push(item)
 			}

yazi-actor/src/cmp/trigger.rs

@@ -5,7 +5,7 @@ use yazi_fs::{CWD, path::expand_url, provider::{DirReader, FileHolder}};
 use yazi_macro::{act, render, succ};
 use yazi_parser::cmp::{CmpItem, ShowOpt, TriggerOpt};
 use yazi_proxy::CmpProxy;
-use yazi_shared::{AnyAsciiChar, data::Data, natsort, path::{AsPath, PathBufDyn, PathLike}, scheme::{SchemeCow, SchemeLike}, strand::StrandBufLike, url::{UrlBuf, UrlCow, UrlLike}};
+use yazi_shared::{AnyAsciiChar, data::Data, natsort, path::{PathBufDyn, PathDyn, PathLike}, scheme::{SchemeCow, SchemeLike}, strand::StrandLike, url::{UrlBuf, UrlCow, UrlLike}};
 use yazi_vfs::provider;
 
 use crate::{Actor, Ctx};
@@ -74,28 +74,25 @@ impl Trigger {
 		}
 
 		let sep = if cfg!(windows) {
-			AnyAsciiChar::new(&[b'/', b'\\']).unwrap()
+			AnyAsciiChar::new(b"/\\").unwrap()
 		} else {
-			AnyAsciiChar::new(&[b'/']).unwrap()
+			AnyAsciiChar::new(b"/").unwrap()
 		};
 
-		Some(match path.as_path().rsplit_pred(sep) {
+		Some(match path.rsplit_pred(sep) {
 			Some((p, c)) if p.is_empty() => {
-				let root = PathBufDyn::with(scheme.kind(), MAIN_SEPARATOR_STR).expect("valid root");
+				let root = PathDyn::with(scheme.kind(), MAIN_SEPARATOR_STR).expect("valid root");
 				(UrlCow::try_from((scheme, root)).ok()?.into_owned(), c.into())
 			}
-			Some((p, c)) => {
-				let parent = PathBufDyn::with(scheme.kind(), p.as_dyn()).expect("valid parent");
-				(expand_url(UrlCow::try_from((scheme, parent)).ok()?), c.into())
-			}
+			Some((p, c)) => (expand_url(UrlCow::try_from((scheme, p)).ok()?), c.into()),
 			None => (CWD.load().as_ref().clone(), path.into()),
 		})
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use yazi_shared::{path::PathBufLike, url::UrlLike};
+	use yazi_shared::url::UrlLike;
 
 	use super::*;
 
@@ -113,11 +110,19 @@ mod tests {
 		yazi_fs::init();
 		compare("", "", "");
 		compare(" ", "", " ");
+
 		compare("/", "/", "");
-		compare("//", "//", "");
+		compare("//", "/", "");
+		compare("///", "/", "");
+
 		compare("/foo", "/", "foo");
+		compare("//foo", "/", "foo");
+		compare("///foo", "/", "foo");
+
 		compare("/foo/", "/foo/", "");
+		compare("//foo/", "/foo/", "");
 		compare("/foo/bar", "/foo/", "bar");
+		compare("///foo/bar", "/foo/", "bar");
 	}
 
 	#[cfg(windows)]

yazi-actor/src/lives/file.rs

@@ -4,7 +4,7 @@ use mlua::{AnyUserData, IntoLua, UserData, UserDataFields, UserDataMethods, Valu
 use yazi_binding::Style;
 use yazi_config::THEME;
 use yazi_plugin::bindings::Range;
-use yazi_shared::{path::PathLike, url::UrlLike};
+use yazi_shared::url::UrlLike;
 
 use super::Lives;
 use crate::lives::PtrCell;

yazi-actor/src/lives/tab.rs

@@ -2,7 +2,7 @@ use std::ops::Deref;
 
 use mlua::{AnyUserData, UserData, UserDataFields, UserDataMethods, Value};
 use yazi_binding::{Id, UrlRef, cached_field};
-use yazi_shared::{path::PathLike, strand::StrandLike, url::UrlLike};
+use yazi_shared::url::UrlLike;
 
 use super::{Finder, Folder, Lives, Mode, Preference, Preview, PtrCell, Selected};
 

yazi-actor/src/mgr/cd.rs

@@ -9,7 +9,7 @@ use yazi_fs::{File, FilesOp, path::expand_url};
 use yazi_macro::{act, err, render, succ};
 use yazi_parser::mgr::CdOpt;
 use yazi_proxy::{CmpProxy, InputProxy, MgrProxy};
-use yazi_shared::{Debounce, data::Data, errors::InputError, path::PathLike, url::{AsUrl, UrlBuf, UrlLike}};
+use yazi_shared::{Debounce, data::Data, errors::InputError, url::{AsUrl, UrlBuf, UrlLike}};
 use yazi_vfs::VfsFile;
 
 use crate::{Actor, Ctx};
@@ -85,7 +85,7 @@ impl Cd {
 						}
 
 						if let Some(p) = url.parent() {
-							FilesOp::Upserting(p.into(), [(url.urn().owned(), file)].into()).emit();
+							FilesOp::Upserting(p.into(), [(url.urn().into(), file)].into()).emit();
 						}
 						MgrProxy::reveal(&url);
 					}

yazi-actor/src/mgr/create.rs

@@ -4,7 +4,7 @@ use yazi_fs::{File, FilesOp};
 use yazi_macro::{ok_or_not_found, succ};
 use yazi_parser::mgr::CreateOpt;
 use yazi_proxy::{ConfirmProxy, InputProxy, MgrProxy};
-use yazi_shared::{data::Data, path::PathLike, url::{UrlBuf, UrlLike}};
+use yazi_shared::{data::Data, url::{UrlBuf, UrlLike}};
 use yazi_vfs::{VfsFile, maybe_exists, provider};
 use yazi_watcher::WATCHER;
 
@@ -54,7 +54,7 @@ impl Create {
 			&& let Some((parent, urn)) = real.pair()
 		{
 			ok_or_not_found!(provider::remove_file(&new).await);
-			FilesOp::Deleting(parent.into(), [urn.owned()].into()).emit();
+			FilesOp::Deleting(parent.into(), [urn.into()].into()).emit();
 			provider::create(&new).await?;
 		} else if let Some(parent) = new.parent() {
 			provider::create_dir_all(parent).await.ok();
@@ -68,7 +68,7 @@ impl Create {
 			&& let Some((parent, urn)) = real.pair()
 		{
 			let file = File::new(&real).await?;
-			FilesOp::Upserting(parent.into(), [(urn.owned(), file)].into()).emit();
+			FilesOp::Upserting(parent.into(), [(urn.into(), file)].into()).emit();
 			MgrProxy::reveal(&real);
 		}
 

yazi-actor/src/mgr/filter_do.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use yazi_fs::Filter;
 use yazi_macro::{act, render, succ};
 use yazi_parser::mgr::FilterOpt;
-use yazi_shared::{data::Data, path::PathLike};
+use yazi_shared::data::Data;
 
 use crate::{Actor, Ctx};
 
@@ -16,7 +16,7 @@ impl Actor for FilterDo {
 	fn act(cx: &mut Ctx, opt: Self::Options) -> Result<Data> {
 		let filter = if opt.query.is_empty() { None } else { Some(Filter::new(&opt.query, opt.case)?) };
 
-		let hovered = cx.hovered().map(|f| f.urn().owned());
+		let hovered = cx.hovered().map(|f| f.urn().into());
 		cx.current_mut().files.set_filter(filter);
 
 		if cx.hovered().map(|f| f.urn()) != hovered.as_ref().map(Into::into) {

yazi-actor/src/mgr/hidden.rs

@@ -3,7 +3,7 @@ use yazi_core::tab::Folder;
 use yazi_fs::FolderStage;
 use yazi_macro::{act, render, render_and, succ};
 use yazi_parser::mgr::HiddenOpt;
-use yazi_shared::{data::Data, path::PathLike};
+use yazi_shared::data::Data;
 
 use crate::{Actor, Ctx};
 
@@ -18,7 +18,7 @@ impl Actor for Hidden {
 		let state = opt.state.bool(cx.tab().pref.show_hidden);
 		cx.tab_mut().pref.show_hidden = state;
 
-		let hovered = cx.hovered().map(|f| f.urn().owned());
+		let hovered = cx.hovered().map(|f| f.urn().to_owned());
 		let apply = |f: &mut Folder| {
 			if f.stage == FolderStage::Loading {
 				render!();

yazi-actor/src/mgr/rename.rs

@@ -5,7 +5,7 @@ use yazi_fs::{File, FilesOp};
 use yazi_macro::{act, err, ok_or_not_found, succ};
 use yazi_parser::mgr::RenameOpt;
 use yazi_proxy::{ConfirmProxy, InputProxy, MgrProxy};
-use yazi_shared::{Id, data::Data, path::PathLike, strand::StrandLike, url::{UrlBuf, UrlLike}};
+use yazi_shared::{Id, data::Data, url::{UrlBuf, UrlLike}};
 use yazi_vfs::{VfsFile, maybe_exists, provider};
 use yazi_watcher::WATCHER;
 
@@ -73,21 +73,22 @@ impl Rename {
 		provider::rename(&old, &new).await?;
 
 		if let Ok(u) = overwritten
+			&& u != new
 			&& let Some((parent, urn)) = u.pair()
 		{
 			ok_or_not_found!(provider::rename(&u, &new).await);
-			FilesOp::Deleting(parent.to_owned(), [urn.owned()].into()).emit();
+			FilesOp::Deleting(parent.to_owned(), [urn.into()].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.owned(), file)].into()).emit();
+			FilesOp::Upserting(old_p.into(), [(old_n.into(), file)].into()).emit();
 		} else {
-			FilesOp::Deleting(old_p.into(), [old_n.owned()].into()).emit();
-			FilesOp::Upserting(new_p.into(), [(new_n.owned(), file)].into()).emit();
+			FilesOp::Deleting(old_p.into(), [old_n.into()].into()).emit();
+			FilesOp::Upserting(new_p.into(), [(new_n.into(), file)].into()).emit();
 		}
 
 		MgrProxy::reveal(&new);