refactor: simplify module exports

Cargo.toml

@@ -15,7 +15,7 @@ anyhow        = "1.0.89"
 arc-swap      = "1.7.1"
 base64        = "0.22.1"
 bitflags      = "2.6.0"
-clap          = { version = "4.5.19", features = [ "derive" ] }
+clap          = { version = "4.5.20", features = [ "derive" ] }
 crossterm     = { version = "0.28.1", features = [ "event-stream" ] }
 dirs          = "5.0.1"
 futures       = "0.3.31"

cspell.json

@@ -1 +1 @@
-{"language":"en","words":["Punct","KEYMAP","splitn","crossterm","YAZI","unar","peekable","ratatui","syntect","pbpaste","pbcopy","ffmpegthumbnailer","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","nvim","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","️ Überzug","️ Überzug","Konsole","Alacritty","Überzug","pkgs","paru","unarchiver","pdftoppm","poppler","prebuild","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","imagesize","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen"],"version":"0.2","flagWords":[]}
+{"words":["Punct","KEYMAP","splitn","crossterm","YAZI","unar","peekable","ratatui","syntect","pbpaste","pbcopy","ffmpegthumbnailer","oneshot","Posix","Lsar","XADDOS","zoxide","cands","Deque","precache","imageops","IFBLK","IFCHR","IFDIR","IFIFO","IFLNK","IFMT","IFSOCK","IRGRP","IROTH","IRUSR","ISGID","ISUID","ISVTX","IWGRP","IWOTH","IWUSR","IXGRP","IXOTH","IXUSR","libc","winsize","TIOCGWINSZ","xpixel","ypixel","ioerr","appender","Catppuccin","macchiato","gitmodules","Dotfiles","bashprofile","vimrc","flac","webp","exiftool","mediainfo","ripgrep","nvim","indexmap","indexmap","unwatch","canonicalize","serde","fsevent","Ueberzug","iterm","wezterm","sixel","chafa","ueberzugpp","️ Überzug","️ Überzug","Konsole","Alacritty","Überzug","pkgs","paru","unarchiver","pdftoppm","poppler","prebuild","singlefile","jpegopt","EXIF","rustfmt","mktemp","nanos","xclip","xsel","natord","Mintty","nixos","nixpkgs","SIGTSTP","SIGCONT","SIGCONT","mlua","nonstatic","userdata","metatable","natsort","backstack","luajit","Succ","Succ","cand","fileencoding","foldmethod","lightgreen","darkgray","lightred","lightyellow","lightcyan","nushell","msvc","aarch","linemode","sxyazi","rsplit","ZELLIJ","bitflags","bitflags","USERPROFILE","Neovim","vergen","gitcl","Renderable","preloaders","prec","imagesize","Upserting","prio","Ghostty","Catmull","Lanczos","cmds","unyank","scrolloff","headsup","unsub","uzers","scopeguard","SPDLOG","globset","filetime","magick","magick","prefetcher","Prework","prefetchers","PREWORKERS","conds","translit","rxvt","Urxvt","realpath","realname","REPARSE","hardlink","hardlinking","nlink","nlink","linemodes","SIGSTOP","sevenzip","rsplitn","replacen","DECSET","DECRQM","repeek","cwds","tcsi","Hyprland","Wayfire","SWAYSOCK","btime","nsec","codegen","gethostname"],"flagWords":[],"version":"0.2","language":"en"}

yazi-adapter/Cargo.toml

@@ -10,6 +10,7 @@ repository  = "https://github.com/sxyazi/yazi"
 
 [dependencies]
 yazi-config = { path = "../yazi-config", version = "0.3.3" }
+yazi-macro  = { path = "../yazi-macro", version = "0.3.3" }
 yazi-shared = { path = "../yazi-shared", version = "0.3.3" }
 
 # External dependencies

yazi-adapter/src/lib.rs

@@ -1,31 +1,10 @@
 #![allow(clippy::unit_arg)]
 
-mod adapter;
-mod chafa;
-mod dimension;
-mod emulator;
-mod iip;
-mod image;
-mod kgp;
-mod kgp_old;
-mod mux;
-mod sixel;
-mod ueberzug;
+yazi_macro::mod_flat!(
+	adapter, chafa, dimension, emulator, iip, image, kgp, kgp_old, mux, sixel, ueberzug
+);
 
-pub use adapter::*;
-use chafa::*;
-pub use dimension::*;
-pub use emulator::*;
-use iip::*;
-use kgp::*;
-use kgp_old::*;
-pub use mux::*;
-use sixel::*;
-use ueberzug::*;
 use yazi_shared::{RoCell, env_exists, in_wsl};
-
-pub use crate::image::*;
-
 pub static ADAPTOR: RoCell<Adapter> = RoCell::new();
 
 // Tmux support

yazi-boot/Cargo.toml

@@ -9,18 +9,19 @@ homepage    = "https://yazi-rs.github.io"
 repository  = "https://github.com/sxyazi/yazi"
 
 [dependencies]
-regex        = { workspace = true }
 yazi-adapter = { path = "../yazi-adapter", version = "0.3.3" }
 yazi-config  = { path = "../yazi-config", version = "0.3.3" }
+yazi-macro   = { path = "../yazi-macro", version = "0.3.3" }
 yazi-shared  = { path = "../yazi-shared", version = "0.3.3" }
 
 # External dependencies
 clap  = { workspace = true }
+regex = { workspace = true }
 serde = { workspace = true }
 
 [build-dependencies]
 clap                  = { workspace = true }
-clap_complete         = "4.5.32"
+clap_complete         = "4.5.33"
 clap_complete_fig     = "4.5.2"
-clap_complete_nushell = "4.5.3"
+clap_complete_nushell = "4.5.4"
 vergen-gitcl          = { version = "1.0.1", features = [ "build" ] }

yazi-boot/src/actions/mod.rs

@@ -1,8 +1,3 @@
 #![allow(clippy::module_inception)]
 
-mod actions;
-mod clear_cache;
-mod debug;
-mod version;
-
-pub(super) use actions::*;
+yazi_macro::mod_flat!(actions, clear_cache, debug, version);

yazi-boot/src/lib.rs

@@ -1,12 +1,9 @@
-use clap::Parser;
-use yazi_shared::RoCell;
+yazi_macro::mod_pub!(actions);
 
-mod actions;
-mod args;
-mod boot;
+yazi_macro::mod_flat!(args, boot);
 
-pub use args::*;
-pub use boot::*;
+use clap::Parser;
+use yazi_shared::RoCell;
 
 pub static ARGS: RoCell<Args> = RoCell::new();
 pub static BOOT: RoCell<Boot> = RoCell::new();

yazi-cli/Cargo.toml

@@ -11,6 +11,7 @@ repository  = "https://github.com/sxyazi/yazi"
 [dependencies]
 yazi-boot   = { path = "../yazi-boot", version = "0.3.3" }
 yazi-dds    = { path = "../yazi-dds", version = "0.3.3" }
+yazi-macro  = { path = "../yazi-macro", version = "0.3.3" }
 yazi-shared = { path = "../yazi-shared", version = "0.3.3" }
 
 # External dependencies
@@ -26,9 +27,9 @@ toml_edit  = "0.22.22"
 # External build dependencies
 anyhow                = { workspace = true }
 clap                  = { workspace = true }
-clap_complete         = "4.5.32"
+clap_complete         = "4.5.33"
 clap_complete_fig     = "4.5.2"
-clap_complete_nushell = "4.5.3"
+clap_complete_nushell = "4.5.4"
 serde_json            = { workspace = true }
 vergen-gitcl          = { version = "1.0.1", features = [ "build" ] }