6 files changed, 10 insertions, 13 deletions
diff --git a/toolsrc/include/PostBuildLint_BuildPolicies.h b/toolsrc/include/PostBuildLint_BuildPolicies.h
index 32f585ef0..11fb2e1d4 100644
--- a/toolsrc/include/PostBuildLint_BuildPolicies.h
+++ b/toolsrc/include/PostBuildLint_BuildPolicies.h
@@ -39,7 +39,6 @@ namespace vcpkg::PostBuildLint
         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
-        };
+            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 a1da7729c..3cd67d347 100644
--- a/toolsrc/include/PostBuildLint_BuildType.h
+++ b/toolsrc/include/PostBuildLint_BuildType.h
@@ -46,13 +46,12 @@ namespace vcpkg::PostBuildLint
 
         static constexpr const char* ENUM_NAME = "vcpkg::PostBuildLint::BuildType";
 
-        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 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
-        };
+            DEBUG_STATIC, DEBUG_DYNAMIC, RELEASE_STATIC, RELEASE_DYNAMIC};
     }
 }
diff --git a/toolsrc/include/PostBuildLint_ConfigurationType.h b/toolsrc/include/PostBuildLint_ConfigurationType.h
index 60f759813..61f56c0d5 100644
--- a/toolsrc/include/PostBuildLint_ConfigurationType.h
+++ b/toolsrc/include/PostBuildLint_ConfigurationType.h
@@ -31,6 +31,6 @@ namespace vcpkg::PostBuildLint
         static constexpr ConfigurationType DEBUG(ConfigurationType::BackingEnum::DEBUG);
         static constexpr ConfigurationType RELEASE(ConfigurationType::BackingEnum::RELEASE);
 
-        static constexpr std::array<ConfigurationType, 2> VALUES = { DEBUG, RELEASE };
+        static constexpr std::array<ConfigurationType, 2> VALUES = {DEBUG, RELEASE};
     }
 }
diff --git a/toolsrc/include/PostBuildLint_LinkageType.h b/toolsrc/include/PostBuildLint_LinkageType.h
index fe9b502ef..8c4d16b7e 100644
--- a/toolsrc/include/PostBuildLint_LinkageType.h
+++ b/toolsrc/include/PostBuildLint_LinkageType.h
@@ -32,6 +32,6 @@ namespace vcpkg::PostBuildLint
         static constexpr LinkageType DYNAMIC(LinkageType::BackingEnum::DYNAMIC);
         static constexpr LinkageType STATIC(LinkageType::BackingEnum::STATIC);
 
-        static constexpr std::array<LinkageType, 2> VALUES = { DYNAMIC, STATIC };
+        static constexpr std::array<LinkageType, 2> VALUES = {DYNAMIC, STATIC};
     }
 }
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index 5807e45aa..6099918ce 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -29,8 +29,7 @@ namespace vcpkg::Commands
             BuildResult::SUCCEEDED,
             BuildResult::BUILD_FAILED,
             BuildResult::POST_BUILD_CHECKS_FAILED,
-            BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES
-        };
+            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);
diff --git a/toolsrc/include/vcpkg_optional.h b/toolsrc/include/vcpkg_optional.h
index 3b94d5a5d..b5a3268f0 100644
--- a/toolsrc/include/vcpkg_optional.h
+++ b/toolsrc/include/vcpkg_optional.h
@@ -8,7 +8,7 @@ namespace vcpkg
         explicit constexpr NullOpt(int) {}
     };
 
-    const static constexpr NullOpt nullopt{ 0 };
+    const static constexpr NullOpt nullopt{0};
 
     template<class T>
     class Optional