diff options
| author | 魏曹先生 <1992414357@qq.com> | 2026-08-08 12:22:30 +0800 |
|---|---|---|
| committer | 魏曹先生 <1992414357@qq.com> | 2026-08-08 12:22:30 +0800 |
| commit | 59ceb7f3e2e248a666902f34a21b873566811cce (patch) | |
| tree | 217be47cbc2e26522a7d81007b482a6a57826747 /mingling_cli/src/pkg_mgr | |
| parent | 5d3eb197ca2b2fa59a4bfc24bf790a5e1bfdeb98 (diff) | |
refactor: migrate renderers to RenderResult and stdout macros
Replace buffer-based renderers with explicit RenderResult returns and
use cargo-styled output macros for consistency.
Diffstat (limited to 'mingling_cli/src/pkg_mgr')
| -rw-r--r-- | mingling_cli/src/pkg_mgr/cmd_install.rs | 35 | ||||
| -rw-r--r-- | mingling_cli/src/pkg_mgr/cmd_pkg_disable.rs | 26 | ||||
| -rw-r--r-- | mingling_cli/src/pkg_mgr/cmd_pkg_enable.rs | 25 |
3 files changed, 51 insertions, 35 deletions
diff --git a/mingling_cli/src/pkg_mgr/cmd_install.rs b/mingling_cli/src/pkg_mgr/cmd_install.rs index a399e83..c84f6e2 100644 --- a/mingling_cli/src/pkg_mgr/cmd_install.rs +++ b/mingling_cli/src/pkg_mgr/cmd_install.rs @@ -2,15 +2,16 @@ use std::{env, fs, io, path::PathBuf, process::Command}; use cargo_metadata::TargetKind; use mingling::{ - Grouped, LazyRes, Routable, - macros::{buffer, chain, command, metadata, pack_err, r_println, renderer, routeify}, + Grouped, LazyRes, RenderResult, Routable, + macros::{chain, command, metadata, pack_err, r_println, renderer, routeify}, metadata::Description, }; use crate::{ - Next, + Next, eprintln_cargo, metadata::setup::ResMetadata, pkg_mgr::{ErrorNoDataDirectory, ErrorRootPackageNotFound, ResPackagesDir}, + println_cargo, }; pack_err!(ErrorBuildFailed = String); @@ -159,20 +160,26 @@ pub fn handle_state_install_copy( .to_chain() } -#[renderer(buffer)] -pub fn render_result_install(r: ResultInstall) { - r_println!("Installed to {}", r.install_dir.display()); - for file in r.installed { - r_println!(" {}", file.display()); +#[renderer] +pub fn render_result_install(result: ResultInstall) -> RenderResult { + let mut r = RenderResult::new(); + println_cargo!(r, "Installed: {}", result.install_dir.display()); + for file in result.installed { + r_println!(r, " {}", file.display()); } + r } -#[renderer(buffer)] -pub fn render_error_build_failed(err: ErrorBuildFailed) { - r_println!("error: {}", err.info); +#[renderer] +pub fn render_error_build_failed(err: ErrorBuildFailed) -> RenderResult { + let mut r = RenderResult::new(); + eprintln_cargo!(r, "{}", err.info); + r } -#[renderer(buffer)] -pub fn render_error_binary_not_found(err: ErrorBinaryNotFound) { - r_println!("error: binary not found: {}", err.info); +#[renderer] +pub fn render_error_binary_not_found(err: ErrorBinaryNotFound) -> RenderResult { + let mut r = RenderResult::new(); + eprintln_cargo!(r, "binary not found: {}", err.info); + r } diff --git a/mingling_cli/src/pkg_mgr/cmd_pkg_disable.rs b/mingling_cli/src/pkg_mgr/cmd_pkg_disable.rs index 679421c..041bb09 100644 --- a/mingling_cli/src/pkg_mgr/cmd_pkg_disable.rs +++ b/mingling_cli/src/pkg_mgr/cmd_pkg_disable.rs @@ -1,20 +1,18 @@ use std::{fs, io}; use mingling::{ - Grouped, Routable, ShellContext, Suggest, SuggestItem, - macros::{ - arg, buffer, chain, command, completion, metadata, pack, pack_err, r_println, renderer, - routeify, - }, + Grouped, RenderResult, Routable, ShellContext, Suggest, SuggestItem, + macros::{arg, chain, command, completion, metadata, pack, pack_err, renderer, routeify}, metadata::Description, picker::{EntryPicker, PickerArg}, }; use crate::{ - Next, + Next, eprintln_cargo, pkg_mgr::{ ErrorNoDataDirectory, ErrorPackageNameRequired, ErrorPackageSpecInvalid, ResPackagesDir, }, + println_cargo, }; /// Positional argument: package name @@ -78,14 +76,18 @@ pub fn handle_state_pkg_disable(p: StatePkgDisable, packages_dir: &ResPackagesDi .to_chain() } -#[renderer(buffer)] -pub fn render_result_pkg_disable(r: ResultPkgDisable) { - r_println!("Disabled {}", r.name); +#[renderer] +pub fn render_result_pkg_disable(result: ResultPkgDisable) -> RenderResult { + let mut r = RenderResult::new(); + println_cargo!(r, "Disabled: {}", result.name); + r } -#[renderer(buffer)] -pub fn render_error_package_not_enabled(err: ErrorPackageNotEnabled) { - r_println!("error: package is not enabled: {}", err.info); +#[renderer] +pub fn render_error_package_not_enabled(err: ErrorPackageNotEnabled) -> RenderResult { + let mut r = RenderResult::new(); + eprintln_cargo!(r, "package is not enabled: {}", err.info); + r } #[completion(EntryPkgDisable)] diff --git a/mingling_cli/src/pkg_mgr/cmd_pkg_enable.rs b/mingling_cli/src/pkg_mgr/cmd_pkg_enable.rs index b545a4d..8f6a234 100644 --- a/mingling_cli/src/pkg_mgr/cmd_pkg_enable.rs +++ b/mingling_cli/src/pkg_mgr/cmd_pkg_enable.rs @@ -1,20 +1,18 @@ use std::{fs, io}; use mingling::{ - Grouped, Routable, ShellContext, Suggest, SuggestItem, - macros::{ - arg, buffer, chain, command, completion, metadata, pack, pack_err, r_println, renderer, - routeify, - }, + Grouped, RenderResult, Routable, ShellContext, Suggest, SuggestItem, + macros::{arg, chain, command, completion, metadata, pack, pack_err, renderer, routeify}, metadata::Description, picker::{EntryPicker, PickerArg}, }; use crate::{ - Next, + Next, eprintln_cargo, pkg_mgr::{ ErrorNoDataDirectory, ErrorPackageNameRequired, ErrorPackageSpecInvalid, ResPackagesDir, }, + println_cargo, }; /// Positional argument: package spec (`foo`, `foo@0`, `foo@0.1`, `foo@0.1.2`) @@ -102,9 +100,18 @@ pub fn handle_state_pkg_enable(p: StatePkgEnable, packages_dir: &ResPackagesDir) ResultPkgEnable { name, version }.to_chain() } -#[renderer(buffer)] -pub fn render_result_pkg_enable(r: ResultPkgEnable) { - r_println!("Enabled {}@{}", r.name, r.version); +#[renderer] +pub fn render_result_pkg_enable(result: ResultPkgEnable) -> RenderResult { + let mut r = RenderResult::new(); + println_cargo!(r, "Enabled: {}@{}", result.name, result.version); + r +} + +#[renderer] +pub fn render_error_no_matching_version(err: ErrorNoMatchingVersion) -> RenderResult { + let mut r = RenderResult::new(); + eprintln_cargo!(r, "no matching version for: {}", err.info); + r } #[completion(EntryPkgEnable)] |
