Merge from master

1 files changed, 5 insertions, 11 deletions

diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h
index 57fbefc0a..4c3b47365 100644
--- a/toolsrc/include/PackageSpec.h
+++ b/toolsrc/include/PackageSpec.h
@@ -7,15 +7,13 @@ namespace vcpkg
 {
     struct PackageSpec
     {
-        static Expected<PackageSpec> from_string(const std::string& spec_as_string, const Triplet& default_target_triplet);
+        static Expected<PackageSpec> from_string(const std::string& spec_as_string, const Triplet& default_triplet);
 
-        static Expected<PackageSpec> from_name_and_triplet(const std::string& name, const Triplet& target_triplet);
+        static Expected<PackageSpec> from_name_and_triplet(const std::string& name, const Triplet& triplet);
 
         const std::string& name() const;
 
-        const Triplet& target_triplet() const;
-
-        std::string display_name() const;
+        const Triplet& triplet() const;
 
         std::string dir() const;
 
@@ -23,14 +21,10 @@ namespace vcpkg
 
     private:
         std::string m_name;
-        Triplet m_target_triplet;
+        Triplet m_triplet;
     };
 
-    std::string to_printf_arg(const PackageSpec& spec);
-
     bool operator==(const PackageSpec& left, const PackageSpec& right);
-
-    std::ostream& operator<<(std::ostream& os, const PackageSpec& spec);
 } //namespace vcpkg
 
 namespace std
@@ -42,7 +36,7 @@ namespace std
         {
             size_t hash = 17;
             hash = hash * 31 + std::hash<std::string>()(value.name());
-            hash = hash * 31 + std::hash<vcpkg::Triplet>()(value.target_triplet());
+            hash = hash * 31 + std::hash<vcpkg::Triplet>()(value.triplet());
             return hash;
         }
     };