From 6ece1871b1c4249c667d6f1ca096fcb12861303f Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Sat, 11 Nov 2017 22:10:38 -0800
Subject: [vcpkg] Simplify code -- Maps::maybe_find is not very useful compared
 to iterators.

---
 toolsrc/include/vcpkg/base/util.h | 16 ----------------
 toolsrc/src/vcpkg/commands.ci.cpp |  6 +++---
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/toolsrc/include/vcpkg/base/util.h b/toolsrc/include/vcpkg/base/util.h
index 44d09ae15..3d56c1e10 100644
--- a/toolsrc/include/vcpkg/base/util.h
+++ b/toolsrc/include/vcpkg/base/util.h
@@ -31,22 +31,6 @@ namespace vcpkg::Util
         }
     }
 
-    namespace Maps
-    {
-        template<class PairType>
-        using FirstT = std::remove_reference_t<decltype(std::declval<PairType>().first)>;
-
-        template<class Container, class K, class T = FirstT<ElementT<Container>>>
-        Optional<T&> maybe_find(Container&& assoc_container, const K& key)
-        {
-            auto it = assoc_container.find(key);
-            if (it == assoc_container.end())
-                return nullopt;
-            else
-                return it->second;
-        }
-    }
-
     template<class Cont, class Func>
     using FmapOut = decltype(std::declval<Func&>()(*begin(std::declval<Cont&>())));
 
diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp
index ee25f272a..65adade1a 100644
--- a/toolsrc/src/vcpkg/commands.ci.cpp
+++ b/toolsrc/src/vcpkg/commands.ci.cpp
@@ -77,10 +77,10 @@ namespace vcpkg::Commands::CI
         const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE);
 
         std::set<std::string> exclusions_set;
-        auto maybe_exclusions = Util::Maps::maybe_find(options.settings, OPTION_EXCLUDE);
-        if (auto p_exclusions = maybe_exclusions.get())
+        auto it_exclusions = options.settings.find(OPTION_EXCLUDE);
+        if (it_exclusions != options.settings.end())
         {
-            auto exclusions = Strings::split(*p_exclusions, ",");
+            auto exclusions = Strings::split(it_exclusions->second, ",");
             exclusions_set.insert(exclusions.begin(), exclusions.end());
         }
 
-- 
cgit v1.2.3