package_spec_parse_result -> PackageSpecParseResult

4 files changed, 53 insertions, 53 deletions

diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp
index 97183043d..225f2ef8e 100644
--- a/toolsrc/src/PackageSpec.cpp
+++ b/toolsrc/src/PackageSpec.cpp
@@ -19,7 +19,7 @@ namespace vcpkg
         auto pos2 = spec_as_string.find(':', pos + 1);
         if (pos2 != std::string::npos)
         {
-            return std::error_code(package_spec_parse_result::TOO_MANY_COLONS);
+            return std::error_code(PackageSpecParseResult::TOO_MANY_COLONS);
         }
 
         const std::string name = spec_as_string.substr(0, pos);
@@ -31,7 +31,7 @@ namespace vcpkg
     {
         if (std::find_if_not(name.cbegin(), name.cend(), is_valid_package_spec_char) != name.end())
         {
-            return std::error_code(package_spec_parse_result::INVALID_CHARACTERS);
+            return std::error_code(PackageSpecParseResult::INVALID_CHARACTERS);
         }
 
         PackageSpec p;
diff --git a/toolsrc/src/PackageSpecParseResult.cpp b/toolsrc/src/PackageSpecParseResult.cpp
new file mode 100644
index 000000000..3fb2def0b
--- /dev/null
+++ b/toolsrc/src/PackageSpecParseResult.cpp
@@ -0,0 +1,47 @@
+#include "pch.h"
+#include "vcpkg_Checks.h"
+#include "PackageSpecParseResult.h"
+
+namespace vcpkg
+{
+    const char* PackageSpecParseResultCategoryImpl::name() const noexcept
+    {
+        return "PackageSpecParseResult";
+    }
+
+    std::string PackageSpecParseResultCategoryImpl::message(int ev) const noexcept
+    {
+        switch (static_cast<PackageSpecParseResult>(ev))
+        {
+            case PackageSpecParseResult::SUCCESS:
+                return "OK";
+            case PackageSpecParseResult::TOO_MANY_COLONS:
+                return "Too many colons";
+            case PackageSpecParseResult::INVALID_CHARACTERS:
+                return "Contains invalid characters. Only alphanumeric lowercase ASCII characters and dashes are allowed";
+            default:
+                Checks::unreachable(VCPKG_LINE_INFO);
+        }
+    }
+
+    const std::error_category& package_spec_parse_result_category()
+    {
+        static PackageSpecParseResultCategoryImpl instance;
+        return instance;
+    }
+
+    std::error_code make_error_code(PackageSpecParseResult e)
+    {
+        return std::error_code(static_cast<int>(e), package_spec_parse_result_category());
+    }
+
+    PackageSpecParseResult to_package_spec_parse_result(int i)
+    {
+        return static_cast<PackageSpecParseResult>(i);
+    }
+
+    PackageSpecParseResult to_package_spec_parse_result(std::error_code ec)
+    {
+        return to_package_spec_parse_result(ec.value());
+    }
+}
diff --git a/toolsrc/src/package_spec_parse_result.cpp b/toolsrc/src/package_spec_parse_result.cpp
deleted file mode 100644
index 8a081d6f8..000000000
--- a/toolsrc/src/package_spec_parse_result.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "pch.h"
-#include "vcpkg_Checks.h"
-#include "package_spec_parse_result.h"
-
-namespace vcpkg
-{
-    const char* package_spec_parse_result_category_impl::name() const noexcept
-    {
-        return "package_spec_parse_result";
-    }
-
-    std::string package_spec_parse_result_category_impl::message(int ev) const noexcept
-    {
-        switch (static_cast<package_spec_parse_result>(ev))
-        {
-            case package_spec_parse_result::SUCCESS:
-                return "OK";
-            case package_spec_parse_result::TOO_MANY_COLONS:
-                return "Too many colons";
-            case package_spec_parse_result::INVALID_CHARACTERS:
-                return "Contains invalid characters. Only alphanumeric lowercase ASCII characters and dashes are allowed";
-            default:
-                Checks::unreachable(VCPKG_LINE_INFO);
-        }
-    }
-
-    const std::error_category& package_spec_parse_result_category()
-    {
-        static package_spec_parse_result_category_impl instance;
-        return instance;
-    }
-
-    std::error_code make_error_code(package_spec_parse_result e)
-    {
-        return std::error_code(static_cast<int>(e), package_spec_parse_result_category());
-    }
-
-    package_spec_parse_result to_package_spec_parse_result(int i)
-    {
-        return static_cast<package_spec_parse_result>(i);
-    }
-
-    package_spec_parse_result to_package_spec_parse_result(std::error_code ec)
-    {
-        return to_package_spec_parse_result(ec.value());
-    }
-}
diff --git a/toolsrc/src/tests_paragraph.cpp b/toolsrc/src/tests_paragraph.cpp
index a637bf399..d61c1632f 100644
--- a/toolsrc/src/tests_paragraph.cpp
+++ b/toolsrc/src/tests_paragraph.cpp
@@ -10,7 +10,7 @@ using namespace Microsoft::VisualStudio::CppUnitTestFramework;
 namespace Microsoft::VisualStudio::CppUnitTestFramework
 {
     template <>
-    inline std::wstring ToString<vcpkg::package_spec_parse_result>(const vcpkg::package_spec_parse_result& t)
+    inline std::wstring ToString<vcpkg::PackageSpecParseResult>(const vcpkg::PackageSpecParseResult& t)
     {
         return ToString(static_cast<uint32_t>(t));
     }
@@ -351,7 +351,7 @@ namespace UnitTest1
         TEST_METHOD(package_spec_parse)
         {
             vcpkg::expected<vcpkg::PackageSpec> spec = vcpkg::PackageSpec::from_string("zlib", vcpkg::triplet::X86_WINDOWS);
-            Assert::AreEqual(vcpkg::package_spec_parse_result::SUCCESS, vcpkg::to_package_spec_parse_result(spec.error_code()));
+            Assert::AreEqual(vcpkg::PackageSpecParseResult::SUCCESS, vcpkg::to_package_spec_parse_result(spec.error_code()));
             Assert::AreEqual("zlib", spec.get()->name().c_str());
             Assert::AreEqual(vcpkg::triplet::X86_WINDOWS.canonical_name(), spec.get()->target_triplet().canonical_name());
         }
@@ -359,7 +359,7 @@ namespace UnitTest1
         TEST_METHOD(package_spec_parse_with_arch)
         {
             vcpkg::expected<vcpkg::PackageSpec> spec = vcpkg::PackageSpec::from_string("zlib:x64-uwp", vcpkg::triplet::X86_WINDOWS);
-            Assert::AreEqual(vcpkg::package_spec_parse_result::SUCCESS, vcpkg::to_package_spec_parse_result(spec.error_code()));
+            Assert::AreEqual(vcpkg::PackageSpecParseResult::SUCCESS, vcpkg::to_package_spec_parse_result(spec.error_code()));
             Assert::AreEqual("zlib", spec.get()->name().c_str());
             Assert::AreEqual(vcpkg::triplet::X64_UWP.canonical_name(), spec.get()->target_triplet().canonical_name());
         }
@@ -367,7 +367,7 @@ namespace UnitTest1
         TEST_METHOD(package_spec_parse_with_multiple_colon)
         {
             auto ec = vcpkg::PackageSpec::from_string("zlib:x86-uwp:", vcpkg::triplet::X86_WINDOWS).error_code();
-            Assert::AreEqual(vcpkg::package_spec_parse_result::TOO_MANY_COLONS, vcpkg::to_package_spec_parse_result(ec));
+            Assert::AreEqual(vcpkg::PackageSpecParseResult::TOO_MANY_COLONS, vcpkg::to_package_spec_parse_result(ec));
         }
 
         TEST_METHOD(utf8_to_utf16)