Revert "Use Util::keep_if()"

This reverts commit 3739e8e0b998b14c0f320c21618057e50698c51d.

6 files changed, 25 insertions, 26 deletions

diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp
index c7db764de..c3ebd7de8 100644
--- a/toolsrc/src/commands_build.cpp
+++ b/toolsrc/src/commands_build.cpp
@@ -10,7 +10,6 @@
 #include "metrics.h"
 #include "vcpkg_Enums.h"
 #include "Paragraphs.h"
-#include "vcpkg_Util.h"
 
 namespace vcpkg::Commands::Build
 {
@@ -150,10 +149,12 @@ namespace vcpkg::Commands::Build
         if (result == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES)
         {
             std::vector<InstallPlanAction> unmet_dependencies = Dependencies::create_install_plan(paths, { spec }, status_db);
-            Util::keep_if(unmet_dependencies, [&spec](const InstallPlanAction& p)
-            {
-                return (p.spec != spec) && (p.plan_type != InstallPlanType::ALREADY_INSTALLED);
-            });
+            unmet_dependencies.erase(
+                std::remove_if(unmet_dependencies.begin(), unmet_dependencies.end(), [&spec](const InstallPlanAction& p)
+                               {
+                                   return (p.spec == spec) || (p.plan_type == InstallPlanType::ALREADY_INSTALLED);
+                               }),
+                unmet_dependencies.end());
 
             Checks::check_exit(VCPKG_LINE_INFO, !unmet_dependencies.empty());
             System::println(System::Color::error, "The build command requires all dependencies to be already installed.");
diff --git a/toolsrc/src/commands_hash.cpp b/toolsrc/src/commands_hash.cpp
index a9024d9e7..2ffa3a9aa 100644
--- a/toolsrc/src/commands_hash.cpp
+++ b/toolsrc/src/commands_hash.cpp
@@ -1,7 +1,6 @@
 #include "pch.h"
 #include "vcpkg_Commands.h"
 #include "vcpkg_System.h"
-#include "vcpkg_Util.h"
 
 namespace vcpkg::Commands::Hash
 {
@@ -21,7 +20,7 @@ namespace vcpkg::Commands::Hash
         Checks::check_exit(VCPKG_LINE_INFO, end != std::string::npos, "Unexpected output format from command: %s", Strings::utf16_to_utf8(cmd_line));
 
         auto hash = output.substr(start, end - start);
-        Util::keep_if(hash, [](char c) {return !isspace(c); });
+        hash.erase(std::remove_if(hash.begin(), hash.end(), isspace), hash.end());
         System::println(hash);
     }
 
diff --git a/toolsrc/src/commands_integrate.cpp b/toolsrc/src/commands_integrate.cpp
index e51b1637e..256c3ad1d 100644
--- a/toolsrc/src/commands_integrate.cpp
+++ b/toolsrc/src/commands_integrate.cpp
@@ -3,7 +3,6 @@
 #include "vcpkg_Checks.h"
 #include "vcpkg_System.h"
 #include "vcpkg_Files.h"
-#include "vcpkg_Util.h"
 
 namespace vcpkg::Commands::Integrate
 {
@@ -67,10 +66,10 @@ namespace vcpkg::Commands::Integrate
         dir_id.erase(1, 1); // Erasing the ":"
 
         // NuGet id cannot have invalid characters. We will only use alphanumeric and dot.
-        Util::keep_if(dir_id, [](char c)
-                      {
-                          return isalnum(c) || (c == '.');
-                      });
+        dir_id.erase(std::remove_if(dir_id.begin(), dir_id.end(), [](char c)
+                                    {
+                                        return !isalnum(c) && (c != '.');
+                                    }), dir_id.end());
 
         const std::string nuget_id = "vcpkg." + dir_id;
         return nuget_id;
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp
index 5e2a1214c..9ecf57023 100644
--- a/toolsrc/src/vcpkg_Dependencies.cpp
+++ b/toolsrc/src/vcpkg_Dependencies.cpp
@@ -143,10 +143,10 @@ namespace vcpkg::Dependencies
 
         const std::unordered_set<PackageSpec> specs_as_set(specs.cbegin(), specs.cend());
         std::vector<InstallPlanAction> toposort = Graphs::topological_sort(specs, InstallAdjacencyProvider{ paths, status_db, specs_as_set });
-        Util::keep_if(toposort, [](const InstallPlanAction& p)
-                      {
-                          return !(p.request_type == RequestType::AUTO_SELECTED && p.plan_type == InstallPlanType::ALREADY_INSTALLED);
-                      });
+        toposort.erase(std::remove_if(toposort.begin(), toposort.end(), [](const InstallPlanAction& p)
+        {
+            return  p.request_type == RequestType::AUTO_SELECTED && p.plan_type == InstallPlanType::ALREADY_INSTALLED;
+        }), toposort.end());
 
         return toposort;
     }
diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg_Strings.cpp
index 3d9895436..26dc6388b 100644
--- a/toolsrc/src/vcpkg_Strings.cpp
+++ b/toolsrc/src/vcpkg_Strings.cpp
@@ -1,6 +1,5 @@
 #include "pch.h"
 #include "vcpkg_Strings.h"
-#include "vcpkg_Util.h"
 
 namespace vcpkg::Strings::details
 {
@@ -99,10 +98,10 @@ namespace vcpkg::Strings
             trim(&s);
         }
 
-        Util::keep_if(*strings, [](const std::string& s)-> bool
-        {
-            return s != "";
-        });
+        strings->erase(std::remove_if(strings->begin(), strings->end(), [](const std::string& s)-> bool
+                                      {
+                                          return s == "";
+                                      }), strings->end());
     }
 
     std::vector<std::string> split(const std::string& s, const std::string& delimiter)
diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkglib.cpp
index fb1f39256..5e847019f 100644
--- a/toolsrc/src/vcpkglib.cpp
+++ b/toolsrc/src/vcpkglib.cpp
@@ -4,7 +4,6 @@
 #include "Paragraphs.h"
 #include "metrics.h"
 #include "vcpkg_Strings.h"
-#include "vcpkg_Util.h"
 
 namespace vcpkg
 {
@@ -202,10 +201,12 @@ namespace vcpkg
             upgrade_to_slash_terminated_sorted_format(&installed_files_of_current_pgh, listfile_path);
 
             // Remove the directories
-            Util::keep_if(installed_files_of_current_pgh, [](const std::string& file) -> bool
-            {
-                return file.back() != '/';
-            });
+            installed_files_of_current_pgh.erase(
+                std::remove_if(installed_files_of_current_pgh.begin(), installed_files_of_current_pgh.end(), [](const std::string& file) -> bool
+                               {
+                                   return file.back() == '/';
+                               }
+                ), installed_files_of_current_pgh.end());
 
             StatusParagraphAndAssociatedFiles pgh_and_files = { *pgh, SortedVector<std::string>(std::move(installed_files_of_current_pgh)) };
             installed_files.push_back(std::move(pgh_and_files));