From 57c53affe3542cb6bd4e79ee4c18f20a1bd76b2d Mon Sep 17 00:00:00 2001 From: 魏曹先生 <1992414357@qq.com> Date: Mon, 17 Aug 2026 05:49:19 +0800 Subject: refactor!: replace pack! macros with derive-based pipeline types Remove the `pack!`, `pack_err!`, `pack_structural!`, and `pack_err_structural!` macros, replacing all pipeline type definitions with `#[derive(Grouped)]` and `#[derive(Grouped, Wrap)]` attributes. This changes the generated struct shape from named-field structs with an `inner` field to tuple structs accessed via `.0`, and removes the auto-generated `name` and `info` fields from error types. --- mingling_cli/src/pkg_mgr/cmd_pkg_show.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'mingling_cli/src/pkg_mgr/cmd_pkg_show.rs') diff --git a/mingling_cli/src/pkg_mgr/cmd_pkg_show.rs b/mingling_cli/src/pkg_mgr/cmd_pkg_show.rs index 88c79ef..ea26021 100644 --- a/mingling_cli/src/pkg_mgr/cmd_pkg_show.rs +++ b/mingling_cli/src/pkg_mgr/cmd_pkg_show.rs @@ -3,7 +3,7 @@ use std::{collections::BTreeMap, fs, io}; use colored::Colorize; use mingling::{ Grouped, RenderResult, Routable, - macros::{buffer, command, metadata, pack_err, r_println, renderer, routeify}, + macros::{buffer, command, metadata, r_println, renderer, routeify}, metadata::Description, }; @@ -15,8 +15,10 @@ use crate::{ #[derive(Debug, Default, Clone)] pub struct PkgShowEntry { pub name: String, + /// Enabled version, from the content of the enable file. pub enabled: Option, + /// Installed versions, newest first. pub versions: Vec, } @@ -31,13 +33,14 @@ pub fn desc_pkg_show() -> Description { "Show locally installed packages".into() } -pack_err!(ErrorNoPackagesInstalled); +#[derive(Grouped, Default)] +pub struct ErrorNoPackagesInstalled; #[command(node = "pkg-show", routeify)] pub fn package_show(packages_dir: &ResPackagesDir) -> Next { let packages_dir = &packages_dir.path; if packages_dir.as_os_str().is_empty() { - return ErrorNoDataDirectory::default().to_chain(); + return ErrorNoDataDirectory.to_chain(); } let mut entries: BTreeMap = BTreeMap::new(); @@ -84,7 +87,7 @@ pub fn package_show(packages_dir: &ResPackagesDir) -> Next { let packages: Vec = entries.into_values().collect(); if packages.is_empty() { - return ErrorNoPackagesInstalled::default().into(); + return ErrorNoPackagesInstalled.into(); } ResultPkgShow { packages }.to_chain() -- cgit