Merge from master

10 files changed, 30 insertions, 35 deletions

diff --git a/toolsrc/include/BinaryParagraph.h b/toolsrc/include/BinaryParagraph.h
index d92ae7e6d..e29e0f51b 100644
--- a/toolsrc/include/BinaryParagraph.h
+++ b/toolsrc/include/BinaryParagraph.h
@@ -10,7 +10,7 @@ namespace vcpkg
     {
         BinaryParagraph();
         explicit BinaryParagraph(std::unordered_map<std::string, std::string> fields);
-        BinaryParagraph(const SourceParagraph& spgh, const Triplet& target_triplet);
+        BinaryParagraph(const SourceParagraph& spgh, const Triplet& triplet);
 
         std::string displayname() const;
 
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;
         }
     };
diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/StatusParagraphs.h
index 82d2a0d1f..c5ece9616 100644
--- a/toolsrc/include/StatusParagraphs.h
+++ b/toolsrc/include/StatusParagraphs.h
@@ -16,16 +16,16 @@ namespace vcpkg
 
         const_iterator find(const PackageSpec& spec) const
         {
-            return find(spec.name(), spec.target_triplet());
+            return find(spec.name(), spec.triplet());
         }
-        const_iterator find(const std::string& name, const Triplet& target_triplet) const;
-        iterator find(const std::string& name, const Triplet& target_triplet);
+        const_iterator find(const std::string& name, const Triplet& triplet) const;
+        iterator find(const std::string& name, const Triplet& triplet);
 
         const_iterator find_installed(const PackageSpec& spec) const
         {
-            return find_installed(spec.name(), spec.target_triplet());
+            return find_installed(spec.name(), spec.triplet());
         }
-        const_iterator find_installed(const std::string& name, const Triplet& target_triplet) const;
+        const_iterator find_installed(const std::string& name, const Triplet& triplet) const;
 
         iterator insert(std::unique_ptr<StatusParagraph>);
 
diff --git a/toolsrc/include/VcpkgCmdArguments.h b/toolsrc/include/VcpkgCmdArguments.h
index 4a0809fff..3a915205e 100644
--- a/toolsrc/include/VcpkgCmdArguments.h
+++ b/toolsrc/include/VcpkgCmdArguments.h
@@ -13,7 +13,7 @@ namespace vcpkg
         static VcpkgCmdArguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end);
 
         std::unique_ptr<std::string> vcpkg_root_dir;
-        std::unique_ptr<std::string> target_triplet;
+        std::unique_ptr<std::string> triplet;
         OptBoolT debug = OptBoolT::UNSPECIFIED;
         OptBoolT  sendmetrics = OptBoolT::UNSPECIFIED;
         OptBoolT  printmetrics = OptBoolT::UNSPECIFIED;
diff --git a/toolsrc/include/VersionT.cpp b/toolsrc/include/VersionT.cpp
index c51052b98..6ea5d3810 100644
--- a/toolsrc/include/VersionT.cpp
+++ b/toolsrc/include/VersionT.cpp
@@ -6,6 +6,7 @@ namespace vcpkg
 {
     VersionT::VersionT() : value("0.0.0") {}
     VersionT::VersionT(const std::string& value) : value(value) {}
+    std::string VersionT::to_string() const { return value; }
     bool operator==(const VersionT& left, const VersionT& right) { return left.value == right.value; }
     bool operator!=(const VersionT& left, const VersionT& right) { return left.value != right.value; }
     std::string to_printf_arg(const VersionT& version) { return version.value; }
diff --git a/toolsrc/include/VersionT.h b/toolsrc/include/VersionT.h
index aa2635855..36d050e08 100644
--- a/toolsrc/include/VersionT.h
+++ b/toolsrc/include/VersionT.h
@@ -8,12 +8,13 @@ namespace vcpkg
         VersionT();
         VersionT(const std::string& value);
 
+        std::string to_string() const;
+
         std::string value;
     };
 
     bool operator ==(const VersionT& left, const VersionT& right);
     bool operator !=(const VersionT& left, const VersionT& right);
-    std::string to_printf_arg(const VersionT& version);
 
     struct VersionDiff
     {
diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h
index 8cf2413b0..ea6808e05 100644
--- a/toolsrc/include/triplet.h
+++ b/toolsrc/include/triplet.h
@@ -15,10 +15,9 @@ namespace vcpkg
         static const Triplet ARM_UWP;
 
         const std::string& canonical_name() const;
-
         std::string architecture() const;
-
         std::string system() const;
+        const std::string& to_string() const;
 
     private:
         std::string m_canonical_name;
@@ -27,12 +26,6 @@ namespace vcpkg
     bool operator==(const Triplet& left, const Triplet& right);
 
     bool operator!=(const Triplet& left, const Triplet& right);
-
-    std::string to_string(const Triplet& spec);
-
-    std::string to_printf_arg(const Triplet& spec);
-
-    std::ostream& operator<<(std::ostream& os, const Triplet& spec);
 }
 
 namespace std
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index db15a10fd..bb25812ac 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -8,7 +8,7 @@
 
 namespace vcpkg::Commands
 {
-    using CommandTypeA = void(*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet);
+    using CommandTypeA = void(*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
     using CommandTypeB = void(*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     using CommandTypeC = void(*)(const VcpkgCmdArguments& args);
 
@@ -29,32 +29,32 @@ namespace vcpkg::Commands
         std::string create_error_message(const BuildResult build_result, const PackageSpec& spec);
         std::string create_user_troubleshooting_message(const PackageSpec& spec);
 
-        std::wstring make_build_env_cmd(const Triplet& target_triplet, const Toolset& toolset);
+        std::wstring make_build_env_cmd(const Triplet& triplet, const Toolset& toolset);
 
         BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const VcpkgPaths& paths, const fs::path& port_dir, const StatusParagraphs& status_db);
         void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set<std::string>& options, const VcpkgPaths& paths);
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet);
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
     }
 
     namespace BuildExternal
     {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet);
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
     }
 
     namespace Install
     {
         void install_package(const VcpkgPaths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs* status_db);
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet);
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
     }
 
     namespace CI
     {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet);
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
     }
 
     namespace Remove
     {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet);
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
     }
 
     namespace Update
diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h
index fd549f278..97fb09e3d 100644
--- a/toolsrc/include/vcpkg_Input.h
+++ b/toolsrc/include/vcpkg_Input.h
@@ -7,7 +7,7 @@ namespace vcpkg::Input
 {
     PackageSpec check_and_get_package_spec(
         const std::string& package_spec_as_string,
-        const Triplet& default_target_triplet,
+        const Triplet& default_triplet,
         CStringView example_text);
 
     void check_triplet(const Triplet& t, const VcpkgPaths& paths);
diff --git a/toolsrc/include/vcpkg_Strings.h b/toolsrc/include/vcpkg_Strings.h
index 03b16975e..7b031608c 100644
--- a/toolsrc/include/vcpkg_Strings.h
+++ b/toolsrc/include/vcpkg_Strings.h
@@ -5,6 +5,12 @@
 
 namespace vcpkg::Strings::details
 {
+    template<class T>
+    auto to_printf_arg(const T& t) -> decltype(t.to_string())
+    {
+        return t.to_string();
+    }
+
     inline const char* to_printf_arg(const std::string& s)
     {
         return s.c_str();