Merge from master

1 files changed, 11 insertions, 26 deletions

diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp
index fab0cc8b6..bf1c7380c 100644
--- a/toolsrc/src/PackageSpec.cpp
+++ b/toolsrc/src/PackageSpec.cpp
@@ -8,12 +8,12 @@ namespace vcpkg
         return (c == '-') || isdigit(c) || (isalpha(c) && islower(c));
     }
 
-    Expected<PackageSpec> PackageSpec::from_string(const std::string& spec_as_string, const Triplet& default_target_triplet)
+    Expected<PackageSpec> PackageSpec::from_string(const std::string& spec_as_string, const Triplet& default_triplet)
     {
         auto pos = spec_as_string.find(':');
         if (pos == std::string::npos)
         {
-            return from_name_and_triplet(spec_as_string, default_target_triplet);
+            return from_name_and_triplet(spec_as_string, default_triplet);
         }
 
         auto pos2 = spec_as_string.find(':', pos + 1);
@@ -23,11 +23,11 @@ namespace vcpkg
         }
 
         const std::string name = spec_as_string.substr(0, pos);
-        const Triplet target_triplet = Triplet::from_canonical_name(spec_as_string.substr(pos + 1));
-        return from_name_and_triplet(name, target_triplet);
+        const Triplet triplet = Triplet::from_canonical_name(spec_as_string.substr(pos + 1));
+        return from_name_and_triplet(name, triplet);
     }
 
-    Expected<PackageSpec> PackageSpec::from_name_and_triplet(const std::string& name, const Triplet& target_triplet)
+    Expected<PackageSpec> PackageSpec::from_name_and_triplet(const std::string& name, const Triplet& triplet)
     {
         if (std::find_if_not(name.cbegin(), name.cend(), is_valid_package_spec_char) != name.end())
         {
@@ -36,7 +36,7 @@ namespace vcpkg
 
         PackageSpec p;
         p.m_name = name;
-        p.m_target_triplet = target_triplet;
+        p.m_triplet = triplet;
         return p;
     }
 
@@ -45,38 +45,23 @@ namespace vcpkg
         return this->m_name;
     }
 
-    const Triplet& PackageSpec::target_triplet() const
+    const Triplet& PackageSpec::triplet() const
     {
-        return this->m_target_triplet;
-    }
-
-    std::string PackageSpec::display_name() const
-    {
-        return Strings::format("%s:%s", this->name(), this->target_triplet());
+        return this->m_triplet;
     }
 
     std::string PackageSpec::dir() const
     {
-        return Strings::format("%s_%s", this->m_name, this->m_target_triplet);
+        return Strings::format("%s_%s", this->m_name, this->m_triplet);
     }
 
     std::string PackageSpec::to_string() const
     {
-        return this->display_name();
-    }
-
-    std::string to_printf_arg(const PackageSpec& spec)
-    {
-        return spec.to_string();
+        return Strings::format("%s:%s", this->name(), this->triplet());
     }
 
     bool operator==(const PackageSpec& left, const PackageSpec& right)
     {
-        return left.name() == right.name() && left.target_triplet() == right.target_triplet();
-    }
-
-    std::ostream& operator<<(std::ostream& os, const PackageSpec& spec)
-    {
-        return os << spec.to_string();
+        return left.name() == right.name() && left.triplet() == right.triplet();
     }
 }