cngzhnp · strega-nil · Aug 17, 2020 · Aug 17, 2020 · Aug 19, 2020 · Aug 19, 2020
diff --git a/toolsrc/.clang-format b/toolsrc/.clang-format
@@ -40,11 +40,13 @@ IncludeCategories:
     Priority: -1
   - Regex: '^<catch2/catch\.hpp>$'
     Priority: 1
-  - Regex: '^<vcpkg/base/.*\.h>$'
+  - Regex: '^<vcpkg/fwd/.*\.h>$'
     Priority: 2
-  - Regex: '^<vcpkg/.*\.h>$'
+  - Regex: '^<vcpkg/base/.*\.h>$'
     Priority: 3
-  - Regex: '^<[a-z0-9_]*\.h>$'
+  - Regex: '^<vcpkg/.*\.h>$'
     Priority: 4
-  - Regex: '^<[a-z0-9_]*>$' # C++ standard library
+  - Regex: '^<[a-z0-9_]*\.h>$'
     Priority: 5
+  - Regex: '^<[a-z0-9_]*>$' # C++ standard library
+    Priority: 6
diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt
@@ -157,10 +157,10 @@ if(CLANG_FORMAT)
     add_custom_target(format COMMAND ${CLANG_FORMAT} -i -verbose
         ${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp
         ${VCPKGLIB_BASE_SOURCES}
-        ${VCPKGLIB_NON_PCH_SOURCES}
+        ${VCPKGLIB_SOURCES}
         ${CMAKE_CURRENT_SOURCE_DIR}/include/pch.h
         ${VCPKGLIB_BASE_INCLUDES}
-        ${VCPKGLIB_NON_PCH_INCLUDES}
+        ${VCPKGLIB_INCLUDES}
 
         ${VCPKG_SOURCES}
         ${VCPKGMETRICSUPLOADER_SOURCES}

diff --git a/toolsrc/include/vcpkg-test/mockcmakevarprovider.h b/toolsrc/include/vcpkg-test/mockcmakevarprovider.h
@@ -19,7 +19,7 @@ namespace vcpkg::Test
         {
             for (auto&& spec : specs)
                 tag_vars[spec.package_spec] = {};
-            Util::unused(port_provider);
+            (void)(port_provider);
         }
 
         Optional<const std::unordered_map<std::string, std::string>&> get_generic_triplet_vars(

diff --git a/toolsrc/include/vcpkg/archives.h b/toolsrc/include/vcpkg/archives.h
@@ -1,11 +1,8 @@
 #pragma once
 
-#include <vcpkg/base/files.h>
+#include <vcpkg/fwd/vcpkgpaths.h>
 
-namespace vcpkg
-{
-    struct VcpkgPaths;
-}
+#include <vcpkg/base/files.h>
 
 namespace vcpkg::Archives
 {

diff --git a/toolsrc/include/vcpkg/base/util.h b/toolsrc/include/vcpkg/base/util.h
@@ -239,15 +239,4 @@ namespace vcpkg::Util
             return e == E::YES;
         }
     }
-
-    template<class... Ts>
-    void unused(const Ts&...)
-    {
-    }
-
-    template<class T>
-    T copy(const T& t)
-    {
-        return t;
-    }
 }
diff --git a/toolsrc/include/vcpkg/buildenvironment.h b/toolsrc/include/vcpkg/buildenvironment.h
@@ -1,14 +1,14 @@
 #pragma once
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/base/system.process.h>
 
 #include <string>
 #include <vector>
 
 namespace vcpkg
 {
-    struct VcpkgPaths;
-
     std::string make_cmake_cmd(const VcpkgPaths& paths,
                                const fs::path& cmake_script,
                                std::vector<System::CMakeVariable>&& pass_variables);

diff --git a/toolsrc/include/vcpkg/cmakevars.h b/toolsrc/include/vcpkg/cmakevars.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/base/optional.h>
 
 #include <vcpkg/portfileprovider.h>
@@ -9,11 +11,6 @@ namespace vcpkg::Dependencies
     struct ActionPlan;
 }
 
-namespace vcpkg
-{
-    struct VcpkgPaths;
-}
-
 namespace vcpkg::CMakeVars
 {
     struct CMakeVarProvider

diff --git a/toolsrc/include/vcpkg/commands.contact.h b/toolsrc/include/vcpkg/commands.contact.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Contact
 {

diff --git a/toolsrc/include/vcpkg/commands.create.h b/toolsrc/include/vcpkg/commands.create.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Create
 {

diff --git a/toolsrc/include/vcpkg/commands.dependinfo.h b/toolsrc/include/vcpkg/commands.dependinfo.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::DependInfo
 {

diff --git a/toolsrc/include/vcpkg/commands.edit.h b/toolsrc/include/vcpkg/commands.edit.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Edit
 {

diff --git a/toolsrc/include/vcpkg/commands.format-manifest.h b/toolsrc/include/vcpkg/commands.format-manifest.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::FormatManifest
 {

diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h
@@ -1,13 +1,10 @@
 #pragma once
 
 #include <vcpkg/build.h>
+#include <vcpkg/commands.interface.h>
 
 namespace vcpkg::Commands
 {
-    struct BasicCommand;
-    struct PathsCommand;
-    struct TripletCommand;
-
     template<class T>
     struct PackageNameAndFunction
     {

diff --git a/toolsrc/include/vcpkg/commands.info.h b/toolsrc/include/vcpkg/commands.info.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Info
 {

diff --git a/toolsrc/include/vcpkg/commands.integrate.h b/toolsrc/include/vcpkg/commands.integrate.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Integrate
 {

diff --git a/toolsrc/include/vcpkg/commands.interface.h b/toolsrc/include/vcpkg/commands.interface.h
@@ -1,16 +1,11 @@
 #pragma once
 
-#include <vcpkg/triplet.h>
+#include <vcpkg/fwd/vcpkgcmdarguments.h>
+#include <vcpkg/fwd/vcpkgpaths.h>
 
-namespace vcpkg
-{
-    struct VcpkgCmdArguments;
-    struct VcpkgPaths;
-    namespace Files
-    {
-        struct Filesystem;
-    }
-}
+#include <vcpkg/base/files.h>
+
+#include <vcpkg/triplet.h>
 
 namespace vcpkg::Commands
 {

diff --git a/toolsrc/include/vcpkg/commands.list.h b/toolsrc/include/vcpkg/commands.list.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::List
 {

diff --git a/toolsrc/include/vcpkg/commands.setinstalled.h b/toolsrc/include/vcpkg/commands.setinstalled.h
@@ -3,7 +3,6 @@
 #include <vcpkg/cmakevars.h>
 #include <vcpkg/commands.interface.h>
 #include <vcpkg/portfileprovider.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::SetInstalled
 {

diff --git a/toolsrc/include/vcpkg/commands.upgrade.h b/toolsrc/include/vcpkg/commands.upgrade.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::Upgrade
 {

diff --git a/toolsrc/include/vcpkg/commands.xvsinstances.h b/toolsrc/include/vcpkg/commands.xvsinstances.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg::Commands::X_VSInstances
 {

diff --git a/toolsrc/include/vcpkg/export.ifw.h b/toolsrc/include/vcpkg/export.ifw.h
@@ -1,15 +1,12 @@
 #pragma once
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/dependencies.h>
 
 #include <string>
 #include <vector>
 
-namespace vcpkg
-{
-    struct VcpkgPaths;
-}
-
 namespace vcpkg::Export::IFW
 {
     struct Options

diff --git a/toolsrc/include/vcpkg/fwd/registries.h b/toolsrc/include/vcpkg/fwd/registries.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct Registry;
+}
diff --git a/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/fwd/vcpkgcmdarguments.h
@@ -0,0 +1,13 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct ParsedArguments;
+    struct CommandSwitch;
+    struct CommandSetting;
+    struct CommandMultiSetting;
+    struct CommandOptionsStructure;
+    struct CommandStructure;
+    struct HelpTableFormatter;
+    struct VcpkgCmdArguments;
+}
diff --git a/toolsrc/include/vcpkg/fwd/vcpkgpaths.h b/toolsrc/include/vcpkg/fwd/vcpkgpaths.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct ToolsetArchOption;
+    struct Toolset;
+    struct VcpkgPaths;
+}
diff --git a/toolsrc/include/vcpkg/help.h b/toolsrc/include/vcpkg/help.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vcpkg/commands.interface.h>
-#include <vcpkg/vcpkgcmdarguments.h>
 
 #include <string>
 

diff --git a/toolsrc/include/vcpkg/registries.h b/toolsrc/include/vcpkg/registries.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/optional.h>
+#include <vcpkg/base/
+
+#include <vcpkg/fwd/registries.h>
+
+#include <memory>
+#include <string>
+#include <system_error>
+#include <vector>
+
+namespace vcpkg
+{
+    struct RegistryImpl
+    {
+        virtual void update(std::error_code&) = 0;
+        virtual Optional<fs::path> find_port(StringView name) const = 0;
+
+        virtual ~RegistryImpl() = default;
+    };
+
+    struct Registry
+    {
+        std::string name;
+        std::vector<std::string> packages;
+
+        std::unique_ptr<RegistryImpl> underlying;
+    };
+
+}
diff --git a/toolsrc/include/vcpkg/statusparagraph.h b/toolsrc/include/vcpkg/statusparagraph.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/binaryparagraph.h>
 
 #include <map>
@@ -62,5 +64,5 @@ namespace vcpkg
         std::vector<const StatusParagraph*> features;
     };
 
-    Json::Value serialize_ipv(const InstalledPackageView& ipv, const struct VcpkgPaths& paths);
+    Json::Value serialize_ipv(const InstalledPackageView& ipv, const VcpkgPaths& paths);
 }
diff --git a/toolsrc/include/vcpkg/tools.h b/toolsrc/include/vcpkg/tools.h
@@ -1,14 +1,14 @@
 #pragma once
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/base/files.h>
 
 #include <string>
 #include <utility>
 
 namespace vcpkg
 {
-    struct VcpkgPaths;
-
     namespace Tools
     {
         static const std::string SEVEN_ZIP = "7zip";

diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <vcpkg/fwd/vcpkgcmdarguments.h>
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/optional.h>
 #include <vcpkg/base/span.h>
@@ -19,8 +22,6 @@ namespace vcpkg
         std::unordered_map<std::string, std::vector<std::string>> multisettings;
     };
 
-    struct VcpkgPaths;
-
     struct CommandSwitch
     {
         constexpr CommandSwitch(const StringLiteral& name, const StringLiteral& short_help_text)

diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <vcpkg/fwd/vcpkgpaths.h>
+
 #include <vcpkg/base/cache.h>
 #include <vcpkg/base/files.h>
 #include <vcpkg/base/lazy.h>

diff --git a/toolsrc/src/vcpkg-test/util.cpp b/toolsrc/src/vcpkg-test/util.cpp
@@ -195,7 +195,7 @@ namespace vcpkg::Test
             ec.assign(errno, std::system_category());
         }
 #else
-        Util::unused(target, file, ec);
+        (void)(target, file, ec);
         vcpkg::Checks::exit_with_message(VCPKG_LINE_INFO, no_filesystem_message);
 #endif
     }
@@ -217,7 +217,7 @@ namespace vcpkg::Test
 #elif FILESYSTEM_SYMLINK == FILESYSTEM_SYMLINK_UNIX
         ::vcpkg::Test::create_symlink(target, file, ec);
 #else
-        Util::unused(target, file, ec);
+        (void)(target, file, ec);
         vcpkg::Checks::exit_with_message(VCPKG_LINE_INFO, no_filesystem_message);
 #endif
     }