From e77fa7a804f338a9d0361142daecb5f7d4229c53 Mon Sep 17 00:00:00 2001
From: sxyazi <sxyazi@gmail.com>
Date: Mon, 27 Nov 2023 12:46:55 +0800
Subject: [PATCH] ..

---
 yazi-config/src/boot/boot.rs         | 2 +-
 yazi-config/src/plugins/plugins.rs   | 2 +-
 yazi-config/src/preview/preview.rs   | 2 +-
 yazi-config/src/theme/theme.rs       | 2 +-
 yazi-config/src/xdg.rs               | 2 +-
 yazi-core/src/tab/commands/cd.rs     | 2 +-
 yazi-core/src/tab/commands/jump.rs   | 2 +-
 yazi-core/src/tab/commands/reveal.rs | 2 +-
 yazi-core/src/tasks/scheduler.rs     | 2 +-
 yazi-core/src/tasks/workers/file.rs  | 2 +-
 yazi-shared/src/{fns.rs => env.rs}   | 0
 yazi-shared/src/fs/{fs.rs => fns.rs} | 0
 yazi-shared/src/fs/mod.rs            | 6 ++++--
 yazi-shared/src/{ => fs}/path.rs     | 0
 yazi-shared/src/lib.rs               | 6 ++----
 15 files changed, 16 insertions(+), 16 deletions(-)
 rename yazi-shared/src/{fns.rs => env.rs} (100%)
 rename yazi-shared/src/fs/{fs.rs => fns.rs} (100%)
 rename yazi-shared/src/{ => fs}/path.rs (100%)

diff --git a/yazi-config/src/boot/boot.rs b/yazi-config/src/boot/boot.rs
index 9b025da6..60c64e0b 100644
--- a/yazi-config/src/boot/boot.rs
+++ b/yazi-config/src/boot/boot.rs
@@ -1,7 +1,7 @@
 use std::{ffi::OsString, fs, path::PathBuf, process};
 
 use clap::Parser;
-use yazi_shared::{current_cwd, expand_path};
+use yazi_shared::fs::{current_cwd, expand_path};
 
 use super::cli::Args;
 use crate::{Xdg, PREVIEW};
diff --git a/yazi-config/src/plugins/plugins.rs b/yazi-config/src/plugins/plugins.rs
index 1ff217a2..b2b95a78 100644
--- a/yazi-config/src/plugins/plugins.rs
+++ b/yazi-config/src/plugins/plugins.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use serde::Deserialize;
 use validator::Validate;
-use yazi_shared::expand_path;
+use yazi_shared::fs::expand_path;
 
 use crate::MERGED_YAZI;
 
diff --git a/yazi-config/src/preview/preview.rs b/yazi-config/src/preview/preview.rs
index fd83cc3d..d22aa078 100644
--- a/yazi-config/src/preview/preview.rs
+++ b/yazi-config/src/preview/preview.rs
@@ -2,7 +2,7 @@ use std::{path::{Path, PathBuf}, time::{self, SystemTime}};
 
 use md5::{Digest, Md5};
 use serde::Deserialize;
-use yazi_shared::expand_path;
+use yazi_shared::fs::expand_path;
 
 use crate::{xdg::Xdg, MERGED_YAZI};
 
diff --git a/yazi-config/src/theme/theme.rs b/yazi-config/src/theme/theme.rs
index 80d4f02c..ae5cfa75 100644
--- a/yazi-config/src/theme/theme.rs
+++ b/yazi-config/src/theme/theme.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
 use validator::Validate;
-use yazi_shared::expand_path;
+use yazi_shared::fs::expand_path;
 
 use super::{Filetype, Icon, Style};
 use crate::{validation::check_validation, MERGED_THEME};
diff --git a/yazi-config/src/xdg.rs b/yazi-config/src/xdg.rs
index bfeabfd9..d17e3409 100644
--- a/yazi-config/src/xdg.rs
+++ b/yazi-config/src/xdg.rs
@@ -1,6 +1,6 @@
 use std::{env, path::PathBuf};
 
-use yazi_shared::expand_path;
+use yazi_shared::fs::expand_path;
 
 pub(super) struct Xdg;
 
diff --git a/yazi-core/src/tab/commands/cd.rs b/yazi-core/src/tab/commands/cd.rs
index b4c30cf2..b0b8c0fe 100644
--- a/yazi-core/src/tab/commands/cd.rs
+++ b/yazi-core/src/tab/commands/cd.rs
@@ -3,7 +3,7 @@ use std::{mem, time::Duration};
 use tokio::{fs, pin};
 use tokio_stream::{wrappers::UnboundedReceiverStream, StreamExt};
 use yazi_config::{keymap::{Exec, KeymapLayer}, popup::InputOpt};
-use yazi_shared::{expand_path, fs::Url, Debounce, InputError};
+use yazi_shared::{fs::{expand_path, Url}, Debounce, InputError};
 
 use crate::{completion::Completion, emit, manager::Manager, tab::Tab};
 
diff --git a/yazi-core/src/tab/commands/jump.rs b/yazi-core/src/tab/commands/jump.rs
index e69314cb..66b309f4 100644
--- a/yazi-core/src/tab/commands/jump.rs
+++ b/yazi-core/src/tab/commands/jump.rs
@@ -1,5 +1,5 @@
 use yazi_config::keymap::Exec;
-use yazi_shared::{ends_with_slash, Defer};
+use yazi_shared::{fs::ends_with_slash, Defer};
 
 use crate::{emit, external::{self, FzfOpt, ZoxideOpt}, tab::Tab, Event, BLOCKER};
 
diff --git a/yazi-core/src/tab/commands/reveal.rs b/yazi-core/src/tab/commands/reveal.rs
index e1ba2e42..862f06de 100644
--- a/yazi-core/src/tab/commands/reveal.rs
+++ b/yazi-core/src/tab/commands/reveal.rs
@@ -1,5 +1,5 @@
 use yazi_config::keymap::{Exec, KeymapLayer};
-use yazi_shared::{expand_path, fs::Url};
+use yazi_shared::fs::{expand_path, Url};
 
 use crate::{emit, files::{File, FilesOp}, manager::Manager, tab::Tab};
 
diff --git a/yazi-core/src/tasks/scheduler.rs b/yazi-core/src/tasks/scheduler.rs
index 3f7d70f7..ee66b710 100644
--- a/yazi-core/src/tasks/scheduler.rs
+++ b/yazi-core/src/tasks/scheduler.rs
@@ -4,7 +4,7 @@ use futures::{future::BoxFuture, FutureExt};
 use parking_lot::RwLock;
 use tokio::{fs, select, sync::{mpsc::{self, UnboundedReceiver}, oneshot}, time::sleep};
 use yazi_config::{open::Opener, TASKS};
-use yazi_shared::{fs::Url, unique_path, Throttle};
+use yazi_shared::{fs::{unique_path, Url}, Throttle};
 
 use super::{workers::{File, FileOpDelete, FileOpLink, FileOpPaste, FileOpTrash, Precache, PrecacheOpMime, PrecacheOpSize, Process, ProcessOpOpen}, Running, TaskOp, TaskStage, TasksProgress};
 use crate::emit;
diff --git a/yazi-core/src/tasks/workers/file.rs b/yazi-core/src/tasks/workers/file.rs
index ba3a181a..56ae4d58 100644
--- a/yazi-core/src/tasks/workers/file.rs
+++ b/yazi-core/src/tasks/workers/file.rs
@@ -5,7 +5,7 @@ use futures::{future::BoxFuture, FutureExt};
 use tokio::{fs, io::{self, ErrorKind::{AlreadyExists, NotFound}}, sync::mpsc};
 use tracing::warn;
 use yazi_config::TASKS;
-use yazi_shared::{fs::{calculate_size, copy_with_progress, Url}, path_relative_to};
+use yazi_shared::fs::{calculate_size, copy_with_progress, path_relative_to, Url};
 
 use crate::tasks::TaskOp;
 
diff --git a/yazi-shared/src/fns.rs b/yazi-shared/src/env.rs
similarity index 100%
rename from yazi-shared/src/fns.rs
rename to yazi-shared/src/env.rs
diff --git a/yazi-shared/src/fs/fs.rs b/yazi-shared/src/fs/fns.rs
similarity index 100%
rename from yazi-shared/src/fs/fs.rs
rename to yazi-shared/src/fs/fns.rs
diff --git a/yazi-shared/src/fs/mod.rs b/yazi-shared/src/fs/mod.rs
index cb9c23e3..685326a8 100644
--- a/yazi-shared/src/fs/mod.rs
+++ b/yazi-shared/src/fs/mod.rs
@@ -1,7 +1,9 @@
 mod cha;
-mod fs;
+mod fns;
+mod path;
 mod url;
 
 pub use cha::*;
-pub use fs::*;
+pub use fns::*;
+pub use path::*;
 pub use url::*;
diff --git a/yazi-shared/src/path.rs b/yazi-shared/src/fs/path.rs
similarity index 100%
rename from yazi-shared/src/path.rs
rename to yazi-shared/src/fs/path.rs
diff --git a/yazi-shared/src/lib.rs b/yazi-shared/src/lib.rs
index 344db02b..69d96729 100644
--- a/yazi-shared/src/lib.rs
+++ b/yazi-shared/src/lib.rs
@@ -3,12 +3,11 @@
 mod chars;
 mod debounce;
 mod defer;
+mod env;
 mod errors;
-mod fns;
 pub mod fs;
 mod mime;
 mod natsort;
-mod path;
 mod ro_cell;
 pub mod term;
 mod throttle;
@@ -17,11 +16,10 @@ mod time;
 pub use chars::*;
 pub use debounce::*;
 pub use defer::*;
+pub use env::*;
 pub use errors::*;
-pub use fns::*;
 pub use mime::*;
 pub use natsort::*;
-pub use path::*;
 pub use ro_cell::*;
 pub use throttle::*;
 pub use time::*;