From de63da1d103defa0dad800346dce72db8633cd77 Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Fri, 7 Aug 2026 12:17:54 +0800 Subject: revert: Remove serde and structural renderer support --- mingling_cli/Cargo.lock | 3 --- mingling_cli/Cargo.toml | 1 - mingling_cli/src/linter/cmd_explain.rs | 13 ++++++------- mingling_cli/src/main.rs | 10 ++-------- 4 files changed, 8 insertions(+), 19 deletions(-) (limited to 'mingling_cli') diff --git a/mingling_cli/Cargo.lock b/mingling_cli/Cargo.lock index 60f8792..5a0dcd0 100644 --- a/mingling_cli/Cargo.lock +++ b/mingling_cli/Cargo.lock @@ -277,7 +277,6 @@ dependencies = [ "arg-picker", "mingling_core", "mingling_macros", - "serde", ] [[package]] @@ -305,8 +304,6 @@ dependencies = [ "just_template", "might_be_async", "mingling_pathf", - "serde", - "serde_json", ] [[package]] diff --git a/mingling_cli/Cargo.toml b/mingling_cli/Cargo.toml index a7a8538..137dafb 100644 --- a/mingling_cli/Cargo.toml +++ b/mingling_cli/Cargo.toml @@ -28,7 +28,6 @@ features = [ "dispatch_tree", "async", "comp", - "structural_renderer" ] [build-dependencies.mingling] diff --git a/mingling_cli/src/linter/cmd_explain.rs b/mingling_cli/src/linter/cmd_explain.rs index 0bc969a..d1758e1 100644 --- a/mingling_cli/src/linter/cmd_explain.rs +++ b/mingling_cli/src/linter/cmd_explain.rs @@ -1,14 +1,13 @@ use crate::{Next, linter::registry::ResLintRegistry}; use mingling::{ - Grouped, LazyRes, Routable, ShellContext, StructuralData, Suggest, SuggestItem, + Grouped, LazyRes, Routable, ShellContext, Suggest, SuggestItem, macros::{ - arg, buffer, chain, completion, dispatcher, metadata, pack, pack_err_structural, r_println, - renderer, routeify, + arg, buffer, chain, completion, dispatcher, metadata, pack, pack_err, r_println, renderer, + routeify, }, metadata::Description, picker::EntryPicker, }; -use serde::Serialize; dispatcher!("explain"); @@ -18,10 +17,10 @@ pub fn desc_explain() -> Description { } pack!(StateExplainLint = String); -pack_err_structural!(ErrorNoExplainLintProvided); -pack_err_structural!(ErrorNoSuchLint = String); +pack_err!(ErrorNoExplainLintProvided); +pack_err!(ErrorNoSuchLint = String); -#[derive(Debug, Default, Grouped, StructuralData, Serialize)] +#[derive(Debug, Default, Grouped)] pub struct ResultExplainLint { pub lint_name: String, pub title: String, diff --git a/mingling_cli/src/main.rs b/mingling_cli/src/main.rs index 7c71bcd..ea11b15 100644 --- a/mingling_cli/src/main.rs +++ b/mingling_cli/src/main.rs @@ -10,12 +10,9 @@ use crate::{ }; use mingling::{ ShellContext, Suggest, - consts::{HELP_FLAG, JSON_FLAG, JSON_PRETTY_FLAG}, + consts::HELP_FLAG, macros::{completion, gen_program, help, suggest}, - setup::{ - ExitCodeSetup, - picker::{HelpFlagSetup, StructuralRendererSetup}, - }, + setup::{ExitCodeSetup, picker::HelpFlagSetup}, }; pub mod diagnostic; @@ -32,7 +29,6 @@ async fn main() { let mut program = ThisProgram::new(); // Setups - program.with_setup(StructuralRendererSetup); program.with_setup(HelpFlagSetup::default()); program.with_setup(ExitCodeSetup::default()); @@ -58,8 +54,6 @@ pub fn complete_global(_ctx: &ShellContext) -> Suggest { ARG_ALL_FEATURES: "Enable all features", ARG_NO_DEFAULT_FEATURES: "Disable default features", ARG_NO_DEPS: "Do not include dependencies in metadata", - JSON_FLAG: "Render results in JSON format", - JSON_PRETTY_FLAG: "Render results in pretty JSON format" } } -- cgit