From 85c8986f26031cc11ed1e1da77fdf099b5814381 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Sat, 11 Jul 2026 16:10:53 +0800 Subject: style: Reorder imports and reformat code with cargo fmt --- mingling/src/lib.rs | 8 ++++---- mingling_core/src/program/collection.rs | 2 +- mingling_core/src/program/collection/mock.rs | 2 +- mingling_core/src/program/exec.rs | 8 ++------ mingling_macros/src/dispatcher_clap.rs | 3 ++- mingling_macros/src/help.rs | 4 ++-- mingling_macros/src/renderer.rs | 4 ++-- mling/src/cli.rs | 15 ++++++++++++--- mling/src/errors/io_error.rs | 2 +- mling/src/proj_mgr/generator.rs | 4 ++-- mling/src/proj_mgr/show_binaries.rs | 6 +++--- mling/src/proj_mgr/show_directories.rs | 6 +++--- 12 files changed, 35 insertions(+), 29 deletions(-) diff --git a/mingling/src/lib.rs b/mingling/src/lib.rs index 019c20d..76d73b6 100644 --- a/mingling/src/lib.rs +++ b/mingling/src/lib.rs @@ -222,6 +222,10 @@ pub mod res; /// use mingling::prelude::*; /// ``` pub mod prelude { + /// Re-export of the `Groupped` derive macro for grouping types. + pub use crate::Groupped; + /// Re-export of the `RenderResult` struct for outputting rendering result + pub use crate::RenderResult; /// Re-export of the `chain` macro for defining a chain of commands. pub use crate::macros::chain; /// Re-export of the `dispatcher` macro for routing commands. @@ -238,10 +242,6 @@ pub mod prelude { pub use crate::macros::pack_err; /// Re-export of the `renderer` macro for defining renderer functions. pub use crate::macros::renderer; - /// Re-export of the `Groupped` derive macro for grouping types. - pub use crate::Groupped; - /// Re-export of the `RenderResult` struct for outputting rendering result - pub use crate::RenderResult; /// Like `pack_err!` but also marks the type for structured output #[cfg(all(feature = "structural_renderer", feature = "extra_macros"))] pub use mingling_macros::pack_err_structural; diff --git a/mingling_core/src/program/collection.rs b/mingling_core/src/program/collection.rs index cbb9363..d5aab4b 100644 --- a/mingling_core/src/program/collection.rs +++ b/mingling_core/src/program/collection.rs @@ -7,7 +7,7 @@ use crate::Dispatcher; use crate::{AnyOutput, ChainProcess, Groupped, RenderResult}; #[cfg(feature = "structural_renderer")] -use crate::{error::StructuralRendererSerializeError, StructuralRendererSetting}; +use crate::{StructuralRendererSetting, error::StructuralRendererSerializeError}; #[cfg(feature = "comp")] use crate::{ShellContext, Suggest}; diff --git a/mingling_core/src/program/collection/mock.rs b/mingling_core/src/program/collection/mock.rs index 20e6658..9b2e7af 100644 --- a/mingling_core/src/program/collection/mock.rs +++ b/mingling_core/src/program/collection/mock.rs @@ -7,7 +7,7 @@ use crate::Dispatcher; use crate::{AnyOutput, ChainProcess, Groupped, ProgramCollect, RenderResult}; #[cfg(feature = "structural_renderer")] -use crate::{error::StructuralRendererSerializeError, StructuralRendererSetting}; +use crate::{StructuralRendererSetting, error::StructuralRendererSerializeError}; #[cfg(feature = "comp")] use crate::{ShellContext, Suggest}; diff --git a/mingling_core/src/program/exec.rs b/mingling_core/src/program/exec.rs index 3224c82..f5bdc2b 100644 --- a/mingling_core/src/program/exec.rs +++ b/mingling_core/src/program/exec.rs @@ -467,9 +467,7 @@ fn render>(program: &Program, any: AnyOutput) { #[allow(unreachable_patterns)] match program.structural_renderer_name { - super::StructuralRendererSetting::Disable => { - C::render(any) - } + super::StructuralRendererSetting::Disable => C::render(any), _ => C::structural_render(any, &program.structural_renderer_name).unwrap(), } } @@ -489,9 +487,7 @@ fn render_help>( { #[allow(unreachable_patterns)] match program.structural_renderer_name { - super::StructuralRendererSetting::Disable => { - C::render_help(entry) - } + super::StructuralRendererSetting::Disable => C::render_help(entry), _ => RenderResult::default(), } } diff --git a/mingling_macros/src/dispatcher_clap.rs b/mingling_macros/src/dispatcher_clap.rs index b89dbad..0945e31 100644 --- a/mingling_macros/src/dispatcher_clap.rs +++ b/mingling_macros/src/dispatcher_clap.rs @@ -1,8 +1,9 @@ use proc_macro::TokenStream; use quote::quote; use syn::{ + Ident, ItemStruct, LitBool, LitStr, Token, parse::{Parse, ParseStream}, - parse_macro_input, Ident, ItemStruct, LitBool, LitStr, Token, + parse_macro_input, }; /// Parsed key-value options after the first positional arguments diff --git a/mingling_macros/src/help.rs b/mingling_macros/src/help.rs index 7f5b695..1903d07 100644 --- a/mingling_macros/src/help.rs +++ b/mingling_macros/src/help.rs @@ -1,7 +1,7 @@ use proc_macro::TokenStream; -use quote::{quote, ToTokens}; +use quote::{ToTokens, quote}; use syn::spanned::Spanned; -use syn::{parse_macro_input, Ident, ItemFn, ReturnType, Type, TypePath}; +use syn::{Ident, ItemFn, ReturnType, Type, TypePath, parse_macro_input}; use crate::get_global_set; use crate::res_injection::{extract_args_info, generate_immut_resource_bindings}; diff --git a/mingling_macros/src/renderer.rs b/mingling_macros/src/renderer.rs index 9683426..f47511c 100644 --- a/mingling_macros/src/renderer.rs +++ b/mingling_macros/src/renderer.rs @@ -1,7 +1,7 @@ use proc_macro::TokenStream; -use quote::{quote, ToTokens}; +use quote::{ToTokens, quote}; use syn::spanned::Spanned; -use syn::{parse_macro_input, ItemFn, ReturnType, Signature, Type, TypePath}; +use syn::{ItemFn, ReturnType, Signature, Type, TypePath, parse_macro_input}; use crate::get_global_set; use crate::res_injection::{extract_args_info, generate_immut_resource_bindings}; diff --git a/mling/src/cli.rs b/mling/src/cli.rs index bfe602c..67d2ef0 100644 --- a/mling/src/cli.rs +++ b/mling/src/cli.rs @@ -177,10 +177,19 @@ pub fn render_mling_help(_prev: ResultMlingHelp, ec: &mut ResExitCode) -> Render #[renderer] pub fn render_unknown_command(prev: ResultUnknownCommand, ec: &mut ResExitCode) -> RenderResult { let mut result = RenderResult::default(); - writeln!(result, "{}", eformat_cargo!("no such command: `{}`", prev.bright_yellow().bold())).ok(); + writeln!( + result, + "{}", + eformat_cargo!("no such command: `{}`", prev.bright_yellow().bold()) + ) + .ok(); writeln!(result).ok(); - writeln!(result, "{}", hformat_cargo!("view all commands with `cargo help mling`")) - .ok(); + writeln!( + result, + "{}", + hformat_cargo!("view all commands with `cargo help mling`") + ) + .ok(); ec.exit_code = 101; result } diff --git a/mling/src/errors/io_error.rs b/mling/src/errors/io_error.rs index 3b6b8fb..ac503cc 100644 --- a/mling/src/errors/io_error.rs +++ b/mling/src/errors/io_error.rs @@ -1,7 +1,7 @@ use mingling::{ + RenderResult, macros::{group, renderer}, res::ResExitCode, - RenderResult, }; use std::io::Write as _; diff --git a/mling/src/proj_mgr/generator.rs b/mling/src/proj_mgr/generator.rs index e560ae0..4f965d9 100644 --- a/mling/src/proj_mgr/generator.rs +++ b/mling/src/proj_mgr/generator.rs @@ -1,12 +1,12 @@ use std::path::{self, PathBuf}; use mingling::{ - macros::{chain, pack, renderer, route}, Groupped, RenderResult, + macros::{chain, pack, renderer, route}, }; use std::io::Write as _; -use crate::{proj_mgr::EntryGenerateProject, res::ResCurrentDir, Next}; +use crate::{Next, proj_mgr::EntryGenerateProject, res::ResCurrentDir}; pack!(StateGenerateProjectReady = PathBuf); pack!(ResultGenerateProjectChecklistCreated = PathBuf); diff --git a/mling/src/proj_mgr/show_binaries.rs b/mling/src/proj_mgr/show_binaries.rs index fd2f406..9d5caf0 100644 --- a/mling/src/proj_mgr/show_binaries.rs +++ b/mling/src/proj_mgr/show_binaries.rs @@ -2,19 +2,19 @@ use std::path::PathBuf; use colored::Colorize; use mingling::{ - macros::{chain, pack, renderer}, Groupped, RenderResult, + macros::{chain, pack, renderer}, }; use serde::Serialize; use std::io::Write as _; use crate::{ + Next, proj_mgr::{ - metadata::{read_metadata, CargoLockFile}, EntryShowBinaries, + metadata::{CargoLockFile, read_metadata}, }, res::ResManifestPath, - Next, }; #[derive(Serialize, Groupped)] diff --git a/mling/src/proj_mgr/show_directories.rs b/mling/src/proj_mgr/show_directories.rs index 5bfb090..7d7c074 100644 --- a/mling/src/proj_mgr/show_directories.rs +++ b/mling/src/proj_mgr/show_directories.rs @@ -1,15 +1,15 @@ use colored::Colorize; use mingling::{ - macros::{chain, pack, renderer}, Groupped, RenderResult, + macros::{chain, pack, renderer}, }; use serde::Serialize; use std::io::Write as _; use crate::{ - proj_mgr::{metadata::read_metadata, EntryShowTargetDirectories, EntryShowWorkspaceDirectory}, - res::ResManifestPath, Next, + proj_mgr::{EntryShowTargetDirectories, EntryShowWorkspaceDirectory, metadata::read_metadata}, + res::ResManifestPath, }; #[derive(Serialize, Groupped)] -- cgit