Run clang-format over the cpp files

1 files changed, 72 insertions, 51 deletions

diff --git a/toolsrc/src/commands_export.cpp b/toolsrc/src/commands_export.cpp
index 144a2277a..cc1a6c4a4 100644
--- a/toolsrc/src/commands_export.cpp
+++ b/toolsrc/src/commands_export.cpp
@@ -1,11 +1,12 @@
 #include "pch.h"
+
+#include "Paragraphs.h"
 #include "vcpkg_Commands.h"
-#include "vcpkglib.h"
-#include "vcpkg_System.h"
 #include "vcpkg_Dependencies.h"
 #include "vcpkg_Input.h"
+#include "vcpkg_System.h"
 #include "vcpkg_Util.h"
-#include "Paragraphs.h"
+#include "vcpkglib.h"
 #include <regex>
 
 namespace vcpkg::Commands::Export
@@ -41,8 +42,10 @@ namespace vcpkg::Commands::Export
 
         std::string nuspec_file_content = std::regex_replace(content_template, std::regex("@NUGET_ID@"), nuget_id);
         nuspec_file_content = std::regex_replace(nuspec_file_content, std::regex("@VERSION@"), nupkg_version);
-        nuspec_file_content = std::regex_replace(nuspec_file_content, std::regex("@RAW_EXPORTED_DIR@"), raw_exported_dir);
-        nuspec_file_content = std::regex_replace(nuspec_file_content, std::regex("@TARGETS_REDIRECT_PATH@"), targets_redirect_path);
+        nuspec_file_content =
+            std::regex_replace(nuspec_file_content, std::regex("@RAW_EXPORTED_DIR@"), raw_exported_dir);
+        nuspec_file_content =
+            std::regex_replace(nuspec_file_content, std::regex("@TARGETS_REDIRECT_PATH@"), targets_redirect_path);
         return nuspec_file_content;
     }
 
@@ -52,12 +55,15 @@ namespace vcpkg::Commands::Export
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Condition="Exists('%s')" Project="%s" />
 </Project>
-)###", target_path, target_path);
+)###",
+                               target_path,
+                               target_path);
     }
 
     static void print_plan(const std::map<ExportPlanType, std::vector<const ExportPlanAction*>>& group_by_plan_type)
     {
-        static constexpr std::array<ExportPlanType, 2> order = { ExportPlanType::ALREADY_BUILT, ExportPlanType::PORT_AVAILABLE_BUT_NOT_BUILT };
+        static constexpr std::array<ExportPlanType, 2> order = { ExportPlanType::ALREADY_BUILT,
+                                                                 ExportPlanType::PORT_AVAILABLE_BUT_NOT_BUILT };
 
         for (const ExportPlanType plan_type : order)
         {
@@ -69,10 +75,9 @@ namespace vcpkg::Commands::Export
 
             std::vector<const ExportPlanAction*> cont = it->second;
             std::sort(cont.begin(), cont.end(), &ExportPlanAction::compare_by_name);
-            const std::string as_string = Strings::join("\n", cont, [](const ExportPlanAction* p)
-                                                        {
-                                                            return Dependencies::to_output_string(p->request_type, p->spec.to_string());
-                                                        });
+            const std::string as_string = Strings::join("\n", cont, [](const ExportPlanAction* p) {
+                return Dependencies::to_output_string(p->request_type, p->spec.to_string());
+            });
 
             switch (plan_type)
             {
@@ -82,8 +87,7 @@ namespace vcpkg::Commands::Export
                 case ExportPlanType::PORT_AVAILABLE_BUT_NOT_BUILT:
                     System::println("The following packages need to be built:\n%s", as_string);
                     continue;
-                default:
-                    Checks::unreachable(VCPKG_LINE_INFO);
+                default: Checks::unreachable(VCPKG_LINE_INFO);
             }
         }
     }
@@ -96,12 +100,17 @@ namespace vcpkg::Commands::Export
         // 15 characters + 1 null terminating character will be written for a total of 16 chars
         char mbstr[16];
         const size_t bytes_written = std::strftime(mbstr, sizeof(mbstr), "%Y%m%d-%H%M%S", &date_time);
-        Checks::check_exit(VCPKG_LINE_INFO, bytes_written == 15, "Expected 15 bytes to be written, but %u were written", bytes_written);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           bytes_written == 15,
+                           "Expected 15 bytes to be written, but %u were written",
+                           bytes_written);
         const std::string date_time_as_string(mbstr);
         return ("vcpkg-export-" + date_time_as_string);
     }
 
-    static fs::path do_nuget_export(const VcpkgPaths& paths, const fs::path& raw_exported_dir, const fs::path& output_dir)
+    static fs::path do_nuget_export(const VcpkgPaths& paths,
+                                    const fs::path& raw_exported_dir,
+                                    const fs::path& output_dir)
     {
         static const std::string NUPKG_VERSION = "1.0.0";
 
@@ -109,18 +118,23 @@ namespace vcpkg::Commands::Export
         const fs::path& nuget_exe = paths.get_nuget_exe();
 
         // This file will be placed in "build\native" in the nuget package. Therefore, go up two dirs.
-        const std::string targets_redirect_content = create_targets_redirect("../../scripts/buildsystems/msbuild/vcpkg.targets");
+        const std::string targets_redirect_content =
+            create_targets_redirect("../../scripts/buildsystems/msbuild/vcpkg.targets");
         const fs::path targets_redirect = paths.buildsystems / "tmp" / "vcpkg.export.nuget.targets";
         fs.write_contents(targets_redirect, targets_redirect_content);
 
         const std::string nuget_id = raw_exported_dir.filename().string();
-        const std::string nuspec_file_content = create_nuspec_file_contents(raw_exported_dir.string(), targets_redirect.string(), nuget_id, NUPKG_VERSION);
+        const std::string nuspec_file_content =
+            create_nuspec_file_contents(raw_exported_dir.string(), targets_redirect.string(), nuget_id, NUPKG_VERSION);
         const fs::path nuspec_file_path = paths.buildsystems / "tmp" / "vcpkg.export.nuspec";
         fs.write_contents(nuspec_file_path, nuspec_file_content);
 
         // -NoDefaultExcludes is needed for ".vcpkg-root"
-        const std::wstring cmd_line = Strings::wformat(LR"("%s" pack -OutputDirectory "%s" "%s" -NoDefaultExcludes > nul)",
-                                                       nuget_exe.native(), output_dir.native(), nuspec_file_path.native());
+        const std::wstring cmd_line =
+            Strings::wformat(LR"("%s" pack -OutputDirectory "%s" "%s" -NoDefaultExcludes > nul)",
+                             nuget_exe.native(),
+                             output_dir.native(),
+                             nuspec_file_path.native());
 
         const int exit_code = System::cmd_execute_clean(cmd_line);
         Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Error: NuGet package creation failed");
@@ -140,9 +154,9 @@ namespace vcpkg::Commands::Export
         constexpr ArchiveFormat() = delete;
 
         constexpr ArchiveFormat(BackingEnum backing_enum, const wchar_t* extension, const wchar_t* cmake_option)
-            : backing_enum(backing_enum)
-            , m_extension(extension)
-            , m_cmake_option(cmake_option) { }
+            : backing_enum(backing_enum), m_extension(extension), m_cmake_option(cmake_option)
+        {
+        }
 
         constexpr operator BackingEnum() const { return backing_enum; }
         constexpr CWStringView extension() const { return this->m_extension; }
@@ -160,12 +174,16 @@ namespace vcpkg::Commands::Export
         constexpr const ArchiveFormat _7ZIP(ArchiveFormat::BackingEnum::_7ZIP, L"7z", L"7zip");
     }
 
-    static fs::path do_archive_export(const VcpkgPaths& paths, const fs::path& raw_exported_dir, const fs::path& output_dir, const ArchiveFormat& format)
+    static fs::path do_archive_export(const VcpkgPaths& paths,
+                                      const fs::path& raw_exported_dir,
+                                      const fs::path& output_dir,
+                                      const ArchiveFormat& format)
     {
         const fs::path& cmake_exe = paths.get_cmake_exe();
 
         const std::wstring exported_dir_filename = raw_exported_dir.filename().native();
-        const std::wstring exported_archive_filename = Strings::wformat(L"%s.%s", exported_dir_filename, format.extension());
+        const std::wstring exported_archive_filename =
+            Strings::wformat(L"%s.%s", exported_dir_filename, format.extension());
         const fs::path exported_archive_path = (output_dir / exported_archive_filename);
 
         // -NoDefaultExcludes is needed for ".vcpkg-root"
@@ -176,7 +194,8 @@ namespace vcpkg::Commands::Export
                                                        raw_exported_dir.native());
 
         const int exit_code = System::cmd_execute_clean(cmd_line);
-        Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Error: %s creation failed", exported_archive_path.generic_string());
+        Checks::check_exit(
+            VCPKG_LINE_INFO, exit_code == 0, "Error: %s creation failed", exported_archive_path.generic_string());
         return exported_archive_path;
     }
 
@@ -189,28 +208,27 @@ namespace vcpkg::Commands::Export
         static const std::string OPTION_7ZIP = "--7zip";
 
         // input sanitization
-        static const std::string example = Commands::Help::create_example_string("export zlib zlib:x64-windows boost --nuget");
+        static const std::string example =
+            Commands::Help::create_example_string("export zlib zlib:x64-windows boost --nuget");
         args.check_min_arg_count(1, example);
 
-        const std::vector<PackageSpec> specs = Util::fmap(args.command_arguments, [&](auto&& arg)
-                                                          {
-                                                              return Input::check_and_get_package_spec(arg, default_triplet, example);
-                                                          });
+        const std::vector<PackageSpec> specs = Util::fmap(args.command_arguments, [&](auto&& arg) {
+            return Input::check_and_get_package_spec(arg, default_triplet, example);
+        });
         for (auto&& spec : specs)
             Input::check_triplet(spec.triplet(), paths);
 
         const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments(
-            {
-                OPTION_DRY_RUN, OPTION_RAW, OPTION_NUGET, OPTION_ZIP, OPTION_7ZIP
-            });
+            { OPTION_DRY_RUN, OPTION_RAW, OPTION_NUGET, OPTION_ZIP, OPTION_7ZIP });
         const bool dryRun = options.find(OPTION_DRY_RUN) != options.cend();
         const bool raw = options.find(OPTION_RAW) != options.cend();
         const bool nuget = options.find(OPTION_NUGET) != options.cend();
         const bool zip = options.find(OPTION_ZIP) != options.cend();
         const bool _7zip = options.find(OPTION_7ZIP) != options.cend();
 
-        Checks::check_exit(VCPKG_LINE_INFO, raw || nuget || zip || _7zip,
-                                          "Must provide at least one of the following options: --raw --nuget --zip --7zip");
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           raw || nuget || zip || _7zip,
+                           "Must provide at least one of the following options: --raw --nuget --zip --7zip");
 
         // create the plan
         StatusParagraphs status_db = database_load_check(paths);
@@ -221,14 +239,15 @@ namespace vcpkg::Commands::Export
         Util::group_by(export_plan, &group_by_plan_type, [](const ExportPlanAction& p) { return p.plan_type; });
         print_plan(group_by_plan_type);
 
-        const bool has_non_user_requested_packages = Util::find_if(export_plan, [](const ExportPlanAction& package)-> bool
-                                                                   {
-                                                                       return package.request_type != RequestType::USER_REQUESTED;
-                                                                   }) != export_plan.cend();
+        const bool has_non_user_requested_packages =
+            Util::find_if(export_plan, [](const ExportPlanAction& package) -> bool {
+                return package.request_type != RequestType::USER_REQUESTED;
+            }) != export_plan.cend();
 
         if (has_non_user_requested_packages)
         {
-            System::println(System::Color::warning, "Additional packages (*) need to be exported to complete this operation.");
+            System::println(System::Color::warning,
+                            "Additional packages (*) need to be exported to complete this operation.");
         }
 
         auto it = group_by_plan_type.find(ExportPlanType::PORT_AVAILABLE_BUT_NOT_BUILT);
@@ -238,14 +257,13 @@ namespace vcpkg::Commands::Export
 
             // No need to show all of them, just the user-requested ones. Dependency resolution will handle the rest.
             std::vector<const ExportPlanAction*> unbuilt = it->second;
-            Util::erase_remove_if(unbuilt, [](const ExportPlanAction* a)
-                                  {
-                                      return a->request_type != RequestType::USER_REQUESTED;
-                                  });
+            Util::erase_remove_if(
+                unbuilt, [](const ExportPlanAction* a) { return a->request_type != RequestType::USER_REQUESTED; });
 
             auto s = Strings::join(" ", unbuilt, [](const ExportPlanAction* a) { return a->spec.to_string(); });
             System::println("To build them, run:\n"
-                            "    vcpkg install %s", s);
+                            "    vcpkg install %s",
+                            s);
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
 
@@ -274,7 +292,8 @@ namespace vcpkg::Commands::Export
             const std::string display_name = action.spec.to_string();
             System::println("Exporting package %s... ", display_name);
 
-            const BinaryParagraph& binary_paragraph = action.any_paragraph.binary_paragraph.value_or_exit(VCPKG_LINE_INFO);
+            const BinaryParagraph& binary_paragraph =
+                action.any_paragraph.binary_paragraph.value_or_exit(VCPKG_LINE_INFO);
             const InstallDir dirs = InstallDir::from_destination_root(
                 raw_exported_dir_path / "installed",
                 action.spec.triplet().to_string(),
@@ -285,8 +304,7 @@ namespace vcpkg::Commands::Export
         }
 
         // Copy files needed for integration
-        const std::vector<fs::path> integration_files_relative_to_root =
-        {
+        const std::vector<fs::path> integration_files_relative_to_root = {
             { ".vcpkg-root" },
             { fs::path{ "scripts" } / "buildsystems" / "msbuild" / "applocal.ps1" },
             { fs::path{ "scripts" } / "buildsystems" / "msbuild" / "vcpkg.targets" },
@@ -309,7 +327,8 @@ namespace vcpkg::Commands::Export
 
         if (raw)
         {
-            System::println(System::Color::success, R"(Files exported at: "%s")", raw_exported_dir_path.generic_string());
+            System::println(
+                System::Color::success, R"(Files exported at: "%s")", raw_exported_dir_path.generic_string());
         }
 
         if (nuget)
@@ -323,7 +342,8 @@ namespace vcpkg::Commands::Export
         if (zip)
         {
             System::println("Creating zip archive... ");
-            const fs::path output_path = do_archive_export(paths, raw_exported_dir_path, export_to_path, ArchiveFormatC::ZIP);
+            const fs::path output_path =
+                do_archive_export(paths, raw_exported_dir_path, export_to_path, ArchiveFormatC::ZIP);
             System::println(System::Color::success, "Creating zip archive... done");
             System::println(System::Color::success, "Zip archive exported at: %s", output_path.generic_string());
         }
@@ -331,7 +351,8 @@ namespace vcpkg::Commands::Export
         if (_7zip)
         {
             System::println("Creating 7zip archive... ");
-            const fs::path output_path = do_archive_export(paths, raw_exported_dir_path, export_to_path, ArchiveFormatC::_7ZIP);
+            const fs::path output_path =
+                do_archive_export(paths, raw_exported_dir_path, export_to_path, ArchiveFormatC::_7ZIP);
             System::println(System::Color::success, "Creating 7zip archive... done");
             System::println(System::Color::success, "7zip archive exported at: %s", output_path.generic_string());
         }