Merge branch 'master' into master

1 files changed, 10 insertions, 5 deletions

diff --git a/toolsrc/src/package_spec.cpp b/toolsrc/src/package_spec.cpp
index 86d4393bd..2713e219f 100644
--- a/toolsrc/src/package_spec.cpp
+++ b/toolsrc/src/package_spec.cpp
@@ -1,5 +1,5 @@
+#include "pch.h"
 #include "package_spec.h"
-#include <algorithm>
 
 namespace vcpkg
 {
@@ -50,19 +50,24 @@ namespace vcpkg
         return this->m_target_triplet;
     }
 
+    std::string package_spec::display_name() const
+    {
+        return Strings::format("%s:%s", this->name(), this->target_triplet());
+    }
+
     std::string package_spec::dir() const
     {
         return Strings::format("%s_%s", this->m_name, this->m_target_triplet);
     }
 
-    std::string to_string(const package_spec& spec)
+    std::string package_spec::toString() const
     {
-        return Strings::format("%s:%s", spec.name(), spec.target_triplet());
+        return this->display_name();
     }
 
     std::string to_printf_arg(const package_spec& spec)
     {
-        return to_string(spec);
+        return spec.toString();
     }
 
     bool operator==(const package_spec& left, const package_spec& right)
@@ -72,6 +77,6 @@ namespace vcpkg
 
     std::ostream& operator<<(std::ostream& os, const package_spec& spec)
     {
-        return os << to_string(spec);
+        return os << spec.toString();
     }
 }