From b36250344a8ef171bdd489d8b106ca325dbd32c7 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 6 Apr 2017 17:28:49 -0700 Subject: Use switch-case --- toolsrc/src/commands_remove.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'toolsrc/src/commands_remove.cpp') diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index f5689067d..2e6807575 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -116,19 +116,17 @@ namespace vcpkg::Commands::Remove for (const PackageSpecWithRemovePlan& i : plan) { - if (i.plan.plan_type == RemovePlanType::NOT_INSTALLED) + switch (i.plan.plan_type) { - not_installed.push_back(&i); - continue; - } - - if (i.plan.plan_type == RemovePlanType::REMOVE) - { - remove.push_back(&i); - continue; + case RemovePlanType::NOT_INSTALLED: + not_installed.push_back(&i); + continue; + case RemovePlanType::REMOVE: + remove.push_back(&i); + continue; + default: + Checks::unreachable(VCPKG_LINE_INFO); } - - Checks::unreachable(VCPKG_LINE_INFO); } if (!not_installed.empty()) @@ -147,12 +145,12 @@ namespace vcpkg::Commands::Remove System::println("The following packages will be removed:\n%s", Strings::join("\n", remove, [](const PackageSpecWithRemovePlan* p) { - if (p->plan.request_type == Dependencies::RequestType::AUTO_SELECTED) + if (p->plan.request_type == RequestType::AUTO_SELECTED) { return " * " + p->spec.to_string(); } - if (p->plan.request_type == Dependencies::RequestType::USER_REQUESTED) + if (p->plan.request_type == RequestType::USER_REQUESTED) { return " " + p->spec.to_string(); } -- cgit v1.2.3