From 823e4ec91a85ea53066832ac25d4d18767e6b6d3 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Thu, 7 May 2026 22:19:10 +0800 Subject: Remove `__completion_gen` module wrapping from macro output --- mingling_macros/src/lib.rs | 29 ++++++++++++----------------- mling/src/cli.rs | 4 +--- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/mingling_macros/src/lib.rs b/mingling_macros/src/lib.rs index f4aa6cf..2624f60 100644 --- a/mingling_macros/src/lib.rs +++ b/mingling_macros/src/lib.rs @@ -909,26 +909,21 @@ pub fn program_comp_gen(input: TokenStream) -> TokenStream { }; let comp_dispatcher = quote! { - #[allow(unused)] - use __completion_gen::*; - pub mod __completion_gen { - use super::*; - - ::mingling::macros::dispatcher!(#name, "__comp", CompletionDispatcher => CompletionContext); - ::mingling::macros::pack!( - #name, - CompletionSuggest = (::mingling::ShellContext, ::mingling::Suggest) - ); + ::mingling::macros::dispatcher!(#name, "__comp", CompletionDispatcher => CompletionContext); + ::mingling::macros::pack!( + #name, + CompletionSuggest = (::mingling::ShellContext, ::mingling::Suggest) + ); - #fn_exec_comp + #fn_exec_comp - ::mingling::macros::register_type!(CompletionContext); + ::mingling::macros::register_type!(CompletionContext); - #[::mingling::macros::renderer(#name)] - pub fn __render_completion(prev: CompletionSuggest) { - let (ctx, suggest) = prev.inner; - ::mingling::CompletionHelper::render_suggest::<#name>(ctx, suggest); - } + #[allow(unused)] + #[::mingling::macros::renderer(#name)] + pub fn __render_completion(prev: CompletionSuggest) { + let (ctx, suggest) = prev.inner; + ::mingling::CompletionHelper::render_suggest::<#name>(ctx, suggest); } }; diff --git a/mling/src/cli.rs b/mling/src/cli.rs index 465d813..055f69c 100644 --- a/mling/src/cli.rs +++ b/mling/src/cli.rs @@ -3,9 +3,7 @@ use mingling::{ setup::{BasicProgramSetup, GeneralRendererSetup}, }; -use crate::{ - __completion_gen::CompletionDispatcher, DispatcherNotFound, ThisProgram, display::markdown, -}; +use crate::{CompletionDispatcher, DispatcherNotFound, ThisProgram, display::markdown}; pub mod list; pub use list::*; -- cgit