mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove all unnecessary uses of Path

Browse source
This commit is contained in:
sxyazi 2024-02-18 00:25:56 +08:00
parent 6dc794f20c
commit cd71fccc9a
No known key found for this signature in database
1 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
yazi-core/src/tab/selected.rs
View file

@ -81,15 +81,13 @@ impl Selected {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::path::Path;
use super::*; use super::*;
#[test] #[test]
fn test_insert_non_conflicting() { fn test_insert_non_conflicting() {
let mut selected = Selected::default(); let mut selected = Selected::default();
let url1 = Url::from(Path::new("/a/b")); let url1 = Url::from("/a/b");
let url2 = Url::from(Path::new("/c/d")); let url2 = Url::from("/c/d");
assert!(selected.insert(url1)); assert!(selected.insert(url1));
assert!(selected.insert(url2)); assert!(selected.insert(url2));
@ -99,8 +97,8 @@ mod tests {
#[test] #[test]
fn test_insert_conflicting_parent() { fn test_insert_conflicting_parent() {
let mut selected = Selected::default(); let mut selected = Selected::default();
let parent_url = Url::from(Path::new("/a")); let parent_url = Url::from("/a");
let child_url = Url::from(Path::new("/a/b")); let child_url = Url::from("/a/b");
assert!(selected.insert(parent_url)); assert!(selected.insert(parent_url));
assert!(!selected.insert(child_url)); assert!(!selected.insert(child_url));
@ -109,9 +107,9 @@ mod tests {
#[test] #[test]
fn test_insert_conflicting_child() { fn test_insert_conflicting_child() {
let mut selected = Selected::default(); let mut selected = Selected::default();
let child_url = Url::from(Path::new("/a/b/c")); let child_url = Url::from("/a/b/c");
let parent_url = Url::from(Path::new("/a/b")); let parent_url = Url::from("/a/b");
let sibling_url = Url::from(Path::new("/a/b/d")); let sibling_url = Url::from("/a/b/d");
assert!(selected.insert(child_url)); assert!(selected.insert(child_url));
assert!(!selected.insert(parent_url)); assert!(!selected.insert(parent_url));
@ -121,7 +119,7 @@ mod tests {
#[test] #[test]
fn test_remove() { fn test_remove() {
let mut selected = Selected::default(); let mut selected = Selected::default();
let url = Url::from(Path::new("/a/b")); let url = Url::from("/a/b");
assert!(selected.insert(url.clone())); assert!(selected.insert(url.clone()));
assert!(selected.remove(&url)); assert!(selected.remove(&url));
@ -132,9 +130,9 @@ mod tests {
#[test] #[test]
fn insert_many_success() { fn insert_many_success() {
let mut selected = Selected::default(); let mut selected = Selected::default();
let child1 = Url::from(Path::new("/parent/child1")); let child1 = Url::from("/parent/child1");
let child2 = Url::from(Path::new("/parent/child2")); let child2 = Url::from("/parent/child2");
let child3 = Url::from(Path::new("/parent/child3")); let child3 = Url::from("/parent/child3");
let urls = vec![&child1, &child2, &child3]; let urls = vec![&child1, &child2, &child3];
assert!(selected.insert_many(&urls)); assert!(selected.insert_many(&urls));
} }
@ -142,10 +140,10 @@ mod tests {
#[test] #[test]
fn insert_many_with_existing_parent_fails() { fn insert_many_with_existing_parent_fails() {
let mut selected = Selected::default(); let mut selected = Selected::default();
selected.insert(Url::from(Path::new("/parent"))); selected.insert(Url::from("/parent"));
let child1 = Url::from(Path::new("/parent/child1")); let child1 = Url::from("/parent/child1");
let child2 = Url::from(Path::new("/parent/child2")); let child2 = Url::from("/parent/child2");
let urls = vec![&child1, &child2]; let urls = vec![&child1, &child2];
assert!(!selected.insert_many(&urls)); assert!(!selected.insert_many(&urls));
} }
@ -153,11 +151,11 @@ mod tests {
#[test] #[test]
fn insert_many_with_existing_child_fails() { fn insert_many_with_existing_child_fails() {
let mut selected = Selected::default(); let mut selected = Selected::default();
let child = Url::from(Path::new("/parent/child1")); let child = Url::from("/parent/child1");
selected.insert(child); selected.insert(child);
let child1 = Url::from(Path::new("/parent/child1")); let child1 = Url::from("/parent/child1");
let child2 = Url::from(Path::new("/parent/child2")); let child2 = Url::from("/parent/child2");
let urls = vec![&child1, &child2]; let urls = vec![&child1, &child2];
assert!(selected.insert_many(&urls)); assert!(selected.insert_many(&urls));
} }
@ -171,17 +169,17 @@ mod tests {
#[test] #[test]
fn insert_many_with_parent_as_child_of_another_url() { fn insert_many_with_parent_as_child_of_another_url() {
let mut selected = Selected::default(); let mut selected = Selected::default();
selected.insert(Url::from(Path::new("/parent/child"))); selected.insert(Url::from("/parent/child"));
let child1 = Url::from(Path::new("/parent/child/child1")); let child1 = Url::from("/parent/child/child1");
let child2 = Url::from(Path::new("/parent/child/child2")); let child2 = Url::from("/parent/child/child2");
let urls = vec![&child1, &child2]; let urls = vec![&child1, &child2];
assert!(!selected.insert_many(&urls)); assert!(!selected.insert_many(&urls));
} }
#[test] #[test]
fn insert_many_with_direct_parent_fails() { fn insert_many_with_direct_parent_fails() {
let mut selected = Selected::default(); let mut selected = Selected::default();
selected.insert(Url::from(Path::new("/a"))); selected.insert(Url::from("/a"));
let binding = Url::from(Path::new("/a/b")); let binding = Url::from("/a/b");
let urls = vec![&binding]; let urls = vec![&binding];
assert!(!selected.insert_many(&urls)); assert!(!selected.insert_many(&urls));
} }
@ -189,8 +187,8 @@ mod tests {
#[test] #[test]
fn insert_many_with_nested_child_fails() { fn insert_many_with_nested_child_fails() {
let mut selected = Selected::default(); let mut selected = Selected::default();
selected.insert(Url::from(Path::new("/a/b"))); selected.insert(Url::from("/a/b"));
let binding = Url::from(Path::new("/a")); let binding = Url::from("/a");
let urls = vec![&binding]; let urls = vec![&binding];
assert!(!selected.insert_many(&urls)); assert!(!selected.insert_many(&urls));
} }
@ -198,8 +196,8 @@ mod tests {
#[test] #[test]
fn insert_many_sibling_directories_success() { fn insert_many_sibling_directories_success() {
let mut selected = Selected::default(); let mut selected = Selected::default();
let child1 = Url::from(Path::new("/a/b")); let child1 = Url::from("/a/b");
let child2 = Url::from(Path::new("/a/c")); let child2 = Url::from("/a/c");
let urls = vec![&child1, &child2]; let urls = vec![&child1, &child2];
assert!(selected.insert_many(&urls)); assert!(selected.insert_many(&urls));
} }
@ -207,8 +205,8 @@ mod tests {
#[test] #[test]
fn insert_many_with_grandchild_fails() { fn insert_many_with_grandchild_fails() {
let mut selected = Selected::default(); let mut selected = Selected::default();
selected.insert(Url::from(Path::new("/a/b"))); selected.insert(Url::from("/a/b"));
let binding = Url::from(Path::new("/a/b/c")); let binding = Url::from("/a/b/c");
let urls = vec![&binding]; let urls = vec![&binding];
assert!(!selected.insert_many(&urls)); assert!(!selected.insert_many(&urls));
} }
@ -216,9 +214,9 @@ mod tests {
#[test] #[test]
fn test_insert_many_with_remove() { fn test_insert_many_with_remove() {
let mut selected = Selected::default(); let mut selected = Selected::default();
let child1 = Url::from(Path::new("/parent/child1")); let child1 = Url::from("/parent/child1");
let child2 = Url::from(Path::new("/parent/child2")); let child2 = Url::from("/parent/child2");
let child3 = Url::from(Path::new("/parent/child3")); let child3 = Url::from("/parent/child3");
let urls = vec![&child1, &child2, &child3]; let urls = vec![&child1, &child2, &child3];
assert!(selected.insert_many(&urls)); assert!(selected.insert_many(&urls));
assert!(selected.remove(&child1)); assert!(selected.remove(&child1));