Change Info::email() to Contact::email(). Remove vcpkg_info.h/cpp

5 files changed, 9 insertions, 18 deletions

diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp
index d01d40ef4..aae30efd1 100644
--- a/toolsrc/src/commands_build.cpp
+++ b/toolsrc/src/commands_build.cpp
@@ -8,7 +8,6 @@
 #include "vcpkg_System.h"
 #include "vcpkg_Environment.h"
 #include "metrics.h"
-#include "vcpkg_info.h"
 #include "vcpkg_Enums.h"
 
 namespace vcpkg::Commands::Build
diff --git a/toolsrc/src/commands_contact.cpp b/toolsrc/src/commands_contact.cpp
index c5b8cab7e..29f0d4d27 100644
--- a/toolsrc/src/commands_contact.cpp
+++ b/toolsrc/src/commands_contact.cpp
@@ -1,16 +1,21 @@
 #include "pch.h"
 #include "vcpkg_Commands.h"
 #include "vcpkg_System.h"
-#include "vcpkg_info.h"
 
 namespace vcpkg::Commands::Contact
 {
-    void  perform_and_exit(const vcpkg_cmd_arguments& args)
+    const std::string& email()
+    {
+        static const std::string s_email = R"(vcpkg@microsoft.com)";
+        return s_email;
+    }
+
+    void perform_and_exit(const vcpkg_cmd_arguments& args)
     {
         args.check_exact_arg_count(0);
         args.check_and_get_optional_command_arguments({});
 
-        System::println("Send an email to %s with any feedback.", Info::email());
+        System::println("Send an email to %s with any feedback.", email());
         exit(EXIT_SUCCESS);
     }
 }
diff --git a/toolsrc/src/commands_update.cpp b/toolsrc/src/commands_update.cpp
index 3ac6694b9..d4519ca14 100644
--- a/toolsrc/src/commands_update.cpp
+++ b/toolsrc/src/commands_update.cpp
@@ -4,7 +4,6 @@
 #include "vcpkg_System.h"
 #include "vcpkg_Files.h"
 #include "Paragraphs.h"
-#include "vcpkg_info.h"
 
 namespace vcpkg::Commands::Update
 {
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index 16c9cb077..f40126ecf 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -12,7 +12,6 @@
 #include "vcpkg_System.h"
 #include "vcpkg_Input.h"
 #include "Paragraphs.h"
-#include "vcpkg_info.h"
 #include "vcpkg_Strings.h"
 
 using namespace vcpkg;
@@ -235,7 +234,7 @@ int wmain(const int argc, const wchar_t* const* const argv)
     std::cerr
         << "vcpkg.exe has crashed.\n"
         << "Please send an email to:\n"
-        << "    " << Info::email() << "\n"
+        << "    " << Commands::Contact::email() << "\n"
         << "containing a brief summary of what you were trying to do and the following data blob:\n"
         << "\n"
         << "Version=" << Commands::Version::version() << "\n"
diff --git a/toolsrc/src/vcpkg_info.cpp b/toolsrc/src/vcpkg_info.cpp
deleted file mode 100644
index fa2077177..000000000
--- a/toolsrc/src/vcpkg_info.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "pch.h"
-#include "vcpkg_info.h"
-
-namespace vcpkg::Info
-{
-    const std::string& email()
-    {
-        static const std::string s_email = R"(vcpkg@microsoft.com)";
-        return s_email;
-    }
-}