From 7dc4dfbc673101bb2ff596e56d4a1bc9f3956763 Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Sat, 31 Aug 2024 10:57:56 +0800 Subject: [PATCH] Address review comments. --- src/dfx/src/commands/extension/list.rs | 18 +++++++----------- src/dfx/src/commands/extension/mod.rs | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/dfx/src/commands/extension/list.rs b/src/dfx/src/commands/extension/list.rs index 15e2d658d7..8ffa76127a 100644 --- a/src/dfx/src/commands/extension/list.rs +++ b/src/dfx/src/commands/extension/list.rs @@ -17,32 +17,28 @@ pub struct ListOpts { pub fn exec(env: &dyn Environment, opts: ListOpts) -> DfxResult<()> { let mgr = env.get_extension_manager(); - let extensions; - let result; if opts.available || opts.catalog_url.is_some() { let runtime = Runtime::new().expect("Unable to create a runtime"); - extensions = runtime.block_on(async { + let extensions = runtime.block_on(async { mgr.list_available_extensions(opts.catalog_url.as_ref()) .await })?; - result = display_extension_list( + display_extension_list( &extensions, "No extensions available.", "Available extensions:", - ); + ) } else { - extensions = mgr.list_installed_extensions()?; + let extensions = mgr.list_installed_extensions()?; - result = display_extension_list( + display_extension_list( &extensions, "No extensions installed.", "Installed extensions:", - ); - }; - - result + ) + } } fn display_extension_list( diff --git a/src/dfx/src/commands/extension/mod.rs b/src/dfx/src/commands/extension/mod.rs index 507cdfd452..1ed77b534b 100644 --- a/src/dfx/src/commands/extension/mod.rs +++ b/src/dfx/src/commands/extension/mod.rs @@ -24,7 +24,7 @@ pub enum SubCommand { Uninstall(uninstall::UninstallOpts), /// Execute an extension. Run(run::RunOpts), - /// List installed or remote extensions. + /// List installed or available extensions. List(list::ListOpts), }