From d8c40ddfb534836030de33e4a1bb6a7778957ece Mon Sep 17 00:00:00 2001 From: sxyazi Date: Sun, 2 Jun 2024 00:28:21 +0800 Subject: [PATCH] Simplify the code --- yazi-cli/src/args.rs | 2 +- yazi-cli/src/package/parser.rs | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/yazi-cli/src/args.rs b/yazi-cli/src/args.rs index ef52dc24..c583da24 100644 --- a/yazi-cli/src/args.rs +++ b/yazi-cli/src/args.rs @@ -91,7 +91,7 @@ pub(super) struct CommandPack { /// Install all packages. #[arg(short = 'i', long)] pub(super) install: bool, - /// List all installed packages. + /// List all packages. #[arg(short = 'l', long)] pub(super) list: bool, /// Upgrade all packages. diff --git a/yazi-cli/src/package/parser.rs b/yazi-cli/src/package/parser.rs index ed4686d4..15b80b54 100644 --- a/yazi-cli/src/package/parser.rs +++ b/yazi-cli/src/package/parser.rs @@ -73,22 +73,18 @@ impl Package { }; let doc = s.parse::().context("Failed to parse package.toml")?; - let Some(deps) = doc.get(section).and_then(|d| d.get("deps")) else { return Ok(()); }; let deps = deps.as_array().context("`deps` must be an array")?; - println!("{section}s:"); - for v in deps { - if let Some(dep_name) = - v.as_inline_table().and_then(|t| t.get("use")).and_then(|v| v.as_str()) - { - println!("\t{dep_name}"); + + for dep in deps { + if let Some(Value::String(use_)) = dep.as_inline_table().and_then(|t| t.get("use")) { + println!("\t{}", use_.value()); } } - Ok(()) }