Run clang-format over the headers. Remove stray Version.h/cpp. Fix location of VersionT.cpp

1 files changed, 29 insertions, 20 deletions

diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index 4c1970219..5807e45aa 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -1,16 +1,18 @@
 #pragma once
 
+#include "StatusParagraphs.h"
 #include "VcpkgCmdArguments.h"
 #include "VcpkgPaths.h"
-#include "StatusParagraphs.h"
-#include <array>
 #include "VersionT.h"
+#include <array>
 
 namespace vcpkg::Commands
 {
-    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);
+    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);
 
     namespace Build
     {
@@ -23,7 +25,12 @@ namespace vcpkg::Commands
             CASCADED_DUE_TO_MISSING_DEPENDENCIES
         };
 
-        static constexpr std::array<BuildResult, 4> BuildResult_values = { BuildResult::SUCCEEDED, BuildResult::BUILD_FAILED, BuildResult::POST_BUILD_CHECKS_FAILED, BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES };
+        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 PackageSpec& spec);
@@ -37,18 +44,16 @@ namespace vcpkg::Commands
             std::vector<PackageSpec> unmet_dependencies;
         };
 
-        ExtendedBuildResult build_package(
-            const SourceParagraph& source_paragraph,
-            const PackageSpec& spec,
-            const VcpkgPaths& paths,
-            const fs::path& port_dir,
-            const StatusParagraphs& status_db);
+        ExtendedBuildResult 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 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_triplet);
     }
@@ -77,8 +82,12 @@ namespace vcpkg::Commands
             const fs::path& listfile() const;
         };
 
-        void install_files_and_write_listfile(Files::Filesystem& fs, const fs::path& source_dir, const InstallDir& dirs);
-        void install_package(const VcpkgPaths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs* status_db);
+        void install_files_and_write_listfile(Files::Filesystem& fs,
+                                              const fs::path& source_dir,
+                                              const InstallDir& dirs);
+        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_triplet);
     }
 
@@ -158,7 +167,7 @@ namespace vcpkg::Commands
 
     namespace Integrate
     {
-        extern const char*const INTEGRATE_COMMAND_HELPSTRING;
+        extern const char* const INTEGRATE_COMMAND_HELPSTRING;
 
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     }