Valiting triplets is now the responsibility of vcpkg_paths

3 files changed, 18 insertions, 20 deletions

diff --git a/toolsrc/src/main.cpp b/toolsrc/src/main.cpp
index a2f6fa10f..c7162dce0 100644
--- a/toolsrc/src/main.cpp
+++ b/toolsrc/src/main.cpp
@@ -70,14 +70,14 @@ static void inner(const vcpkg_cmd_arguments& args)
     }
 
     triplet default_target_triplet;
-    if(args.target_triplet != nullptr)
+    if (args.target_triplet != nullptr)
     {
         default_target_triplet = {*args.target_triplet};
     }
     else
     {
         const auto vcpkg_default_triplet_env = System::wdupenv_str(L"VCPKG_DEFAULT_TRIPLET");
-        if(!vcpkg_default_triplet_env.empty())
+        if (!vcpkg_default_triplet_env.empty())
         {
             default_target_triplet = {Strings::utf16_to_utf8(vcpkg_default_triplet_env)};
         }
@@ -87,7 +87,7 @@ static void inner(const vcpkg_cmd_arguments& args)
         }
     }
 
-    if(!default_target_triplet.validate(paths))
+    if (!paths.validate_triplet(default_target_triplet))
     {
         System::println(System::color::error, "Error: invalid triplet: %s", default_target_triplet.value);
         TrackProperty("error", "invalid triplet: " + default_target_triplet.value);
diff --git a/toolsrc/src/triplet.cpp b/toolsrc/src/triplet.cpp
index 080198f2b..e3a935958 100644
--- a/toolsrc/src/triplet.cpp
+++ b/toolsrc/src/triplet.cpp
@@ -1,6 +1,4 @@
 #include "triplet.h"
-#include "vcpkg.h"
-#include "vcpkg_System.h"
 #include "vcpkg_Checks.h"
 
 namespace vcpkg
@@ -49,19 +47,4 @@ namespace vcpkg
         Checks::check_exit(it != this->value.end(), "Invalid triplet: %s", this->value);
         return std::string(it + 1, this->value.cend());
     }
-
-    bool triplet::validate(const vcpkg_paths& paths) const
-    {
-        auto it = fs::directory_iterator(paths.triplets);
-        for (; it != fs::directory_iterator(); ++it)
-        {
-            std::string triplet_file_name = it->path().stem().generic_u8string();
-            if (this->value == triplet_file_name) // TODO: fuzzy compare
-            {
-                //this->value = triplet_file_name; // NOTE: uncomment when implementing fuzzy compare
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/toolsrc/src/vcpkg_paths.cpp b/toolsrc/src/vcpkg_paths.cpp
index 30d32a99b..b3bbcbee1 100644
--- a/toolsrc/src/vcpkg_paths.cpp
+++ b/toolsrc/src/vcpkg_paths.cpp
@@ -56,4 +56,19 @@ namespace vcpkg
     {
         return this->ports / spec.name;
     }
+
+    bool vcpkg_paths::validate_triplet(const triplet& t) const
+    {
+        auto it = fs::directory_iterator(this->triplets);
+        for (; it != fs::directory_iterator(); ++it)
+        {
+            std::string triplet_file_name = it->path().stem().generic_u8string();
+            if (t.value == triplet_file_name) // TODO: fuzzy compare
+            {
+                //t.value = triplet_file_name; // NOTE: uncomment when implementing fuzzy compare
+                return true;
+            }
+        }
+        return false;
+    }
 }