[vcpkg] Remove vcpkg::Archives from vcpkg::base. Add vcpkg::Hash.

4 files changed, 36 insertions, 28 deletions

diff --git a/toolsrc/include/vcpkg/base/archives.h b/toolsrc/include/vcpkg/archives.h
index cfb9f84c0..2298f9e1e 100644
--- a/toolsrc/include/vcpkg/base/archives.h
+++ b/toolsrc/include/vcpkg/archives.h
@@ -1,9 +1,9 @@
-#pragma once

-

-#include <vcpkg/base/files.h>

-#include <vcpkg/vcpkgpaths.h>

-

-namespace vcpkg::Archives

-{

-    void extract_archive(const VcpkgPaths& paths, const fs::path& archive, const fs::path& to_path);

-}

+#pragma once
+
+#include <vcpkg/base/files.h>
+#include <vcpkg/vcpkgpaths.h>
+
+namespace vcpkg::Archives
+{
+    void extract_archive(const VcpkgPaths& paths, const fs::path& archive, const fs::path& to_path);
+}
diff --git a/toolsrc/include/vcpkg/base/downloads.h b/toolsrc/include/vcpkg/base/downloads.h
index f30e865a6..61c792488 100644
--- a/toolsrc/include/vcpkg/base/downloads.h
+++ b/toolsrc/include/vcpkg/base/downloads.h
@@ -1,16 +1,16 @@
-#pragma once

-

-#include <vcpkg/base/files.h>

-

-namespace vcpkg::Downloads

-{

-    void verify_downloaded_file_hash(const Files::Filesystem& fs,

-                                     const std::string& url,

-                                     const fs::path& path,

-                                     const std::string& sha512);

-

-    void download_file(vcpkg::Files::Filesystem& fs,

-                       const std::string& url,

-                       const fs::path& download_path,

-                       const std::string& sha512);

-}

+#pragma once
+
+#include <vcpkg/base/files.h>
+
+namespace vcpkg::Downloads
+{
+    void verify_downloaded_file_hash(const Files::Filesystem& fs,
+                                     const std::string& url,
+                                     const fs::path& path,
+                                     const std::string& sha512);
+
+    void download_file(Files::Filesystem& fs,
+                       const std::string& url,
+                       const fs::path& download_path,
+                       const std::string& sha512);
+}
diff --git a/toolsrc/include/vcpkg/base/hash.h b/toolsrc/include/vcpkg/base/hash.h
new file mode 100644
index 000000000..9e6f118c0
--- /dev/null
+++ b/toolsrc/include/vcpkg/base/hash.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <vcpkg/base/files.h>
+
+#include <string>
+
+namespace vcpkg::Hash
+{
+    std::string get_string_hash(const std::string& s, const std::string& hash_type);
+    std::string get_file_hash(const Files::Filesystem& fs, const fs::path& path, const std::string& hash_type);
+}
diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h
index 78b4dda50..57bd83db9 100644
--- a/toolsrc/include/vcpkg/commands.h
+++ b/toolsrc/include/vcpkg/commands.h
@@ -131,9 +131,6 @@ namespace vcpkg::Commands
 
     namespace Hash
     {
-        std::string get_string_hash(const std::string& s, const std::string& hash_type);
-        std::string get_file_hash(const Files::Filesystem& fs, const fs::path& path, const std::string& hash_type);
-
         void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
     }