[clang-format] Increase PenaltyReturnTypeOnItsOwnLine

9 files changed, 42 insertions, 21 deletions

diff --git a/toolsrc/.clang-format b/toolsrc/.clang-format
index a6204181e..a4d57e4d8 100644
--- a/toolsrc/.clang-format
+++ b/toolsrc/.clang-format
@@ -27,5 +27,5 @@ Cpp11BracedListStyle: false
 IndentCaseLabels: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 NamespaceIndentation: All
-PenaltyReturnTypeOnItsOwnLine: 100
+PenaltyReturnTypeOnItsOwnLine: 1000
 SpaceAfterTemplateKeyword: false
\ No newline at end of file
diff --git a/toolsrc/include/Paragraphs.h b/toolsrc/include/Paragraphs.h
index 504cd5bb8..66f6bd2e4 100644
--- a/toolsrc/include/Paragraphs.h
+++ b/toolsrc/include/Paragraphs.h
@@ -22,6 +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/VcpkgCmdArguments.h b/toolsrc/include/VcpkgCmdArguments.h
index 1738f1411..7cab0f192 100644
--- a/toolsrc/include/VcpkgCmdArguments.h
+++ b/toolsrc/include/VcpkgCmdArguments.h
@@ -20,8 +20,8 @@ namespace vcpkg
 
         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/src/Paragraphs.cpp b/toolsrc/src/Paragraphs.cpp
index 36ef8b9ac..70d3db2b3 100644
--- a/toolsrc/src/Paragraphs.cpp
+++ b/toolsrc/src/Paragraphs.cpp
@@ -240,8 +240,8 @@ namespace vcpkg::Paragraphs
         return output;
     }
 
-    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)
     {
         std::map<std::string, VersionT> names_and_versions;
         for (const SourceParagraph& port : source_paragraphs)
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
index 4d689b624..5e3d4129f 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -495,11 +495,11 @@ namespace vcpkg::PostBuildLint
         return LintStatus::ERROR_DETECTED;
     }
 
-    static LintStatus
-    check_lib_files_are_available_if_dlls_are_available(const std::map<BuildPolicies, OptBool>& policies,
-                                                        const size_t lib_count,
-                                                        const size_t dll_count,
-                                                        const fs::path& lib_dir)
+    static LintStatus check_lib_files_are_available_if_dlls_are_available(
+        const std::map<BuildPolicies, OptBool>& policies,
+        const size_t lib_count,
+        const size_t dll_count,
+        const fs::path& lib_dir)
     {
         auto it = policies.find(BuildPoliciesC::DLLS_WITHOUT_LIBS);
         if (it != policies.cend() && it->second == OptBoolC::ENABLED)
diff --git a/toolsrc/src/VcpkgCmdArguments.cpp b/toolsrc/src/VcpkgCmdArguments.cpp
index a41bb10c6..d12f4f78c 100644
--- a/toolsrc/src/VcpkgCmdArguments.cpp
+++ b/toolsrc/src/VcpkgCmdArguments.cpp
@@ -135,8 +135,8 @@ namespace vcpkg
         return args;
     }
 
-    std::unordered_set<std::string>
-    VcpkgCmdArguments::check_and_get_optional_command_arguments(const std::vector<std::string>& valid_options) const
+    std::unordered_set<std::string> VcpkgCmdArguments::check_and_get_optional_command_arguments(
+        const std::vector<std::string>& valid_options) const
     {
         std::unordered_set<std::string> output;
         auto options_copy = this->optional_command_arguments;
diff --git a/toolsrc/src/commands_portsdiff.cpp b/toolsrc/src/commands_portsdiff.cpp
index 7cead8961..a4c847764 100644
--- a/toolsrc/src/commands_portsdiff.cpp
+++ b/toolsrc/src/commands_portsdiff.cpp
@@ -42,10 +42,10 @@ namespace vcpkg::Commands::PortsDiff
         std::vector<T> only_right;
     };
 
-    static std::vector<UpdatedPort>
-    find_updated_ports(const std::vector<std::string>& ports,
-                       const std::map<std::string, VersionT>& previous_names_and_versions,
-                       const std::map<std::string, VersionT>& current_names_and_versions)
+    static std::vector<UpdatedPort> find_updated_ports(
+        const std::vector<std::string>& ports,
+        const std::map<std::string, VersionT>& previous_names_and_versions,
+        const std::map<std::string, VersionT>& current_names_and_versions)
     {
         std::vector<UpdatedPort> output;
         for (const std::string& name : ports)
diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp
index b2d9f602a..d52c9347b 100644
--- a/toolsrc/src/commands_remove.cpp
+++ b/toolsrc/src/commands_remove.cpp
@@ -121,7 +121,26 @@ namespace vcpkg::Commands::Remove
 
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
     {
-        static const std::string OPTION_PURGE = "--purge";
+        enum SwitchType
+        {
+            SINGLE,
+            SINGLE_WITH_NO,
+            VALUE,
+        };
+
+        struct Option
+        {
+            CStringView name;
+            SwitchType type;
+        };
+
+        static constexpr Option options_table[] = {
+            Option{ "--purge", SINGLE_WITH_NO },   Option{ "--recurse", SINGLE_WITH_NO },
+            Option{ "--dry-run", SINGLE_WITH_NO }, Option{ "--outdated", SINGLE },
+            Option{ "--logfile", VALUE },
+        };
+
+        static constexpr CStringView OPTION_PURGE = "--purge";
         static const std::string OPTION_NO_PURGE = "--no-purge";
         static const std::string OPTION_RECURSE = "--recurse";
         static const std::string OPTION_DRY_RUN = "--dry-run";
diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg_Files.cpp
index 385e95f27..17aa2997a 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg_Files.cpp
@@ -148,8 +148,10 @@ namespace vcpkg::Files
         {
             fs::stdfs::copy(oldpath, newpath, opts);
         }
-        virtual bool
-        copy_file(const fs::path& oldpath, const fs::path& newpath, fs::copy_options opts, std::error_code& ec) override
+        virtual bool copy_file(const fs::path& oldpath,
+                               const fs::path& newpath,
+                               fs::copy_options opts,
+                               std::error_code& ec) override
         {
             return fs::stdfs::copy_file(oldpath, newpath, opts, ec);
         }