[vcpkg formatting] Fix format regex (#12369)

* [vcpkg formatting] correct the header regexes

* format

toolsrc/.clang-format

@@ -39,9 +39,9 @@ IncludeCategories:
     Priority: -1
   - Regex: '^<catch2/catch\.hpp>$'
     Priority: 1
-  - Regex: '^<vcpkg/base/*\.h>$'
+  - Regex: '^<vcpkg/base/.*\.h>$'
     Priority: 2
-  - Regex: '^<vcpkg/*\.h>$'
+  - Regex: '^<vcpkg/.*\.h>$'
     Priority: 3
   - Regex: '^<[a-z0-9_]*\.h>$'
     Priority: 4

toolsrc/include/vcpkg-test/util.h

@@ -2,12 +2,13 @@
 
 #include <catch2/catch.hpp>
 
-#include <memory>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/pragmas.h>
+
 #include <vcpkg/statusparagraph.h>
 
+#include <memory>
+
 #define CHECK_EC(ec)                                                                                                   \
     do                                                                                                                 \
     {                                                                                                                  \

toolsrc/include/vcpkg/archives.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg::Archives

toolsrc/include/vcpkg/base/chrono.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <chrono>
-#include <string>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/optional.h>
 
+#include <chrono>
+#include <string>
+
 namespace vcpkg::Chrono
 {
     class ElapsedTime

toolsrc/include/vcpkg/base/cofffilereader.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <vector>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/machinetype.h>
 
+#include <vector>
+
 namespace vcpkg::CoffFileReader
 {
     struct DllInfo

toolsrc/include/vcpkg/base/enums.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/lineinfo.h>
 
+#include <string>
+
 namespace vcpkg::Enums
 {
     std::string nullvalue_to_string(const CStringView enum_name);

toolsrc/include/vcpkg/base/expected.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <system_error>
-
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/stringliteral.h>
 
+#include <system_error>
+
 namespace vcpkg
 {
     template<class Err>

toolsrc/include/vcpkg/base/graphs.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/system.print.h>
+
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <vcpkg/base/checks.h>
-#include <vcpkg/base/system.print.h>
-
 namespace vcpkg::Graphs
 {
     enum class ExplorationStatus

toolsrc/include/vcpkg/base/hash.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/files.h>
 
+#include <string>
+
 namespace vcpkg::Hash
 {
     enum class Algorithm

toolsrc/include/vcpkg/base/json.h

@@ -1,5 +1,10 @@
 #pragma once
 
+#include <vcpkg/base/expected.h>
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/parse.h>
+#include <vcpkg/base/stringview.h>
+
 #include <stddef.h>
 #include <stdint.h>
 
@@ -8,11 +13,6 @@
 #include <utility>
 #include <vector>
 
-#include <vcpkg/base/expected.h>
-#include <vcpkg/base/files.h>
-#include <vcpkg/base/parse.h>
-#include <vcpkg/base/stringview.h>
-
 namespace vcpkg::Json
 {
     struct JsonStyle

toolsrc/include/vcpkg/base/optional.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <type_traits>
-#include <utility>
-
 #include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/pragmas.h>
 
+#include <type_traits>
+#include <utility>
+
 namespace vcpkg
 {
     struct NullOpt

toolsrc/include/vcpkg/base/parse.h

@@ -1,14 +1,15 @@
 #pragma once
 
-#include <memory>
-#include <string>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/stringview.h>
 #include <vcpkg/base/unicode.h>
+
 #include <vcpkg/textrowcol.h>
 
+#include <memory>
+#include <string>
+
 namespace vcpkg::Parse
 {
     struct IParseError

toolsrc/include/vcpkg/base/stringliteral.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/zstringview.h>
 
+#include <string>
+
 namespace vcpkg
 {
     struct StringLiteral : ZStringView

toolsrc/include/vcpkg/base/strings.h

@@ -1,11 +1,5 @@
 #pragma once
 
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-
-#include <vector>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/pragmas.h>
@@ -13,6 +7,12 @@
 #include <vcpkg/base/stringview.h>
 #include <vcpkg/base/view.h>
 
+#include <errno.h>
+#include <inttypes.h>
+#include <limits.h>
+
+#include <vector>
+
 namespace vcpkg::Strings::details
 {
     template<class T>

toolsrc/include/vcpkg/base/stringview.h

@@ -1,11 +1,11 @@
 #pragma once
 
+#include <vcpkg/base/optional.h>
+
 #include <limits>
 #include <string>
 #include <vector>
 
-#include <vcpkg/base/optional.h>
-
 namespace vcpkg
 {
     struct StringView

toolsrc/include/vcpkg/base/system.debug.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <atomic>
-
 #include <vcpkg/base/chrono.h>
 #include <vcpkg/base/system.print.h>
 
+#include <atomic>
+
 namespace vcpkg::Debug
 {
     extern std::atomic<bool> g_debugging;

toolsrc/include/vcpkg/base/system.process.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/zstringview.h>
+
 #include <functional>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <vcpkg/base/files.h>
-#include <vcpkg/base/zstringview.h>
-
 namespace vcpkg::System
 {
     struct CMakeVariable

toolsrc/include/vcpkg/base/zstringview.h

@@ -1,12 +1,12 @@
 #pragma once
 
+#include <vcpkg/base/stringview.h>
+
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
 #include <string>
 
-#include <vcpkg/base/stringview.h>
-
 namespace vcpkg
 {
     // A counted view of a null-terminated string

toolsrc/include/vcpkg/binarycaching.h

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/expected.h>
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/packagespec.h>
 #include <vcpkg/vcpkgpaths.h>
 

toolsrc/include/vcpkg/binarycaching.private.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/dependencies.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <string>
+
 namespace vcpkg
 {
     std::string reformat_version(const std::string& version, const std::string& abi_tag);

toolsrc/include/vcpkg/build.h

@@ -1,14 +1,10 @@
 #pragma once
 
-#include <array>
-#include <map>
-#include <set>
-#include <vector>
-
 #include <vcpkg/base/cstringview.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/system.process.h>
+
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/statusparagraphs.h>
@@ -16,6 +12,11 @@
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <array>
+#include <map>
+#include <set>
+#include <vector>
+
 namespace vcpkg
 {
     struct IBinaryProvider;

toolsrc/include/vcpkg/buildenvironment.h

@@ -1,9 +1,10 @@
+#include <vcpkg/base/system.process.h>
+
+#include <vcpkg/vcpkgpaths.h>
+
 #include <string>
 #include <vector>
 
-#include <vcpkg/base/system.process.h>
-#include <vcpkg/vcpkgpaths.h>
-
 namespace vcpkg
 {
     std::string make_cmake_cmd(const VcpkgPaths& paths,

toolsrc/include/vcpkg/cmakevars.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/optional.h>
+
 #include <vcpkg/portfileprovider.h>
 #include <vcpkg/vcpkgpaths.h>
 

toolsrc/include/vcpkg/commands.h

@@ -1,15 +1,15 @@
 #pragma once
 
-#include <array>
-#include <map>
-#include <vector>
-
 #include <vcpkg/build.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <array>
+#include <map>
+#include <vector>
+
 namespace vcpkg::Commands
 {
     using CommandTypeA = void (*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths, Triplet default_triplet);

toolsrc/include/vcpkg/dependencies.h

@@ -1,11 +1,8 @@
 #pragma once
 
-#include <functional>
-#include <map>
-#include <vector>
-
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/build.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/packagespec.h>
@@ -13,6 +10,10 @@
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <functional>
+#include <map>
+#include <vector>
+
 namespace vcpkg::Graphs
 {
     struct Randomizer;

toolsrc/include/vcpkg/export.chocolatey.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <vector>
-
 #include <vcpkg/dependencies.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <vector>
+
 namespace vcpkg::Export::Chocolatey
 {
     struct Options

toolsrc/include/vcpkg/export.ifw.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <string>
-#include <vector>
-
 #include <vcpkg/dependencies.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <string>
+#include <vector>
+
 namespace vcpkg::Export::IFW
 {
     struct Options

toolsrc/include/vcpkg/export.prefab.h

@@ -1,11 +1,12 @@
 #pragma once
 
-#include <vector>
-
 #include <vcpkg/base/system.h>
+
 #include <vcpkg/dependencies.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <vector>
+
 namespace vcpkg::Export::Prefab
 {
     constexpr int kFragmentSize = 3;

toolsrc/include/vcpkg/globalstate.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <atomic>
-#include <string>
-
 #include <vcpkg/base/chrono.h>
 #include <vcpkg/base/util.h>
 
+#include <atomic>
+#include <string>
+
 namespace vcpkg
 {
     struct GlobalState

toolsrc/include/vcpkg/help.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <string>
+
 namespace vcpkg::Help
 {
     extern const CommandStructure COMMAND_STRUCTURE;

toolsrc/include/vcpkg/install.h

@@ -1,13 +1,14 @@
 #pragma once
 
-#include <vector>
-
 #include <vcpkg/base/chrono.h>
+
 #include <vcpkg/build.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <vector>
+
 namespace vcpkg::Install
 {
     enum class KeepGoing

toolsrc/include/vcpkg/metrics.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/util.h>
 
+#include <string>
+
 namespace vcpkg::Metrics
 {
     struct Metrics : Util::ResourceBase

toolsrc/include/vcpkg/packagespec.h

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/expected.h>
 #include <vcpkg/base/optional.h>
+
 #include <vcpkg/platform-expression.h>
 #include <vcpkg/triplet.h>
 

toolsrc/include/vcpkg/paragraphparser.h

@@ -1,15 +1,16 @@
 #pragma once
 
+#include <vcpkg/base/expected.h>
+
+#include <vcpkg/packagespec.h>
+#include <vcpkg/textrowcol.h>
+
 #include <map>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <vcpkg/base/expected.h>
-#include <vcpkg/packagespec.h>
-#include <vcpkg/textrowcol.h>
-
 namespace vcpkg::Parse
 {
     struct ParseControlErrorInfo

toolsrc/include/vcpkg/paragraphs.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/expected.h>
+
 #include <vcpkg/binaryparagraph.h>
 #include <vcpkg/paragraphparser.h>
 #include <vcpkg/vcpkgpaths.h>

toolsrc/include/vcpkg/platform-expression.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <string>
-#include <unordered_map>
-
 #include <vcpkg/base/expected.h>
 #include <vcpkg/base/stringview.h>
 
+#include <string>
+#include <unordered_map>
+
 namespace vcpkg::PlatformExpression
 {
     // map of cmake variables and their values.

toolsrc/include/vcpkg/portfileprovider.h

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/expected.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/sourceparagraph.h>
 #include <vcpkg/vcpkgpaths.h>
 

toolsrc/include/vcpkg/postbuildlint.buildtype.h

@@ -1,11 +1,12 @@
 #pragma once
 
+#include <vcpkg/base/cstringview.h>
+
+#include <vcpkg/build.h>
+
 #include <array>
 #include <regex>
 
-#include <vcpkg/base/cstringview.h>
-#include <vcpkg/build.h>
-
 namespace vcpkg::PostBuildLint
 {
     struct BuildType

toolsrc/include/vcpkg/sourceparagraph.h

@@ -5,6 +5,7 @@
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/packagespec.h>
 #include <vcpkg/paragraphparser.h>
 #include <vcpkg/platform-expression.h>

toolsrc/include/vcpkg/statusparagraph.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <map>
-
 #include <vcpkg/binaryparagraph.h>
 
+#include <map>
+
 namespace vcpkg
 {
     enum class InstallState

toolsrc/include/vcpkg/statusparagraphs.h

@@ -1,9 +1,9 @@
 #pragma once
+#include <vcpkg/statusparagraph.h>
+
 #include <iterator>
 #include <memory>
 
-#include <vcpkg/statusparagraph.h>
-
 namespace vcpkg
 {
     /// <summary>Status paragraphs</summary>

toolsrc/include/vcpkg/tools.h

@@ -1,10 +1,10 @@
 #pragma once
 
+#include <vcpkg/base/files.h>
+
 #include <string>
 #include <utility>
 
-#include <vcpkg/base/files.h>
-
 namespace vcpkg
 {
     struct VcpkgPaths;

toolsrc/include/vcpkg/triplet.h

@@ -1,11 +1,12 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/system.h>
+
 #include <vcpkg/vcpkgcmdarguments.h>
 
+#include <string>
+
 namespace vcpkg
 {
     struct TripletInstance;

toolsrc/include/vcpkg/userconfig.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include <vcpkg/base/files.h>
 
+#include <string>
+
 namespace vcpkg
 {
     struct UserConfig

toolsrc/include/vcpkg/vcpkgcmdarguments.h

@@ -1,15 +1,15 @@
 #pragma once
 
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/stringliteral.h>
 
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
 namespace vcpkg
 {
     struct ParsedArguments

toolsrc/include/vcpkg/vcpkglib.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vcpkg/base/sortedvector.h>
+
 #include <vcpkg/statusparagraphs.h>
 #include <vcpkg/vcpkgpaths.h>
 

toolsrc/include/vcpkg/vcpkgpaths.h

@@ -5,6 +5,7 @@
 #include <vcpkg/base/lazy.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/binaryparagraph.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/tools.h>

toolsrc/src/vcpkg-fuzz/main.cpp

@@ -1,16 +1,17 @@
-#include <string.h>
-
-#include <iostream>
-#include <sstream>
-#include <utility>
-
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/stringview.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/unicode.h>
+
 #include <vcpkg/platform-expression.h>
 
+#include <string.h>
+
+#include <iostream>
+#include <sstream>
+#include <utility>
+
 using namespace vcpkg;
 
 namespace

toolsrc/src/vcpkg-test/arguments.cpp

@@ -1,9 +1,9 @@
 #include <catch2/catch.hpp>
 
-#include <vector>
-
 #include <vcpkg/vcpkgcmdarguments.h>
 
+#include <vector>
+
 using vcpkg::CommandSetting;
 using vcpkg::CommandStructure;
 using vcpkg::CommandSwitch;

toolsrc/src/vcpkg-test/binarycaching.cpp

@@ -1,8 +1,7 @@
 #include <catch2/catch.hpp>
 
-#include <string>
-
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/binarycaching.private.h>
 #include <vcpkg/dependencies.h>
@@ -10,6 +9,8 @@
 #include <vcpkg/sourceparagraph.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 
+#include <string>
+
 using namespace vcpkg;
 
 TEST_CASE ("reformat_version semver-ish", "[reformat_version]")

toolsrc/src/vcpkg-test/commands.build.cpp

@@ -1,13 +1,15 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/files.h>
+
+#include <vcpkg/commands.h>
+#include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
+
 #include <iterator>
 #include <string>
 
 #include <vcpkg-test/util.h>
-#include <vcpkg/base/files.h>
-#include <vcpkg/commands.h>
-#include <vcpkg/vcpkgcmdarguments.h>
-#include <vcpkg/vcpkgpaths.h>
 
 using namespace vcpkg;
 

toolsrc/src/vcpkg-test/commands.create.cpp

@@ -1,13 +1,14 @@
 #include <catch2/catch.hpp>
 
-#include <iterator>
-#include <string>
-
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 #include <vcpkg/vcpkgpaths.h>
 
+#include <iterator>
+#include <string>
+
 TEST_CASE ("create smoke test", "[commands-create]")
 {
     using namespace vcpkg;

toolsrc/src/vcpkg-test/dependencies.cpp

@@ -1,11 +1,12 @@
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/mockcmakevarprovider.h>
-#include <vcpkg-test/util.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/paragraphparser.h>
 #include <vcpkg/sourceparagraph.h>
 
+#include <vcpkg-test/mockcmakevarprovider.h>
+#include <vcpkg-test/util.h>
+
 using namespace vcpkg;
 using namespace vcpkg::Parse;
 

toolsrc/src/vcpkg-test/files.cpp

@@ -1,12 +1,13 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/strings.h>
+
 #include <iostream>
 #include <random>
 #include <vector>
 
 #include <vcpkg-test/util.h>
-#include <vcpkg/base/files.h>
-#include <vcpkg/base/strings.h>
 
 using vcpkg::Test::AllowSymlinks;
 using vcpkg::Test::base_temporary_directory;

toolsrc/src/vcpkg-test/hash.cpp

@@ -1,12 +1,12 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/hash.h>
+
 #include <algorithm>
 #include <iostream>
 #include <iterator>
 #include <map>
 
-#include <vcpkg/base/hash.h>
-
 namespace Hash = vcpkg::Hash;
 using vcpkg::StringView;
 

toolsrc/src/vcpkg-test/json.cpp

@@ -1,10 +1,11 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/json.h>
+#include <vcpkg/base/unicode.h>
+
 #include <iostream>
 
 #include "math.h"
-#include <vcpkg/base/json.h>
-#include <vcpkg/base/unicode.h>
 
 // TODO: remove this once we switch to C++20 completely
 // This is the worst, but we also can't really deal with it any other way.

toolsrc/src/vcpkg-test/manifests.cpp

@@ -1,11 +1,13 @@
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/sourceparagraph.h>
 
+#include <vcpkg-test/util.h>
+
 using namespace vcpkg;
 using namespace vcpkg::Paragraphs;
 using namespace vcpkg::Test;

toolsrc/src/vcpkg-test/optional.cpp

@@ -1,9 +1,9 @@
 #include <catch2/catch.hpp>
 
-#include <vector>
-
 #include <vcpkg/base/optional.h>
 
+#include <vector>
+
 namespace
 {
     struct identity_projection

toolsrc/src/vcpkg-test/paragraph.cpp

@@ -1,9 +1,11 @@
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/strings.h>
+
 #include <vcpkg/paragraphs.h>
 
+#include <vcpkg-test/util.h>
+
 namespace Strings = vcpkg::Strings;
 using vcpkg::Parse::Paragraph;
 

toolsrc/src/vcpkg-test/plan.cpp

@@ -1,16 +1,18 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/graphs.h>
+
+#include <vcpkg/dependencies.h>
+#include <vcpkg/portfileprovider.h>
+#include <vcpkg/sourceparagraph.h>
+#include <vcpkg/triplet.h>
+
 #include <memory>
 #include <unordered_map>
 #include <vector>
 
 #include <vcpkg-test/mockcmakevarprovider.h>
 #include <vcpkg-test/util.h>
-#include <vcpkg/base/graphs.h>
-#include <vcpkg/dependencies.h>
-#include <vcpkg/portfileprovider.h>
-#include <vcpkg/sourceparagraph.h>
-#include <vcpkg/triplet.h>
 
 using namespace vcpkg;
 

toolsrc/src/vcpkg-test/specifier.cpp

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/packagespec.h>
 
 using namespace vcpkg;

toolsrc/src/vcpkg-test/statusparagraphs.cpp

@@ -1,10 +1,12 @@
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/paragraphs.h>
 #include <vcpkg/statusparagraphs.h>
 
+#include <vcpkg-test/util.h>
+
 using namespace vcpkg;
 using namespace vcpkg::Paragraphs;
 using namespace vcpkg::Test;

toolsrc/src/vcpkg-test/strings.cpp

@@ -1,13 +1,13 @@
 #include <catch2/catch.hpp>
 
+#include <vcpkg/base/strings.h>
+
 #include <stdint.h>
 
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <vcpkg/base/strings.h>
-
 TEST_CASE ("b32 encoding", "[strings]")
 {
     using u64 = uint64_t;

toolsrc/src/vcpkg-test/system.cpp

@@ -2,8 +2,6 @@
 
 #include <catch2/catch.hpp>
 
-#include <string>
-
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/stringview.h>
@@ -11,6 +9,8 @@
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/zstringview.h>
 
+#include <string>
+
 using vcpkg::nullopt;
 using vcpkg::Optional;
 using vcpkg::StringView;

toolsrc/src/vcpkg-test/update.cpp

@@ -1,9 +1,11 @@
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/sortedvector.h>
+
 #include <vcpkg/update.h>
 
+#include <vcpkg-test/util.h>
+
 using namespace vcpkg;
 using namespace vcpkg::Update;
 using namespace vcpkg::Test;

toolsrc/src/vcpkg-test/util.cpp

@@ -2,12 +2,14 @@
 
 #include <catch2/catch.hpp>
 
-#include <vcpkg-test/util.h>
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/statusparagraph.h>
 
+#include <vcpkg-test/util.h>
+
 // used to get the implementation specific compiler flags (i.e., __cpp_lib_filesystem)
 #include <ciso646>
 #include <iostream>

toolsrc/src/vcpkg.cpp

@@ -1,10 +1,5 @@
 #include <vcpkg/base/system_headers.h>
 
-#include <cassert>
-#include <fstream>
-#include <memory>
-#include <random>
-
 #include <vcpkg/base/chrono.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/pragmas.h>
@@ -12,6 +7,7 @@
 #include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/globalstate.h>
 #include <vcpkg/help.h>
@@ -21,6 +17,11 @@
 #include <vcpkg/userconfig.h>
 #include <vcpkg/vcpkglib.h>
 
+#include <cassert>
+#include <fstream>
+#include <memory>
+#include <random>
+
 #if defined(_WIN32)
 #pragma comment(lib, "ole32")
 #pragma comment(lib, "shell32")

toolsrc/src/vcpkg/archives.cpp

@@ -1,7 +1,8 @@
 #include "pch.h"
 
-#include <vcpkg/archives.h>
 #include <vcpkg/base/system.process.h>
+
+#include <vcpkg/archives.h>
 #include <vcpkg/commands.h>
 
 namespace vcpkg::Archives

toolsrc/src/vcpkg/base/json.cpp

@@ -1,12 +1,12 @@
 #include "pch.h"
 
-#include <inttypes.h>
-
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/unicode.h>
 
+#include <inttypes.h>
+
 namespace vcpkg::Json
 {
     using VK = ValueKind;

toolsrc/src/vcpkg/base/parse.cpp

@@ -1,13 +1,14 @@
 #include "pch.h"
 
-#include <utility>
-
 #include <vcpkg/base/parse.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/packagespec.h>
 #include <vcpkg/paragraphparser.h>
 
+#include <utility>
+
 using namespace vcpkg;
 
 namespace vcpkg::Parse

toolsrc/src/vcpkg/base/stringview.cpp

@@ -1,11 +1,11 @@
 #include "pch.h"
 
-#include <cstring>
-
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/lineinfo.h>
 #include <vcpkg/base/stringview.h>
 
+#include <cstring>
+
 namespace vcpkg
 {
     std::vector<StringView> StringView::find_all_enclosed(const StringView& input,

toolsrc/src/vcpkg/base/system.cpp

@@ -1,13 +1,13 @@
 #include "pch.h"
 
-#include <ctime>
-
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/chrono.h>
 #include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/util.h>
 
+#include <ctime>
+
 using namespace vcpkg::System;
 
 namespace vcpkg

toolsrc/src/vcpkg/base/system.process.cpp

@@ -1,7 +1,5 @@
 #include "pch.h"
 
-#include <ctime>
-
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/chrono.h>
 #include <vcpkg/base/system.debug.h>
@@ -9,6 +7,8 @@
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
 
+#include <ctime>
+
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>
 #endif

toolsrc/src/vcpkg/base/uint128.cpp

@@ -1,7 +1,7 @@
-#include <limits>
-
 #include <vcpkg/base/uint128.h>
 
+#include <limits>
+
 namespace vcpkg
 {
     UInt128& UInt128::operator<<=(int by) noexcept

toolsrc/src/vcpkg/binarycaching.cpp

@@ -6,6 +6,7 @@
 #include <vcpkg/base/system.debug.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
+
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/binarycaching.private.h>
 #include <vcpkg/build.h>

toolsrc/src/vcpkg/binaryparagraph.cpp

@@ -3,6 +3,7 @@
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/binaryparagraph.h>
 #include <vcpkg/paragraphparser.h>
 #include <vcpkg/paragraphs.h>

toolsrc/src/vcpkg/build.cpp

@@ -11,6 +11,7 @@
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/build.h>
 #include <vcpkg/buildenvironment.h>

toolsrc/src/vcpkg/cmakevars.cpp

@@ -5,6 +5,7 @@
 #include <vcpkg/base/span.h>
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/buildenvironment.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/dependencies.h>

toolsrc/src/vcpkg/commands.autocomplete.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/install.h>
 #include <vcpkg/metrics.h>

toolsrc/src/vcpkg/commands.cache.cpp

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/binaryparagraph.h>
 #include <vcpkg/commands.h>
 #include <vcpkg/help.h>

toolsrc/src/vcpkg/commands.ci.cpp

@@ -6,6 +6,7 @@
 #include <vcpkg/base/stringliteral.h>
 #include <vcpkg/base/system.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/build.h>
 #include <vcpkg/commands.h>

toolsrc/src/vcpkg/commands.ciclean.cpp

@@ -3,6 +3,7 @@
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/vcpkgcmdarguments.h>
 

toolsrc/src/vcpkg/commands.contact.cpp

@@ -3,6 +3,7 @@
 #include <vcpkg/base/chrono.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/help.h>
 #include <vcpkg/userconfig.h>

toolsrc/src/vcpkg/commands.cpp

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/hash.h>
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/build.h>
 #include <vcpkg/commands.h>
 #include <vcpkg/export.h>

toolsrc/src/vcpkg/commands.create.cpp

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/checks.h>
 #include <vcpkg/base/files.h>
+
 #include <vcpkg/buildenvironment.h>
 #include <vcpkg/commands.h>
 #include <vcpkg/help.h>

toolsrc/src/vcpkg/commands.dependinfo.cpp

@@ -1,10 +1,9 @@
 #include "pch.h"
 
-#include <vector>
-
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/help.h>
@@ -12,6 +11,8 @@
 #include <vcpkg/install.h>
 #include <vcpkg/packagespec.h>
 
+#include <vector>
+
 using vcpkg::Dependencies::ActionPlan;
 using vcpkg::Dependencies::InstallPlanAction;
 using vcpkg::PortFileProvider::PathsPortFileProvider;

toolsrc/src/vcpkg/commands.edit.cpp

@@ -1,14 +1,15 @@
 #include "pch.h"
 
-#include <limits.h>
-
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/help.h>
 #include <vcpkg/paragraphs.h>
 
+#include <limits.h>
+
 #if defined(_WIN32)
 namespace
 {

toolsrc/src/vcpkg/commands.env.cpp

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/strings.h>
 #include <vcpkg/base/system.process.h>
+
 #include <vcpkg/build.h>
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/commands.h>

toolsrc/src/vcpkg/commands.exportifw.cpp

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/export.h>
 #include <vcpkg/export.ifw.h>

toolsrc/src/vcpkg/commands.format-manifest.cpp

@@ -4,6 +4,7 @@
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/json.h>
 #include <vcpkg/base/system.debug.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/portfileprovider.h>
 

toolsrc/src/vcpkg/commands.integrate.cpp

@@ -6,6 +6,7 @@
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/metrics.h>
 #include <vcpkg/userconfig.h>

toolsrc/src/vcpkg/commands.list.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/help.h>
 #include <vcpkg/vcpkglib.h>

toolsrc/src/vcpkg/commands.owns.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/help.h>
 #include <vcpkg/vcpkglib.h>

toolsrc/src/vcpkg/commands.porthistory.cpp

@@ -3,6 +3,7 @@
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/help.h>
 

toolsrc/src/vcpkg/commands.portsdiff.cpp

@@ -4,6 +4,7 @@
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/system.process.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/help.h>
 #include <vcpkg/paragraphs.h>

toolsrc/src/vcpkg/commands.search.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/globalstate.h>

toolsrc/src/vcpkg/commands.setinstalled.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/commands.h>
 #include <vcpkg/globalstate.h>

toolsrc/src/vcpkg/commands.upgrade.cpp

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/system.print.h>
 #include <vcpkg/base/util.h>
+
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/commands.h>
 #include <vcpkg/dependencies.h>

toolsrc/src/vcpkg/commands.version.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/help.h>
 #include <vcpkg/metrics.h>

toolsrc/src/vcpkg/commands.xvsinstances.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 
 #include <vcpkg/base/system.print.h>
+
 #include <vcpkg/commands.h>
 #include <vcpkg/help.h>
 #include <vcpkg/visualstudio.h>