From 5fe4a4e40341aaa2b66fa1cf123d674f61d3e370 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Sat, 18 Jul 2026 06:21:52 +0800 Subject: refactor(picker): extract pick_flag helper to reduce duplication --- mingling/src/setups/picker/basic.rs | 50 ++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 20 deletions(-) (limited to 'mingling/src/setups') diff --git a/mingling/src/setups/picker/basic.rs b/mingling/src/setups/picker/basic.rs index 6a301c7..0539a09 100644 --- a/mingling/src/setups/picker/basic.rs +++ b/mingling/src/setups/picker/basic.rs @@ -3,6 +3,22 @@ use mingling_core::{Program, ProgramCollect, setup::ProgramSetup}; use crate::setups::picker::{CONFIRM_FLAG, HELP_FLAG, QUIET_FLAG}; +/// Helper: picks a boolean flag from the program arguments, calls `f` with the +/// flag value, then replaces the program arguments with the remaining args. +fn pick_flag<'a, C>( + program: &mut Program, + flag: &PickerArg<'a, Flag>, + f: impl FnOnce(bool, &mut Program), +) where + C: ProgramCollect, +{ + let args = program.take_args(); + let remains_arg = PickerArg::>::new(&[], None, true); + let (active, remains) = args.pick(flag).pick(&remains_arg).unwrap(); + f(*active, program); + program.replace_args(remains.into()); +} + /// Performs basic program initialization: /// /// - Collects `--quiet` flag to control message rendering @@ -40,11 +56,9 @@ where C: ProgramCollect, { fn setup(self, program: &mut Program) { - let args = program.take_args(); - let remains_arg = PickerArg::>::new(&[], None, true); - let (active, remains) = args.pick(self.flag).pick(&remains_arg).unwrap(); - program.user_context.help = *active; - program.replace_args(remains.into()); + pick_flag(program, self.flag, |active, ctx| { + ctx.user_context.help = active; + }); } } @@ -73,14 +87,12 @@ where C: ProgramCollect, { fn setup(self, program: &mut Program) { - let args = program.take_args(); - let remains_arg = PickerArg::>::new(&[], None, true); - let (active, remains) = args.pick(self.flag).pick(&remains_arg).unwrap(); - if *active { - program.stdout_setting.render_output = false; - program.stdout_setting.error_output = false; - } - program.replace_args(remains.into()); + pick_flag(program, self.flag, |active, ctx| { + if active { + ctx.stdout_setting.render_output = false; + ctx.stdout_setting.error_output = false; + } + }); } } @@ -109,13 +121,11 @@ where C: ProgramCollect, { fn setup(self, program: &mut Program) { - let args = program.take_args(); - let remains_arg = PickerArg::>::new(&[], None, true); - let (active, remains) = args.pick(self.flag).pick(&remains_arg).unwrap(); - if *active { - program.user_context.confirm = true; - } - program.replace_args(remains.into()); + pick_flag(program, self.flag, |active, ctx| { + if active { + ctx.user_context.confirm = true; + } + }); } } -- cgit