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

42 files changed, 260 insertions, 406 deletions

diff --git a/toolsrc/include/BinaryParagraph.h b/toolsrc/include/BinaryParagraph.h
index 6cf740920..90ca8fe9a 100644
--- a/toolsrc/include/BinaryParagraph.h
+++ b/toolsrc/include/BinaryParagraph.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <unordered_map>
-#include "SourceParagraph.h"
 #include "PackageSpec.h"
+#include "SourceParagraph.h"
+#include <unordered_map>
 
 namespace vcpkg
 {
diff --git a/toolsrc/include/LineInfo.h b/toolsrc/include/LineInfo.h
index c1bdd22cf..66d91c520 100644
--- a/toolsrc/include/LineInfo.h
+++ b/toolsrc/include/LineInfo.h
@@ -8,7 +8,7 @@ namespace vcpkg
         const char* file_name;
 
         constexpr LineInfo() : line_number(0), file_name(nullptr) {}
-        constexpr LineInfo(const int line_number, const char* file_name) : line_number(line_number), file_name(file_name) {}
+        constexpr LineInfo(const int lineno, const char* filename) : line_number(lineno), file_name(filename) {}
 
         std::string to_string() const;
     };
diff --git a/toolsrc/include/MachineType.h b/toolsrc/include/MachineType.h
index 86efb85c5..2318c092b 100644
--- a/toolsrc/include/MachineType.h
+++ b/toolsrc/include/MachineType.h
@@ -5,31 +5,31 @@ namespace vcpkg
 {
     enum class MachineType : uint16_t
     {
-        UNKNOWN = 0x0, // The contents of this field are assumed to be applicable to any machine type
-        AM33=0x1d3,//Matsushita AM33
-        AMD64=0x8664,//x64
-        ARM=0x1c0,//ARM little endian
-        ARM64=0xaa64,//ARM64 little endian
-        ARMNT=0x1c4,//ARM Thumb-2 little endian
-        EBC=0xebc,//EFI byte code
-        I386=0x14c,//Intel 386 or later processors and compatible processors
-        IA64=0x200,//Intel Itanium processor family
-        M32R=0x9041,//Mitsubishi M32R little endian
-        MIPS16=0x266,//MIPS16
-        MIPSFPU=0x366,//MIPS with FPU
-        MIPSFPU16=0x466,//MIPS16 with FPU
-        POWERPC=0x1f0,//Power PC little endian
-        POWERPCFP=0x1f1,//Power PC with floating point support
-        R4000=0x166,//MIPS little endian
-        RISCV32=0x5032,//RISC-V 32-bit address space
-        RISCV64=0x5064,//RISC-V 64-bit address space
-        RISCV128=0x5128,//RISC-V 128-bit address space
-        SH3=0x1a2,//Hitachi SH3
-        SH3DSP=0x1a3,//Hitachi SH3 DSP
-        SH4=0x1a6,//Hitachi SH4
-        SH5=0x1a8,//Hitachi SH5
-        THUMB=0x1c2,//Thumb
-        WCEMIPSV2=0x169,//MIPS little-endian WCE v2
+        UNKNOWN = 0x0,     // The contents of this field are assumed to be applicable to any machine type
+        AM33 = 0x1d3,      // Matsushita AM33
+        AMD64 = 0x8664,    // x64
+        ARM = 0x1c0,       // ARM little endian
+        ARM64 = 0xaa64,    // ARM64 little endian
+        ARMNT = 0x1c4,     // ARM Thumb-2 little endian
+        EBC = 0xebc,       // EFI byte code
+        I386 = 0x14c,      // Intel 386 or later processors and compatible processors
+        IA64 = 0x200,      // Intel Itanium processor family
+        M32R = 0x9041,     // Mitsubishi M32R little endian
+        MIPS16 = 0x266,    // MIPS16
+        MIPSFPU = 0x366,   // MIPS with FPU
+        MIPSFPU16 = 0x466, // MIPS16 with FPU
+        POWERPC = 0x1f0,   // Power PC little endian
+        POWERPCFP = 0x1f1, // Power PC with floating point support
+        R4000 = 0x166,     // MIPS little endian
+        RISCV32 = 0x5032,  // RISC-V 32-bit address space
+        RISCV64 = 0x5064,  // RISC-V 64-bit address space
+        RISCV128 = 0x5128, // RISC-V 128-bit address space
+        SH3 = 0x1a2,       // Hitachi SH3
+        SH3DSP = 0x1a3,    // Hitachi SH3 DSP
+        SH4 = 0x1a6,       // Hitachi SH4
+        SH5 = 0x1a8,       // Hitachi SH5
+        THUMB = 0x1c2,     // Thumb
+        WCEMIPSV2 = 0x169, // MIPS little-endian WCE v2
     };
 
     MachineType getMachineType(const uint16_t value);
diff --git a/toolsrc/include/OptBool.h b/toolsrc/include/OptBool.h
index 7bbc12daf..90655cb7e 100644
--- a/toolsrc/include/OptBool.h
+++ b/toolsrc/include/OptBool.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <string>
 #include <map>
+#include <string>
 
 namespace vcpkg
 {
@@ -20,7 +20,7 @@ namespace vcpkg
         static OptBool from_map(const std::map<T, std::string>& map, const T& key);
 
         constexpr OptBool() : backing_enum(BackingEnum::UNSPECIFIED) {}
-        constexpr explicit OptBool(BackingEnum backing_enum) : backing_enum(backing_enum) { }
+        constexpr explicit OptBool(BackingEnum backing_enum) : backing_enum(backing_enum) {}
         constexpr operator BackingEnum() const { return backing_enum; }
 
     private:
diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h
index 0d69ac89c..8f1d8cfc5 100644
--- a/toolsrc/include/PackageSpec.h
+++ b/toolsrc/include/PackageSpec.h
@@ -26,28 +26,22 @@ namespace vcpkg
 
     bool operator==(const PackageSpec& left, const PackageSpec& right);
     bool operator!=(const PackageSpec& left, const PackageSpec& right);
-} //namespace vcpkg
+}
 
-namespace std
+template<>
+struct std::hash<vcpkg::PackageSpec>
 {
-    template <>
-    struct hash<vcpkg::PackageSpec>
+    size_t operator()(const vcpkg::PackageSpec& value) const
     {
-        size_t operator()(const vcpkg::PackageSpec& value) const
-        {
-            size_t hash = 17;
-            hash = hash * 31 + std::hash<std::string>()(value.name());
-            hash = hash * 31 + std::hash<vcpkg::Triplet>()(value.triplet());
-            return hash;
-        }
-    };
-
-    template <>
-    struct equal_to<vcpkg::PackageSpec>
-    {
-        bool operator()(const vcpkg::PackageSpec& left, const vcpkg::PackageSpec& right) const
-        {
-            return left == right;
-        }
-    };
-} // namespace std
+        size_t hash = 17;
+        hash = hash * 31 + std::hash<std::string>()(value.name());
+        hash = hash * 31 + std::hash<vcpkg::Triplet>()(value.triplet());
+        return hash;
+    }
+};
+
+template<>
+struct std::equal_to<vcpkg::PackageSpec>
+{
+    bool operator()(const vcpkg::PackageSpec& left, const vcpkg::PackageSpec& right) const { return left == right; }
+};
diff --git a/toolsrc/include/PackageSpecParseResult.h b/toolsrc/include/PackageSpecParseResult.h
index c3072ea2a..b72c534c2 100644
--- a/toolsrc/include/PackageSpecParseResult.h
+++ b/toolsrc/include/PackageSpecParseResult.h
@@ -29,7 +29,7 @@ namespace vcpkg
 // Enable implicit conversion to std::error_code
 namespace std
 {
-    template <>
+    template<>
     struct is_error_code_enum<vcpkg::PackageSpecParseResult> : ::std::true_type
     {
     };
diff --git a/toolsrc/include/ParagraphParseResult.h b/toolsrc/include/ParagraphParseResult.h
index 0d1f13f61..eaa7e6327 100644
--- a/toolsrc/include/ParagraphParseResult.h
+++ b/toolsrc/include/ParagraphParseResult.h
@@ -26,10 +26,7 @@ namespace vcpkg
 }
 
 // Enable implicit conversion to std::error_code
-namespace std
+template<>
+struct std::is_error_code_enum<vcpkg::ParagraphParseResult> : ::std::true_type
 {
-    template <>
-    struct is_error_code_enum<vcpkg::ParagraphParseResult> : ::std::true_type
-    {
-    };
-}
+};
diff --git a/toolsrc/include/Paragraphs.h b/toolsrc/include/Paragraphs.h
index cf21635d7..504cd5bb8 100644
--- a/toolsrc/include/Paragraphs.h
+++ b/toolsrc/include/Paragraphs.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "filesystem_fs.h"
-#include <map>
-#include "vcpkg_expected.h"
 #include "BinaryParagraph.h"
 #include "VcpkgPaths.h"
 #include "VersionT.h"
+#include "filesystem_fs.h"
+#include "vcpkg_expected.h"
+#include <map>
 
 namespace vcpkg::Paragraphs
 {
@@ -22,5 +22,6 @@ namespace vcpkg::Paragraphs
 
     std::vector<SourceParagraph> load_all_ports(const Files::Filesystem& fs, const fs::path& ports_dir);
 
-    std::map<std::string, VersionT> extract_port_names_and_versions(const std::vector<SourceParagraph>& source_paragraphs);
+    std::map<std::string, VersionT>
+    extract_port_names_and_versions(const std::vector<SourceParagraph>& source_paragraphs);
 }
diff --git a/toolsrc/include/PostBuildLint_BuildInfo.h b/toolsrc/include/PostBuildLint_BuildInfo.h
index 336fffcb9..4a4560b8e 100644
--- a/toolsrc/include/PostBuildLint_BuildInfo.h
+++ b/toolsrc/include/PostBuildLint_BuildInfo.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "filesystem_fs.h"
-#include "vcpkg_Files.h"
-#include "PostBuildLint_BuildPolicies.h"
 #include "OptBool.h"
+#include "PostBuildLint_BuildPolicies.h"
 #include "PostBuildLint_LinkageType.h"
+#include "filesystem_fs.h"
+#include "vcpkg_Files.h"
 
 namespace vcpkg::PostBuildLint
 {
diff --git a/toolsrc/include/PostBuildLint_BuildPolicies.h b/toolsrc/include/PostBuildLint_BuildPolicies.h
index ecada374a..32f585ef0 100644
--- a/toolsrc/include/PostBuildLint_BuildPolicies.h
+++ b/toolsrc/include/PostBuildLint_BuildPolicies.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <string>
 #include <array>
+#include <string>
 
 namespace vcpkg::PostBuildLint
 {
@@ -18,7 +18,7 @@ namespace vcpkg::PostBuildLint
         static BuildPolicies parse(const std::string& s);
 
         constexpr BuildPolicies() : backing_enum(BackingEnum::NULLVALUE) {}
-        constexpr explicit BuildPolicies(BackingEnum backing_enum) : backing_enum(backing_enum) { }
+        constexpr explicit BuildPolicies(BackingEnum backing_enum) : backing_enum(backing_enum) {}
         constexpr operator BackingEnum() const { return backing_enum; }
 
         const std::string& to_string() const;
@@ -38,5 +38,8 @@ namespace vcpkg::PostBuildLint
         static constexpr BuildPolicies ONLY_RELEASE_CRT(BuildPolicies::BackingEnum::ONLY_RELEASE_CRT);
         static constexpr BuildPolicies EMPTY_INCLUDE_FOLDER(BuildPolicies::BackingEnum::EMPTY_INCLUDE_FOLDER);
 
-        static constexpr std::array<BuildPolicies, 4> VALUES = { EMPTY_PACKAGE,DLLS_WITHOUT_LIBS, ONLY_RELEASE_CRT, EMPTY_INCLUDE_FOLDER };
-    }}
+        static constexpr std::array<BuildPolicies, 4> VALUES = {
+            EMPTY_PACKAGE, DLLS_WITHOUT_LIBS, ONLY_RELEASE_CRT, EMPTY_INCLUDE_FOLDER
+        };
+    }
+}
diff --git a/toolsrc/include/PostBuildLint_BuildType.h b/toolsrc/include/PostBuildLint_BuildType.h
index 55a5878a9..a1da7729c 100644
--- a/toolsrc/include/PostBuildLint_BuildType.h
+++ b/toolsrc/include/PostBuildLint_BuildType.h
@@ -20,11 +20,10 @@ namespace vcpkg::PostBuildLint
 
         BuildType() = delete;
 
-        constexpr explicit BuildType(const BackingEnum backing_enum, const ConfigurationType config, const LinkageType linkage)
-            :
-            backing_enum(backing_enum)
-            , m_config(config)
-            , m_linkage(linkage) { }
+        constexpr BuildType(const BackingEnum backing_enum, const ConfigurationType config, const LinkageType linkage)
+            : backing_enum(backing_enum), m_config(config), m_linkage(linkage)
+        {
+        }
 
         constexpr operator BackingEnum() const { return backing_enum; }
 
@@ -41,12 +40,19 @@ namespace vcpkg::PostBuildLint
 
     namespace BuildTypeC
     {
+        namespace CC = ConfigurationTypeC;
+        namespace LC = LinkageTypeC;
+        using BE = BuildType::BackingEnum;
+
         static constexpr const char* ENUM_NAME = "vcpkg::PostBuildLint::BuildType";
 
-        static constexpr BuildType DEBUG_STATIC = BuildType(BuildType::BackingEnum::DEBUG_STATIC, ConfigurationTypeC::DEBUG, LinkageTypeC::STATIC);
-        static constexpr BuildType DEBUG_DYNAMIC = BuildType(BuildType::BackingEnum::DEBUG_DYNAMIC, ConfigurationTypeC::DEBUG, LinkageTypeC::DYNAMIC);
-        static constexpr BuildType RELEASE_STATIC = BuildType(BuildType::BackingEnum::RELEASE_STATIC, ConfigurationTypeC::RELEASE, LinkageTypeC::STATIC);
-        static constexpr BuildType RELEASE_DYNAMIC = BuildType(BuildType::BackingEnum::RELEASE_DYNAMIC, ConfigurationTypeC::RELEASE, LinkageTypeC::DYNAMIC);
+        static constexpr BuildType DEBUG_STATIC = { BE::DEBUG_STATIC, CC::DEBUG, LC::STATIC };
+        static constexpr BuildType DEBUG_DYNAMIC = { BE::DEBUG_DYNAMIC, CC::DEBUG, LC::DYNAMIC };
+        static constexpr BuildType RELEASE_STATIC = { BE::RELEASE_STATIC, CC::RELEASE, LC::STATIC };
+        static constexpr BuildType RELEASE_DYNAMIC = { BE::RELEASE_DYNAMIC, CC::RELEASE, LC::DYNAMIC };
 
-        static constexpr std::array<BuildType, 4> VALUES = { DEBUG_STATIC, DEBUG_DYNAMIC, RELEASE_STATIC, RELEASE_DYNAMIC };
-    }}
+        static constexpr std::array<BuildType, 4> VALUES = {
+            DEBUG_STATIC, DEBUG_DYNAMIC, RELEASE_STATIC, RELEASE_DYNAMIC
+        };
+    }
+}
diff --git a/toolsrc/include/PostBuildLint_ConfigurationType.h b/toolsrc/include/PostBuildLint_ConfigurationType.h
index 710547b85..60f759813 100644
--- a/toolsrc/include/PostBuildLint_ConfigurationType.h
+++ b/toolsrc/include/PostBuildLint_ConfigurationType.h
@@ -14,7 +14,7 @@ namespace vcpkg::PostBuildLint
         };
 
         constexpr ConfigurationType() : backing_enum(BackingEnum::NULLVALUE) {}
-        constexpr explicit ConfigurationType(BackingEnum backing_enum) : backing_enum(backing_enum) { }
+        constexpr explicit ConfigurationType(BackingEnum backing_enum) : backing_enum(backing_enum) {}
         constexpr operator BackingEnum() const { return backing_enum; }
 
         const std::string& to_string() const;
diff --git a/toolsrc/include/PostBuildLint_LinkageType.h b/toolsrc/include/PostBuildLint_LinkageType.h
index 9855b485e..fe9b502ef 100644
--- a/toolsrc/include/PostBuildLint_LinkageType.h
+++ b/toolsrc/include/PostBuildLint_LinkageType.h
@@ -15,7 +15,7 @@ namespace vcpkg::PostBuildLint
         static LinkageType value_of(const std::string& as_string);
 
         constexpr LinkageType() : backing_enum(BackingEnum::NULLVALUE) {}
-        constexpr explicit LinkageType(BackingEnum backing_enum) : backing_enum(backing_enum) { }
+        constexpr explicit LinkageType(BackingEnum backing_enum) : backing_enum(backing_enum) {}
         constexpr operator BackingEnum() const { return backing_enum; }
 
         const std::string& to_string() const;
diff --git a/toolsrc/include/SortedVector.h b/toolsrc/include/SortedVector.h
index 2dce8eb3b..62808cc2f 100644
--- a/toolsrc/include/SortedVector.h
+++ b/toolsrc/include/SortedVector.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <vector>
 #include <algorithm>
+#include <vector>
 
 // Add more forwarding functions to the m_data std::vector as needed.
 namespace vcpkg
 {
-    template <class T>
+    template<class T>
     class SortedVector
     {
     public:
@@ -23,7 +23,7 @@ namespace vcpkg
             }
         }
 
-        template <class Compare>
+        template<class Compare>
         SortedVector(std::vector<T> v, Compare comp) : m_data(std::move(v))
         {
             if (!std::is_sorted(m_data.cbegin(), m_data.cend(), comp))
@@ -32,35 +32,17 @@ namespace vcpkg
             }
         }
 
-        iterator begin() const
-        {
-            return this->m_data.cbegin();
-        }
+        iterator begin() const { return this->m_data.cbegin(); }
 
-        iterator end() const
-        {
-            return this->m_data.cend();
-        }
+        iterator end() const { return this->m_data.cend(); }
 
-        iterator cbegin() const
-        {
-            return this->m_data.cbegin();
-        }
+        iterator cbegin() const { return this->m_data.cbegin(); }
 
-        iterator cend() const
-        {
-            return this->m_data.cend();
-        }
+        iterator cend() const { return this->m_data.cend(); }
 
-        bool empty() const
-        {
-            return this->m_data.empty();
-        }
+        bool empty() const { return this->m_data.empty(); }
 
-        size_type size() const
-        {
-            return this->m_data.size();
-        }
+        size_type size() const { return this->m_data.size(); }
 
     private:
         std::vector<T> m_data;
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index b66fa131b..8d51b45d4 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace vcpkg
 {
diff --git a/toolsrc/include/StatusParagraph.h b/toolsrc/include/StatusParagraph.h
index a71fb7893..ad913d11b 100644
--- a/toolsrc/include/StatusParagraph.h
+++ b/toolsrc/include/StatusParagraph.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <unordered_map>
 #include "BinaryParagraph.h"
+#include <unordered_map>
 
 namespace vcpkg
 {
diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/StatusParagraphs.h
index fcfe99b5a..2af177219 100644
--- a/toolsrc/include/StatusParagraphs.h
+++ b/toolsrc/include/StatusParagraphs.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "StatusParagraph.h"
-#include <memory>
 #include <iterator>
+#include <memory>
 
 namespace vcpkg
 {
@@ -14,10 +14,7 @@ namespace vcpkg
         using iterator = container::reverse_iterator;
         using const_iterator = container::const_reverse_iterator;
 
-        const_iterator find(const PackageSpec& spec) const
-        {
-            return find(spec.name(), spec.triplet());
-        }
+        const_iterator find(const PackageSpec& spec) const { return find(spec.name(), spec.triplet()); }
         const_iterator find(const std::string& name, const Triplet& triplet) const;
         iterator find(const std::string& name, const Triplet& triplet);
 
@@ -31,25 +28,13 @@ namespace vcpkg
 
         friend void serialize(const StatusParagraphs& pgh, std::string& out_str);
 
-        iterator end()
-        {
-            return paragraphs.rend();
-        }
+        iterator end() { return paragraphs.rend(); }
 
-        const_iterator end() const
-        {
-            return paragraphs.rend();
-        }
+        const_iterator end() const { return paragraphs.rend(); }
 
-        iterator begin()
-        {
-            return paragraphs.rbegin();
-        }
+        iterator begin() { return paragraphs.rbegin(); }
 
-        const_iterator begin() const
-        {
-            return paragraphs.rbegin();
-        }
+        const_iterator begin() const { return paragraphs.rbegin(); }
 
     private:
         std::vector<std::unique_ptr<StatusParagraph>> paragraphs;
diff --git a/toolsrc/include/VcpkgCmdArguments.h b/toolsrc/include/VcpkgCmdArguments.h
index 966ecfa16..1738f1411 100644
--- a/toolsrc/include/VcpkgCmdArguments.h
+++ b/toolsrc/include/VcpkgCmdArguments.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "OptBool.h"
 #include <memory>
-#include <vector>
 #include <unordered_set>
-#include "OptBool.h"
+#include <vector>
 
 namespace vcpkg
 {
@@ -15,12 +15,13 @@ namespace vcpkg
         std::unique_ptr<std::string> vcpkg_root_dir;
         std::unique_ptr<std::string> triplet;
         OptBool debug = OptBoolC::UNSPECIFIED;
-        OptBool  sendmetrics = OptBoolC::UNSPECIFIED;
-        OptBool  printmetrics = OptBoolC::UNSPECIFIED;
+        OptBool sendmetrics = OptBoolC::UNSPECIFIED;
+        OptBool printmetrics = OptBoolC::UNSPECIFIED;
 
         std::string command;
         std::vector<std::string> command_arguments;
-        std::unordered_set<std::string> check_and_get_optional_command_arguments(const std::vector<std::string>& valid_options) const;
+        std::unordered_set<std::string>
+        check_and_get_optional_command_arguments(const std::vector<std::string>& valid_options) const;
 
         void check_max_arg_count(const size_t expected_arg_count) const;
         void check_max_arg_count(const size_t expected_arg_count, const std::string& example_text) const;
diff --git a/toolsrc/include/VcpkgPaths.h b/toolsrc/include/VcpkgPaths.h
index fdc4ad235..25c1728b9 100644
--- a/toolsrc/include/VcpkgPaths.h
+++ b/toolsrc/include/VcpkgPaths.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "filesystem_fs.h"
-#include "vcpkg_expected.h"
-#include "PackageSpec.h"
 #include "BinaryParagraph.h"
 #include "Lazy.h"
+#include "PackageSpec.h"
+#include "filesystem_fs.h"
 #include "vcpkg_Files.h"
+#include "vcpkg_expected.h"
 
 namespace vcpkg
 {
diff --git a/toolsrc/include/Version.cpp b/toolsrc/include/Version.cpp
deleted file mode 100644
index 6b9f3da54..000000000
--- a/toolsrc/include/Version.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "pch.h"
-#include "Version.h"
-#include "vcpkg_Strings.h"
-
-namespace vcpkg
-{
-    Version::Version() : value("0.0.0") {}
-    Version::Version(const std::string& value) : value(value) {}
-    bool operator==(const Version& left, const Version& right) { return left.value == right.value; }
-    bool operator!=(const Version& left, const Version& right) { return left.value != right.value; }
-    std::string to_printf_arg(const Version& version) { return version.value; }
-
-    version_diff_t::version_diff_t() : left(), right() {}
-    version_diff_t::version_diff_t(const Version& left, const Version& right) : left(left), right(right) {}
-
-    std::string version_diff_t::toString() const
-    {
-        return Strings::format("%s -> %s", left.value, right.value);
-    }
-}
diff --git a/toolsrc/include/Version.h b/toolsrc/include/Version.h
deleted file mode 100644
index 9d81ce829..000000000
--- a/toolsrc/include/Version.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-#include <string>
-
-namespace vcpkg
-{
-    struct Version
-    {
-        Version();
-        Version(const std::string& value);
-
-        std::string value;
-    };
-
-    bool operator ==(const Version& left, const Version& right);
-    bool operator !=(const Version& left, const Version& right);
-    std::string to_printf_arg(const Version& version);
-
-    struct version_diff_t
-    {
-        Version left;
-        Version right;
-
-        version_diff_t();
-        version_diff_t(const Version& left, const Version& right);
-
-        std::string toString() const;
-    };
-}
diff --git a/toolsrc/include/VersionT.cpp b/toolsrc/include/VersionT.cpp
deleted file mode 100644
index 6ea5d3810..000000000
--- a/toolsrc/include/VersionT.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "pch.h"
-#include "VersionT.h"
-#include "vcpkg_Strings.h"
-
-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; }
-
-    VersionDiff::VersionDiff() : left(), right() {}
-    VersionDiff::VersionDiff(const VersionT& left, const VersionT& right) : left(left), right(right) {}
-
-    std::string VersionDiff::to_string() const
-    {
-        return Strings::format("%s -> %s", left.value, right.value);
-    }
-}
diff --git a/toolsrc/include/VersionT.h b/toolsrc/include/VersionT.h
index 36d050e08..67efd8da3 100644
--- a/toolsrc/include/VersionT.h
+++ b/toolsrc/include/VersionT.h
@@ -13,8 +13,8 @@ namespace vcpkg
         std::string value;
     };
 
-    bool operator ==(const VersionT& left, const VersionT& right);
-    bool operator !=(const VersionT& left, const VersionT& right);
+    bool operator==(const VersionT& left, const VersionT& right);
+    bool operator!=(const VersionT& left, const VersionT& right);
 
     struct VersionDiff
     {
diff --git a/toolsrc/include/coff_file_reader.h b/toolsrc/include/coff_file_reader.h
index 197a61f43..09f6447c2 100644
--- a/toolsrc/include/coff_file_reader.h
+++ b/toolsrc/include/coff_file_reader.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <vector>
 #include "MachineType.h"
 #include "filesystem_fs.h"
+#include <vector>
 
 namespace vcpkg::COFFFileReader
 {
diff --git a/toolsrc/include/lazy.h b/toolsrc/include/lazy.h
index 9a7107002..58c11c002 100644
--- a/toolsrc/include/lazy.h
+++ b/toolsrc/include/lazy.h
@@ -2,13 +2,13 @@
 
 namespace vcpkg
 {
-    template <typename T>
+    template<typename T>
     class Lazy
     {
     public:
         Lazy() : value(T()), initialized(false) {}
 
-        template <class F>
+        template<class F>
         T const& get_lazy(const F& f) const
         {
             if (!initialized)
diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h
index ea6808e05..4d837bc47 100644
--- a/toolsrc/include/triplet.h
+++ b/toolsrc/include/triplet.h
@@ -30,7 +30,7 @@ namespace vcpkg
 
 namespace std
 {
-    template <>
+    template<>
     struct hash<vcpkg::Triplet>
     {
         size_t operator()(const vcpkg::Triplet& t) const
diff --git a/toolsrc/include/vcpkg_Checks.h b/toolsrc/include/vcpkg_Checks.h
index 8e7a35f4d..4f7d2744a 100644
--- a/toolsrc/include/vcpkg_Checks.h
+++ b/toolsrc/include/vcpkg_Checks.h
@@ -1,35 +1,26 @@
 #pragma once
 
-#include "vcpkg_Strings.h"
 #include "LineInfo.h"
+#include "vcpkg_Strings.h"
 
 namespace vcpkg::Checks
 {
-    [[noreturn]]
-    void unreachable(const LineInfo& line_info);
+    [[noreturn]] void unreachable(const LineInfo& line_info);
 
-    [[noreturn]]
-    void exit_with_code(const LineInfo& line_info, const int exit_code);
+    [[noreturn]] void exit_with_code(const LineInfo& line_info, const int exit_code);
 
-    [[noreturn]]
-    inline void exit_fail(const LineInfo& line_info)
-    {
-        exit_with_code(line_info, EXIT_FAILURE);
-    }
+    [[noreturn]] inline void exit_fail(const LineInfo& line_info) { exit_with_code(line_info, EXIT_FAILURE); }
 
-    [[noreturn]]
-    inline void exit_success(const LineInfo& line_info)
-    {
-        exit_with_code(line_info, EXIT_SUCCESS);
-    }
+    [[noreturn]] inline void exit_success(const LineInfo& line_info) { exit_with_code(line_info, EXIT_SUCCESS); }
 
-    // Part of the reason these exist is to not include extra headers in this one to avoid circular #includes. 
-    [[noreturn]]
-    void exit_with_message(const LineInfo& line_info, const CStringView errorMessage);
+    // Part of the reason these exist is to not include extra headers in this one to avoid circular #includes.
+    [[noreturn]] void exit_with_message(const LineInfo& line_info, const CStringView errorMessage);
 
-    template <class Arg1, class...Args>
-    [[noreturn]]
-    void exit_with_message(const LineInfo& line_info, const char* errorMessageTemplate, const Arg1 errorMessageArg1, const Args&... errorMessageArgs)
+    template<class Arg1, class... Args>
+    [[noreturn]] void exit_with_message(const LineInfo& line_info,
+                                        const char* errorMessageTemplate,
+                                        const Arg1 errorMessageArg1,
+                                        const Args&... errorMessageArgs)
     {
         exit_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...));
     }
@@ -38,8 +29,12 @@ namespace vcpkg::Checks
 
     void check_exit(const LineInfo& line_info, bool expression, const CStringView errorMessage);
 
-    template <class Arg1, class...Args>
-    void check_exit(const LineInfo& line_info, bool expression, const char* errorMessageTemplate, const Arg1 errorMessageArg1, const Args&... errorMessageArgs)
+    template<class Arg1, class... Args>
+    void check_exit(const LineInfo& line_info,
+                    bool expression,
+                    const char* errorMessageTemplate,
+                    const Arg1 errorMessageArg1,
+                    const Args&... errorMessageArgs)
     {
         if (!expression)
         {
diff --git a/toolsrc/include/vcpkg_Chrono.h b/toolsrc/include/vcpkg_Chrono.h
index 8c6bd1eca..c14019ff9 100644
--- a/toolsrc/include/vcpkg_Chrono.h
+++ b/toolsrc/include/vcpkg_Chrono.h
@@ -12,16 +12,13 @@ namespace vcpkg
 
         constexpr ElapsedTime() : m_start_tick() {}
 
-        template <class TimeUnit>
+        template<class TimeUnit>
         TimeUnit elapsed() const
         {
             return std::chrono::duration_cast<TimeUnit>(std::chrono::high_resolution_clock::now() - this->m_start_tick);
         }
 
-        double microseconds() const
-        {
-            return elapsed<std::chrono::duration<double, std::micro>>().count();
-        }
+        double microseconds() const { return elapsed<std::chrono::duration<double, std::micro>>().count(); }
 
         std::string to_string() const;
 
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);
     }
diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg_Dependencies.h
index ec3759a64..018c4f5cf 100644
--- a/toolsrc/include/vcpkg_Dependencies.h
+++ b/toolsrc/include/vcpkg_Dependencies.h
@@ -1,9 +1,9 @@
 #pragma once
-#include <vector>
 #include "PackageSpec.h"
 #include "StatusParagraphs.h"
 #include "VcpkgPaths.h"
 #include "vcpkg_optional.h"
+#include <vector>
 
 namespace vcpkg::Dependencies
 {
@@ -97,9 +97,14 @@ namespace vcpkg::Dependencies
         RequestType request_type;
     };
 
-    std::vector<InstallPlanAction> create_install_plan(const VcpkgPaths& paths, const std::vector<PackageSpec>& specs, const StatusParagraphs& status_db);
+    std::vector<InstallPlanAction> create_install_plan(const VcpkgPaths& paths,
+                                                       const std::vector<PackageSpec>& specs,
+                                                       const StatusParagraphs& status_db);
 
-    std::vector<RemovePlanAction> create_remove_plan(const std::vector<PackageSpec>& specs, const StatusParagraphs& status_db);
+    std::vector<RemovePlanAction> create_remove_plan(const std::vector<PackageSpec>& specs,
+                                                     const StatusParagraphs& status_db);
 
-    std::vector<ExportPlanAction> create_export_plan(const VcpkgPaths& paths, const std::vector<PackageSpec>& specs, const StatusParagraphs& status_db);
+    std::vector<ExportPlanAction> create_export_plan(const VcpkgPaths& paths,
+                                                     const std::vector<PackageSpec>& specs,
+                                                     const StatusParagraphs& status_db);
 }
diff --git a/toolsrc/include/vcpkg_Enums.h b/toolsrc/include/vcpkg_Enums.h
index 3fea53de1..08fdc64bc 100644
--- a/toolsrc/include/vcpkg_Enums.h
+++ b/toolsrc/include/vcpkg_Enums.h
@@ -1,11 +1,10 @@
 #pragma once
-#include <string>
 #include "LineInfo.h"
+#include <string>
 
 namespace vcpkg::Enums
 {
     std::string nullvalue_to_string(const std::string& enum_name);
 
-    [[noreturn]]
-    void nullvalue_used(const LineInfo& line_info, const std::string& enum_name);
+    [[noreturn]] void nullvalue_used(const LineInfo& line_info, const std::string& enum_name);
 }
diff --git a/toolsrc/include/vcpkg_Files.h b/toolsrc/include/vcpkg_Files.h
index e88bca7b6..ad29ffa14 100644
--- a/toolsrc/include/vcpkg_Files.h
+++ b/toolsrc/include/vcpkg_Files.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "vcpkg_expected.h"
 #include "filesystem_fs.h"
+#include "vcpkg_expected.h"
 
 namespace vcpkg::Files
 {
@@ -26,7 +26,8 @@ namespace vcpkg::Files
         virtual bool create_directory(const fs::path& path, std::error_code& ec) = 0;
         virtual bool create_directories(const fs::path& path, std::error_code& ec) = 0;
         virtual void copy(const fs::path& oldpath, const fs::path& newpath, fs::copy_options opts) = 0;
-        virtual bool copy_file(const fs::path& oldpath, const fs::path& newpath, fs::copy_options opts, std::error_code& ec) = 0;
+        virtual bool copy_file(
+            const fs::path& oldpath, const fs::path& newpath, fs::copy_options opts, std::error_code& ec) = 0;
         virtual fs::file_status status(const fs::path& path, std::error_code& ec) const = 0;
     };
 
diff --git a/toolsrc/include/vcpkg_Graphs.h b/toolsrc/include/vcpkg_Graphs.h
index 97cd29236..3c8c024c2 100644
--- a/toolsrc/include/vcpkg_Graphs.h
+++ b/toolsrc/include/vcpkg_Graphs.h
@@ -16,7 +16,7 @@ namespace vcpkg::Graphs
         FULLY_EXPLORED
     };
 
-    template <class V, class U>
+    template<class V, class U>
     __interface AdjacencyProvider
     {
         std::vector<V> adjacency_list(const U& vertex) const;
@@ -24,7 +24,7 @@ namespace vcpkg::Graphs
         U load_vertex_data(const V& vertex) const;
     };
 
-    template <class V, class U>
+    template<class V, class U>
     static void topological_sort_internal(const V& vertex,
                                           const AdjacencyProvider<V, U>& f,
                                           std::unordered_map<V, ExplorationStatus>& exploration_status,
@@ -33,27 +33,24 @@ namespace vcpkg::Graphs
         ExplorationStatus& status = exploration_status[vertex];
         switch (status)
         {
-            case ExplorationStatus::FULLY_EXPLORED:
-                return;
-            case ExplorationStatus::PARTIALLY_EXPLORED:
-                Checks::exit_with_message(VCPKG_LINE_INFO, "cycle in graph");
+            case ExplorationStatus::FULLY_EXPLORED: return;
+            case ExplorationStatus::PARTIALLY_EXPLORED: Checks::exit_with_message(VCPKG_LINE_INFO, "cycle in graph");
             case ExplorationStatus::NOT_EXPLORED:
-                {
-                    status = ExplorationStatus::PARTIALLY_EXPLORED;
-                    U vertex_data = f.load_vertex_data(vertex);
-                    for (const V& neighbour : f.adjacency_list(vertex_data))
-                        topological_sort_internal(neighbour, f, exploration_status, sorted);
+            {
+                status = ExplorationStatus::PARTIALLY_EXPLORED;
+                U vertex_data = f.load_vertex_data(vertex);
+                for (const V& neighbour : f.adjacency_list(vertex_data))
+                    topological_sort_internal(neighbour, f, exploration_status, sorted);
 
-                    sorted.push_back(std::move(vertex_data));
-                    status = ExplorationStatus::FULLY_EXPLORED;
-                    return;
-                }
-            default:
-                Checks::unreachable(VCPKG_LINE_INFO);
+                sorted.push_back(std::move(vertex_data));
+                status = ExplorationStatus::FULLY_EXPLORED;
+                return;
+            }
+            default: Checks::unreachable(VCPKG_LINE_INFO);
         }
     }
 
-    template <class V, class U>
+    template<class V, class U>
     std::vector<U> topological_sort(const std::vector<V>& starting_vertices, const AdjacencyProvider<V, U>& f)
     {
         std::vector<U> sorted;
diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h
index 97fb09e3d..590cb98f0 100644
--- a/toolsrc/include/vcpkg_Input.h
+++ b/toolsrc/include/vcpkg_Input.h
@@ -1,14 +1,13 @@
 #pragma once
-#include <vector>
 #include "PackageSpec.h"
 #include "VcpkgPaths.h"
+#include <vector>
 
 namespace vcpkg::Input
 {
-    PackageSpec check_and_get_package_spec(
-        const std::string& package_spec_as_string,
-        const Triplet& default_triplet,
-        CStringView example_text);
+    PackageSpec check_and_get_package_spec(const std::string& package_spec_as_string,
+                                           const Triplet& default_triplet,
+                                           CStringView example_text);
 
     void check_triplet(const Triplet& t, const VcpkgPaths& paths);
 }
diff --git a/toolsrc/include/vcpkg_Maps.h b/toolsrc/include/vcpkg_Maps.h
index 0122b8bfb..aadd81c2b 100644
--- a/toolsrc/include/vcpkg_Maps.h
+++ b/toolsrc/include/vcpkg_Maps.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <map>
 #include <unordered_map>
 #include <unordered_set>
-#include <map>
 
 namespace vcpkg::Maps
 {
-    template <typename K, typename V>
+    template<typename K, typename V>
     std::vector<K> extract_keys(const std::unordered_map<K, V>& input_map)
     {
         std::vector<K> key_set;
@@ -17,7 +17,7 @@ namespace vcpkg::Maps
         return key_set;
     }
 
-    template <typename K, typename V>
+    template<typename K, typename V>
     std::vector<K> extract_keys(const std::map<K, V>& input_map)
     {
         std::vector<K> key_set;
diff --git a/toolsrc/include/vcpkg_Strings.h b/toolsrc/include/vcpkg_Strings.h
index d152eccf5..11c8b5a6a 100644
--- a/toolsrc/include/vcpkg_Strings.h
+++ b/toolsrc/include/vcpkg_Strings.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include "CStringView.h"
+#include <vector>
 
 namespace vcpkg::Strings::details
 {
@@ -11,62 +11,38 @@ namespace vcpkg::Strings::details
         return t.to_string();
     }
 
-    inline const char* to_printf_arg(const std::string& s)
-    {
-        return s.c_str();
-    }
+    inline const char* to_printf_arg(const std::string& s) { return s.c_str(); }
 
-    inline const char* to_printf_arg(const char* s)
-    {
-        return s;
-    }
+    inline const char* to_printf_arg(const char* s) { return s; }
 
-    inline int to_printf_arg(const int s)
-    {
-        return s;
-    }
+    inline int to_printf_arg(const int s) { return s; }
 
-    inline long long to_printf_arg(const long long s)
-    {
-        return s;
-    }
+    inline long long to_printf_arg(const long long s) { return s; }
 
-    inline double to_printf_arg(const double s)
-    {
-        return s;
-    }
+    inline double to_printf_arg(const double s) { return s; }
 
-    inline size_t to_printf_arg(const size_t s)
-    {
-        return s;
-    }
+    inline size_t to_printf_arg(const size_t s) { return s; }
 
     std::string format_internal(const char* fmtstr, ...);
 
-    inline const wchar_t* to_wprintf_arg(const std::wstring& s)
-    {
-        return s.c_str();
-    }
+    inline const wchar_t* to_wprintf_arg(const std::wstring& s) { return s.c_str(); }
 
-    inline const wchar_t* to_wprintf_arg(const wchar_t* s)
-    {
-        return s;
-    }
+    inline const wchar_t* to_wprintf_arg(const wchar_t* s) { return s; }
 
     std::wstring wformat_internal(const wchar_t* fmtstr, ...);
 }
 
 namespace vcpkg::Strings
 {
-    template <class...Args>
-    std::string format(const char* fmtstr, const Args&...args)
+    template<class... Args>
+    std::string format(const char* fmtstr, const Args&... args)
     {
         using vcpkg::Strings::details::to_printf_arg;
         return details::format_internal(fmtstr, to_printf_arg(to_printf_arg(args))...);
     }
 
-    template <class...Args>
-    std::wstring wformat(const wchar_t* fmtstr, const Args&...args)
+    template<class... Args>
+    std::wstring wformat(const wchar_t* fmtstr, const Args&... args)
     {
         using vcpkg::Strings::details::to_wprintf_arg;
         return details::wformat_internal(fmtstr, to_wprintf_arg(to_wprintf_arg(args))...);
@@ -80,11 +56,8 @@ namespace vcpkg::Strings
 
     std::string ascii_to_lowercase(const std::string& input);
 
-    template <class T, class Transformer, class CharType>
-    std::basic_string<CharType> join(
-        const CharType* delimiter,
-        const std::vector<T>& v,
-        Transformer transformer)
+    template<class T, class Transformer, class CharType>
+    std::basic_string<CharType> join(const CharType* delimiter, const std::vector<T>& v, Transformer transformer)
     {
         if (v.empty())
         {
@@ -104,12 +77,10 @@ namespace vcpkg::Strings
 
         return output;
     }
-    template <class T, class CharType>
-    std::basic_string<CharType> join(
-        const CharType* delimiter,
-        const std::vector<T>& v)
+    template<class T, class CharType>
+    std::basic_string<CharType> join(const CharType* delimiter, const std::vector<T>& v)
     {
-        return join(delimiter, v, [](const T& x) -> const T&{ return x; });
+        return join(delimiter, v, [](const T& x) -> const T& { return x; });
     }
 
     void trim(std::string* s);
diff --git a/toolsrc/include/vcpkg_System.h b/toolsrc/include/vcpkg_System.h
index 57d159bb5..c8deac38e 100644
--- a/toolsrc/include/vcpkg_System.h
+++ b/toolsrc/include/vcpkg_System.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <Windows.h>
-#include "vcpkg_Strings.h"
 #include "filesystem_fs.h"
+#include "vcpkg_Strings.h"
 #include "vcpkg_optional.h"
+#include <Windows.h>
 
 namespace vcpkg::System
 {
@@ -37,25 +37,25 @@ namespace vcpkg::System
     void print(const Color c, const CStringView message);
     void println(const Color c, const CStringView message);
 
-    template <class Arg1, class...Args>
+    template<class Arg1, class... Args>
     void print(const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
     {
         return print(Strings::format(messageTemplate, messageArg1, messageArgs...));
     }
 
-    template <class Arg1, class...Args>
+    template<class Arg1, class... Args>
     void print(const Color c, const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
     {
         return print(c, Strings::format(messageTemplate, messageArg1, messageArgs...));
     }
 
-    template <class Arg1, class...Args>
+    template<class Arg1, class... Args>
     void println(const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
     {
         return println(Strings::format(messageTemplate, messageArg1, messageArgs...));
     }
 
-    template <class Arg1, class...Args>
+    template<class Arg1, class... Args>
     void println(const Color c, const char* messageTemplate, const Arg1& messageArg1, const Args&... messageArgs)
     {
         return println(c, Strings::format(messageTemplate, messageArg1, messageArgs...));
diff --git a/toolsrc/include/vcpkg_Util.h b/toolsrc/include/vcpkg_Util.h
index b165001f4..6648302ac 100644
--- a/toolsrc/include/vcpkg_Util.h
+++ b/toolsrc/include/vcpkg_Util.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <vector>
 #include <utility>
+#include <vector>
 
 namespace vcpkg::Util
 {
@@ -47,7 +47,7 @@ namespace vcpkg::Util
     }
 
     template<class K, class V, class Container, class Func>
-     void group_by(const Container& cont, std::map<K, std::vector<const V*>>* output, Func f)
+    void group_by(const Container& cont, std::map<K, std::vector<const V*>>* output, Func f)
     {
         for (const V& element : cont)
         {
diff --git a/toolsrc/include/vcpkg_expected.h b/toolsrc/include/vcpkg_expected.h
index 044f47c8c..3a920022b 100644
--- a/toolsrc/include/vcpkg_expected.h
+++ b/toolsrc/include/vcpkg_expected.h
@@ -1,44 +1,31 @@
 #pragma once
 
-#include <system_error>
 #include "vcpkg_Checks.h"
+#include <system_error>
 
 namespace vcpkg
 {
-    template <class T>
+    template<class T>
     class Expected
     {
     public:
         // Constructors are intentionally implicit
-        Expected(const std::error_code& ec) : m_error_code(ec), m_t()
-        {
-        }
+        Expected(const std::error_code& ec) : m_error_code(ec), m_t() {}
 
-        Expected(std::errc ec) : Expected(std::make_error_code(ec))
-        {
-        }
+        Expected(std::errc ec) : Expected(std::make_error_code(ec)) {}
 
-        Expected(const T& t) : m_error_code(), m_t(t)
-        {
-        }
+        Expected(const T& t) : m_error_code(), m_t(t) {}
 
-        Expected(T&& t) : m_error_code(), m_t(std::move(t))
-        {
-        }
+        Expected(T&& t) : m_error_code(), m_t(std::move(t)) {}
 
-        Expected() : Expected(std::error_code(), T())
-        {
-        }
+        Expected() : Expected(std::error_code(), T()) {}
 
         Expected(const Expected&) = default;
         Expected(Expected&&) = default;
         Expected& operator=(const Expected&) = default;
         Expected& operator=(Expected&&) = default;
 
-        std::error_code error_code() const
-        {
-            return this->m_error_code;
-        }
+        std::error_code error_code() const { return this->m_error_code; }
 
         T&& value_or_exit(const LineInfo& line_info) &&
         {
diff --git a/toolsrc/include/vcpkg_optional.h b/toolsrc/include/vcpkg_optional.h
index 380e54f1c..3b94d5a5d 100644
--- a/toolsrc/include/vcpkg_optional.h
+++ b/toolsrc/include/vcpkg_optional.h
@@ -10,18 +10,18 @@ namespace vcpkg
 
     const static constexpr NullOpt nullopt{ 0 };
 
-    template <class T>
+    template<class T>
     class Optional
     {
     public:
-        constexpr Optional() : m_is_present(false), m_t() { }
+        constexpr Optional() : m_is_present(false), m_t() {}
 
         // Constructors are intentionally implicit
-        constexpr Optional(NullOpt) : m_is_present(false), m_t() { }
+        constexpr Optional(NullOpt) : m_is_present(false), m_t() {}
 
-        Optional(const T& t) : m_is_present(true), m_t(t) { }
+        Optional(const T& t) : m_is_present(true), m_t(t) {}
 
-        Optional(T&& t) : m_is_present(true), m_t(std::move(t)) { }
+        Optional(T&& t) : m_is_present(true), m_t(std::move(t)) {}
 
         T&& value_or_exit(const LineInfo& line_info) &&
         {
@@ -35,37 +35,25 @@ namespace vcpkg
             return this->m_t;
         }
 
-        constexpr explicit operator bool() const
-        {
-            return this->m_is_present;
-        }
+        constexpr explicit operator bool() const { return this->m_is_present; }
 
-        constexpr bool has_value() const
-        {
-            return m_is_present;
-        }
+        constexpr bool has_value() const { return m_is_present; }
 
-        template <class U>
+        template<class U>
         T value_or(U&& default_value) const &
         {
             return bool(*this) ? this->m_t : static_cast<T>(std::forward<U>(default_value));
         }
 
-        template <class U>
+        template<class U>
         T value_or(U&& default_value) &&
         {
             return bool(*this) ? std::move(this->m_t) : static_cast<T>(std::forward<U>(default_value));
         }
 
-        const T* get() const
-        {
-            return bool(*this) ? &this->m_t : nullptr;
-        }
+        const T* get() const { return bool(*this) ? &this->m_t : nullptr; }
 
-        T* get()
-        {
-            return bool(*this) ? &this->m_t : nullptr;
-        }
+        T* get() { return bool(*this) ? &this->m_t : nullptr; }
 
     private:
         void exit_if_null(const LineInfo& line_info) const
diff --git a/toolsrc/include/vcpkglib.h b/toolsrc/include/vcpkglib.h
index 853746923..df64e5463 100644
--- a/toolsrc/include/vcpkglib.h
+++ b/toolsrc/include/vcpkglib.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "SortedVector.h"
 #include "StatusParagraphs.h"
 #include "VcpkgPaths.h"
-#include "SortedVector.h"
 
 namespace vcpkg
 {
@@ -19,8 +19,8 @@ namespace vcpkg
     };
 
     std::vector<StatusParagraph*> get_installed_ports(const StatusParagraphs& status_db);
-    std::vector<StatusParagraphAndAssociatedFiles> get_installed_files(const VcpkgPaths& paths, const StatusParagraphs& status_db);
-
+    std::vector<StatusParagraphAndAssociatedFiles> get_installed_files(const VcpkgPaths& paths,
+                                                                       const StatusParagraphs& status_db);
 
     struct CMakeVariable
     {
@@ -32,6 +32,8 @@ namespace vcpkg
         std::wstring s;
     };
 
-    std::wstring make_cmake_cmd(const fs::path& cmake_exe, const fs::path& cmake_script, const std::vector<CMakeVariable>& pass_variables);
+    std::wstring make_cmake_cmd(const fs::path& cmake_exe,
+                                const fs::path& cmake_script,
+                                const std::vector<CMakeVariable>& pass_variables);
 
 } // namespace vcpkg
diff --git a/toolsrc/include/vcpkglib_helpers.h b/toolsrc/include/vcpkglib_helpers.h
index 8a08513f3..a8ddcde4d 100644
--- a/toolsrc/include/vcpkglib_helpers.h
+++ b/toolsrc/include/vcpkglib_helpers.h
@@ -4,11 +4,15 @@
 
 namespace vcpkg::details
 {
-    std::string optional_field(const std::unordered_map<std::string, std::string>& fields, const std::string& fieldname);
-    std::string remove_optional_field(std::unordered_map<std::string, std::string>* fields, const std::string& fieldname);
+    std::string optional_field(const std::unordered_map<std::string, std::string>& fields,
+                               const std::string& fieldname);
+    std::string remove_optional_field(std::unordered_map<std::string, std::string>* fields,
+                                      const std::string& fieldname);
 
-    std::string required_field(const std::unordered_map<std::string, std::string>& fields, const std::string& fieldname);
-    std::string remove_required_field(std::unordered_map<std::string, std::string>* fields, const std::string& fieldname);
+    std::string required_field(const std::unordered_map<std::string, std::string>& fields,
+                               const std::string& fieldname);
+    std::string remove_required_field(std::unordered_map<std::string, std::string>* fields,
+                                      const std::string& fieldname);
 
     std::string shorten_description(const std::string& desc);
 }