From d4634b01e3f33b3ee52b1501f5ade739a1796d08 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Sat, 25 Apr 2026 19:02:17 +0800 Subject: Remove redundant generic parameter from Program struct --- mingling_core/src/program/setup/basic.rs | 7 ++----- mingling_core/src/program/setup/general_renderer.rs | 12 ++++-------- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'mingling_core/src/program/setup') diff --git a/mingling_core/src/program/setup/basic.rs b/mingling_core/src/program/setup/basic.rs index 8316a33..43c14b9 100644 --- a/mingling_core/src/program/setup/basic.rs +++ b/mingling_core/src/program/setup/basic.rs @@ -1,5 +1,3 @@ -use std::fmt::Display; - use crate::{ ProgramCollect, program::{Program, setup::ProgramSetup}, @@ -12,12 +10,11 @@ use crate::{ /// - Collects `--confirm` flag to skip user confirmation pub struct BasicProgramSetup; -impl ProgramSetup for BasicProgramSetup +impl ProgramSetup for BasicProgramSetup where C: ProgramCollect, - G: Display, { - fn setup(&mut self, program: &mut Program) { + fn setup(&mut self, program: &mut Program) { program.global_flag(["--quiet", "-q"], |p| { p.stdout_setting.render_output = false; p.stdout_setting.error_output = false; diff --git a/mingling_core/src/program/setup/general_renderer.rs b/mingling_core/src/program/setup/general_renderer.rs index 035f813..2d2ee79 100644 --- a/mingling_core/src/program/setup/general_renderer.rs +++ b/mingling_core/src/program/setup/general_renderer.rs @@ -1,5 +1,3 @@ -use std::fmt::Display; - use crate::{ ProgramCollect, program::{Program, setup::ProgramSetup}, @@ -10,12 +8,11 @@ use crate::{ /// - Adds a `--renderer` global argument to specify the renderer type pub struct GeneralRendererSimpleSetup; -impl ProgramSetup for GeneralRendererSimpleSetup +impl ProgramSetup for GeneralRendererSimpleSetup where C: ProgramCollect, - G: Display, { - fn setup(&mut self, program: &mut Program) { + fn setup(&mut self, program: &mut Program) { program.global_argument("--renderer", |p, renderer| { p.general_renderer_name = renderer.into(); }); @@ -33,12 +30,11 @@ where /// * `--ron-pretty` for pretty-printed RON output pub struct GeneralRendererSetup; -impl ProgramSetup for GeneralRendererSetup +impl ProgramSetup for GeneralRendererSetup where C: ProgramCollect, - G: Display, { - fn setup(&mut self, program: &mut Program) { + fn setup(&mut self, program: &mut Program) { program.global_flag("--json", |p| { p.general_renderer_name = crate::GeneralRendererSetting::Json }); -- cgit