From 07bf5bb372fc94f346b039ad9eecfb64c8a1ff46 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Mon, 29 Jun 2026 04:27:39 +0800 Subject: feat(mling): enable pathf feature and run type mapping build Add the `pathf` feature to mingling dependency and invoke `analyze_and_build_type_mapping` during the build script. Reorganize internal module visibility from `mod + pub use` to direct `pub mod`. --- mling/src/cli.rs | 8 ++++---- mling/src/lib.rs | 19 +++++-------------- mling/src/pkg_mgr/mod.rs | 3 +-- mling/src/proj_mgr/mod.rs | 16 ++++------------ mling/src/proj_mgr/show_binaries.rs | 7 +++++-- mling/src/proj_mgr/show_directories.rs | 4 ++-- 6 files changed, 21 insertions(+), 36 deletions(-) (limited to 'mling/src') diff --git a/mling/src/cli.rs b/mling/src/cli.rs index 01a836a..3000645 100644 --- a/mling/src/cli.rs +++ b/mling/src/cli.rs @@ -1,9 +1,9 @@ use crate::{ - CMDCompletion, ErrorDispatcherNotFound, Next, PackageManagerSetup, ProjectManagerSetup, - ThisProgram, + CMDCompletion, ErrorDispatcherNotFound, Next, ThisProgram, display::markdown, eformat_cargo, eprintln_cargo, hformat_cargo, - pkg_mgr::{CMDInstall, CMDListNamespace, CMDRemoveNamespace}, + pkg_mgr::{CMDInstall, CMDListNamespace, CMDRemoveNamespace, PackageManagerSetup}, + proj_mgr::ProjectManagerSetup, res::{ResCurrentDir, ResManifestPath}, }; use colored::Colorize; @@ -12,7 +12,7 @@ use mingling::{ hook::ProgramHook, macros::{chain, help, pack, program_setup, r_println, renderer}, res::ResExitCode, - setup::{ExitCodeSetup, StructuralRendererSetup, HelpFlagSetup, QuietFlagSetup}, + setup::{ExitCodeSetup, HelpFlagSetup, QuietFlagSetup, StructuralRendererSetup}, }; use std::{env::current_dir, path::PathBuf, process::exit, str::FromStr}; diff --git a/mling/src/lib.rs b/mling/src/lib.rs index 0e122f3..1bf38a7 100644 --- a/mling/src/lib.rs +++ b/mling/src/lib.rs @@ -5,23 +5,14 @@ use mingling::{ res::ResExitCode, }; -pub mod cli; -pub use cli::*; - mod cargo_style; pub use cargo_style::*; + +pub mod cli; pub mod display; +pub mod errors; +pub mod pkg_mgr; +pub mod proj_mgr; pub mod res; -mod pkg_mgr; -pub use pkg_mgr::*; - -mod proj_mgr; -pub use proj_mgr::*; - -mod errors; -pub use errors::*; - -use crate::display::markdown; - gen_program!(); diff --git a/mling/src/pkg_mgr/mod.rs b/mling/src/pkg_mgr/mod.rs index 030529e..682b433 100644 --- a/mling/src/pkg_mgr/mod.rs +++ b/mling/src/pkg_mgr/mod.rs @@ -4,8 +4,7 @@ use mingling::{ macros::{dispatcher, program_setup}, }; -mod installer; -pub use installer::*; +pub mod installer; dispatcher!("install"); dispatcher!("ls.namespace", CMDListNamespace => EntryListNamespace); diff --git a/mling/src/proj_mgr/mod.rs b/mling/src/proj_mgr/mod.rs index d0c4cbf..e0a4216 100644 --- a/mling/src/proj_mgr/mod.rs +++ b/mling/src/proj_mgr/mod.rs @@ -4,19 +4,11 @@ use mingling::{ macros::{dispatcher, program_setup}, }; -mod generator; -pub use generator::*; - +pub mod checklist_reader; +pub mod generator; pub mod metadata; - -mod checklist_reader; -pub use checklist_reader::*; - -mod show_binaries; -pub use show_binaries::*; - -mod show_directories; -pub use show_directories::*; +pub mod show_binaries; +pub mod show_directories; dispatcher!("gen", CMDGenerateProject => EntryGenerateProject); diff --git a/mling/src/proj_mgr/show_binaries.rs b/mling/src/proj_mgr/show_binaries.rs index 384d8a4..d6872cf 100644 --- a/mling/src/proj_mgr/show_binaries.rs +++ b/mling/src/proj_mgr/show_binaries.rs @@ -8,8 +8,11 @@ use mingling::{ use serde::Serialize; use crate::{ - EntryShowBinaries, Next, - metadata::{CargoLockFile, read_metadata}, + Next, + proj_mgr::{ + EntryShowBinaries, + metadata::{CargoLockFile, read_metadata}, + }, res::ResManifestPath, }; diff --git a/mling/src/proj_mgr/show_directories.rs b/mling/src/proj_mgr/show_directories.rs index 32020c9..6a20eee 100644 --- a/mling/src/proj_mgr/show_directories.rs +++ b/mling/src/proj_mgr/show_directories.rs @@ -6,8 +6,8 @@ use mingling::{ use serde::Serialize; use crate::{ - EntryShowTargetDirectories, EntryShowWorkspaceDirectory, Next, metadata::read_metadata, - res::ResManifestPath, + EntryShowTargetDirectories, EntryShowWorkspaceDirectory, Next, + proj_mgr::metadata::read_metadata, res::ResManifestPath, }; #[derive(Serialize, Groupped)] -- cgit