ART: Minor cleanup in cmdline/.

Avoid `std::function<>` when dumping help.

Avoid `std::optional<>::value()` because it is specified as
throwing an exception and we do not use C++ exceptions in
ART. Use `std::optional<>::has_value()` instead of implicit
conversion to `bool`.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Change-Id: I7addd70b6a69dcaff7a03a829953ed476896bdc0

1 files changed, 4 insertions, 4 deletions

diff --git a/cmdline/cmdline_parser.h b/cmdline/cmdline_parser.h
index 5cdf446474..8685da295d 100644
--- a/cmdline/cmdline_parser.h
+++ b/cmdline/cmdline_parser.h
@@ -739,11 +739,11 @@ void CmdlineParser<TVariantMap, TVariantMapKey>::DumpHelp(VariableIndentationOut
   std::unordered_map<std::string, std::vector<detail::CmdlineParseArgumentAny*>> args;
   for (const std::unique_ptr<detail::CmdlineParseArgumentAny>& it : completed_arguments_) {
     auto cat = it->GetCategory();
-    if (cat) {
-      if (args.find(cat.value()) == args.end()) {
-        args[cat.value()] = {};
+    if (cat.has_value()) {
+      if (args.find(*cat) == args.end()) {
+        args[*cat] = {};
       }
-      args.at(cat.value()).push_back(it.get());
+      args.at(*cat).push_back(it.get());
     } else {
       uncat.push_back(it.get());
     }