package_spec -> PackageSpec

9 files changed, 34 insertions, 34 deletions

diff --git a/toolsrc/include/BinaryParagraph.h b/toolsrc/include/BinaryParagraph.h
index 3d9cfb9fb..f0f7b092b 100644
--- a/toolsrc/include/BinaryParagraph.h
+++ b/toolsrc/include/BinaryParagraph.h
@@ -2,7 +2,7 @@
 
 #include <unordered_map>
 #include "SourceParagraph.h"
-#include "package_spec.h"
+#include "PackageSpec.h"
 
 namespace vcpkg
 {
@@ -18,7 +18,7 @@ namespace vcpkg
 
         std::string dir() const;
 
-        package_spec spec;
+        PackageSpec spec;
         std::string version;
         std::string description;
         std::string maintainer;
diff --git a/toolsrc/include/package_spec.h b/toolsrc/include/PackageSpec.h
index ead05cb99..be966478b 100644
--- a/toolsrc/include/package_spec.h
+++ b/toolsrc/include/PackageSpec.h
@@ -5,11 +5,11 @@
 
 namespace vcpkg
 {
-    struct package_spec
+    struct PackageSpec
     {
-        static expected<package_spec> 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_target_triplet);
 
-        static expected<package_spec> 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& target_triplet);
 
         const std::string& name() const;
 
@@ -26,19 +26,19 @@ namespace vcpkg
         triplet m_target_triplet;
     };
 
-    std::string to_printf_arg(const package_spec& spec);
+    std::string to_printf_arg(const PackageSpec& spec);
 
-    bool operator==(const package_spec& left, const package_spec& right);
+    bool operator==(const PackageSpec& left, const PackageSpec& right);
 
-    std::ostream& operator<<(std::ostream& os, const package_spec& spec);
+    std::ostream& operator<<(std::ostream& os, const PackageSpec& spec);
 } //namespace vcpkg
 
 namespace std
 {
     template <>
-    struct hash<vcpkg::package_spec>
+    struct hash<vcpkg::PackageSpec>
     {
-        size_t operator()(const vcpkg::package_spec& value) const
+        size_t operator()(const vcpkg::PackageSpec& value) const
         {
             size_t hash = 17;
             hash = hash * 31 + std::hash<std::string>()(value.name());
@@ -48,9 +48,9 @@ namespace std
     };
 
     template <>
-    struct equal_to<vcpkg::package_spec>
+    struct equal_to<vcpkg::PackageSpec>
     {
-        bool operator()(const vcpkg::package_spec& left, const vcpkg::package_spec& right) const
+        bool operator()(const vcpkg::PackageSpec& left, const vcpkg::PackageSpec& right) const
         {
             return left == right;
         }
diff --git a/toolsrc/include/Paragraphs.h b/toolsrc/include/Paragraphs.h
index 26f81ffad..101b6dde6 100644
--- a/toolsrc/include/Paragraphs.h
+++ b/toolsrc/include/Paragraphs.h
@@ -18,7 +18,7 @@ namespace vcpkg::Paragraphs
 
     expected<SourceParagraph> try_load_port(const fs::path& control_path);
 
-    expected<BinaryParagraph> try_load_cached_package(const vcpkg_paths& paths, const package_spec& spec);
+    expected<BinaryParagraph> try_load_cached_package(const vcpkg_paths& paths, const PackageSpec& spec);
 
     std::vector<SourceParagraph> load_all_ports(const fs::path& ports_dir);
 
diff --git a/toolsrc/include/PostBuildLint.h b/toolsrc/include/PostBuildLint.h
index 73c8ec54b..1f96b02f1 100644
--- a/toolsrc/include/PostBuildLint.h
+++ b/toolsrc/include/PostBuildLint.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "package_spec.h"
+#include "PackageSpec.h"
 #include "vcpkg_paths.h"
 
 namespace vcpkg::PostBuildLint
 {
-    size_t perform_all_checks(const package_spec& spec, const vcpkg_paths& paths);
+    size_t perform_all_checks(const PackageSpec& spec, const vcpkg_paths& paths);
 }
diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/StatusParagraphs.h
index 3c5d35183..fc6a96a54 100644
--- a/toolsrc/include/StatusParagraphs.h
+++ b/toolsrc/include/StatusParagraphs.h
@@ -14,7 +14,7 @@ namespace vcpkg
         using iterator = container::reverse_iterator;
         using const_iterator = container::const_reverse_iterator;
 
-        const_iterator find(const package_spec& spec) const
+        const_iterator find(const PackageSpec& spec) const
         {
             return find(spec.name(), spec.target_triplet());
         }
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index 23575ca23..0795a8405 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -26,13 +26,13 @@ namespace vcpkg::Commands
         static constexpr std::array<BuildResult, 4> BuildResult_values = { BuildResult::SUCCEEDED, BuildResult::BUILD_FAILED, BuildResult::POST_BUILD_CHECKS_FAILED, BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES };
 
         const std::string& to_string(const BuildResult build_result);
-        std::string create_error_message(const BuildResult build_result, const package_spec& spec);
-        std::string create_user_troubleshooting_message(const package_spec& spec);
+        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_t& toolset);
 
-        BuildResult build_package(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db);
-        void perform_and_exit(const package_spec& spec, const fs::path& port_dir, const std::unordered_set<std::string>& options, const vcpkg_paths& paths);
+        BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const vcpkg_paths& 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 vcpkg_paths& paths);
         void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
     }
 
@@ -63,7 +63,7 @@ namespace vcpkg::Commands
         {
             static bool compare_by_name(const outdated_package& left, const outdated_package& right);
 
-            package_spec spec;
+            PackageSpec spec;
             version_diff_t version_diff;
         };
 
diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg_Dependencies.h
index dca824ee9..b2633bb28 100644
--- a/toolsrc/include/vcpkg_Dependencies.h
+++ b/toolsrc/include/vcpkg_Dependencies.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vector>
-#include "package_spec.h"
+#include "PackageSpec.h"
 #include "StatusParagraphs.h"
 #include "vcpkg_paths.h"
 #include "vcpkg_optional.h"
@@ -38,9 +38,9 @@ namespace vcpkg::Dependencies
 
     struct package_spec_with_install_plan
     {
-        package_spec_with_install_plan(const package_spec& spec, install_plan_action&& plan);
+        package_spec_with_install_plan(const PackageSpec& spec, install_plan_action&& plan);
 
-        package_spec spec;
+        PackageSpec spec;
         install_plan_action plan;
     };
 
@@ -67,13 +67,13 @@ namespace vcpkg::Dependencies
 
     struct package_spec_with_remove_plan
     {
-        package_spec_with_remove_plan(const package_spec& spec, remove_plan_action&& plan);
+        package_spec_with_remove_plan(const PackageSpec& spec, remove_plan_action&& plan);
 
-        package_spec spec;
+        PackageSpec spec;
         remove_plan_action plan;
     };
 
-    std::vector<package_spec_with_install_plan> create_install_plan(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db);
+    std::vector<package_spec_with_install_plan> create_install_plan(const vcpkg_paths& paths, const std::vector<PackageSpec>& specs, const StatusParagraphs& status_db);
 
-    std::vector<package_spec_with_remove_plan> create_remove_plan(const std::vector<package_spec>& specs, const StatusParagraphs& status_db);
+    std::vector<package_spec_with_remove_plan> create_remove_plan(const std::vector<PackageSpec>& specs, const StatusParagraphs& status_db);
 }
diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h
index 868b77a44..da7bebbfa 100644
--- a/toolsrc/include/vcpkg_Input.h
+++ b/toolsrc/include/vcpkg_Input.h
@@ -1,11 +1,11 @@
 #pragma once
 #include <vector>
-#include "package_spec.h"
+#include "PackageSpec.h"
 #include "vcpkg_paths.h"
 
 namespace vcpkg::Input
 {
-    package_spec check_and_get_package_spec(
+    PackageSpec check_and_get_package_spec(
         const std::string& package_spec_as_string,
         const triplet& default_target_triplet,
         CStringView example_text);
diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h
index eb0f1bb0f..fa74fd703 100644
--- a/toolsrc/include/vcpkg_paths.h
+++ b/toolsrc/include/vcpkg_paths.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "filesystem_fs.h"
 #include "vcpkg_expected.h"
-#include "package_spec.h"
+#include "PackageSpec.h"
 #include "BinaryParagraph.h"
 #include "Lazy.h"
 
@@ -18,9 +18,9 @@ namespace vcpkg
     {
         static expected<vcpkg_paths> create(const fs::path& vcpkg_root_dir);
 
-        fs::path package_dir(const package_spec& spec) const;
-        fs::path port_dir(const package_spec& spec) const;
-        fs::path build_info_file_path(const package_spec& spec) const;
+        fs::path package_dir(const PackageSpec& spec) const;
+        fs::path port_dir(const PackageSpec& spec) const;
+        fs::path build_info_file_path(const PackageSpec& spec) const;
         fs::path listfile_path(const BinaryParagraph& pgh) const;
 
         bool is_valid_triplet(const triplet& t) const;