Avoid BOOST_JSON_STANDALONE

Boost 1.79 dropped support for BOOST_JSON_STANDALONE [1]. Prepare for
upgrading Boost by switching off BOOST_JSON_STANDALONE.

This commit should not change behavior.

[1] https://www.boost.org/users/history/version_1_79_0.html

Author: strager

benchmark/benchmark-lsp/benchmark-config.cpp

@@ -102,8 +102,9 @@ std::map<std::string, std::string> get_yarn_packages_versions(
   std::string_view json = lines[lines.size() - 1];
   QLJS_ALWAYS_ASSERT(!json.empty());
 
-  std::error_code error;
-  ::boost::json::value root = ::boost::json::parse(json, error);
+  ::boost::json::error_code error;
+  ::boost::json::value root =
+      ::boost::json::parse(to_boost_string_view(json), error);
   if (error != std::error_code()) {
     std::fprintf(stderr, "error: parsing 'yarn list' JSON failed\n");
     std::exit(1);
@@ -112,7 +113,8 @@ std::map<std::string, std::string> get_yarn_packages_versions(
   std::map<std::string, std::string> package_versions;
   ::boost::json::value packages = look_up(root, "data", "trees");
   for (::boost::json::value package : packages.as_array()) {
-    std::string full_package_name(look_up(package, "name").as_string());
+    std::string full_package_name(
+        to_string_view(look_up(package, "name").as_string()));
     std::size_t version_separator_index = full_package_name.rfind('@');
     QLJS_ALWAYS_ASSERT(version_separator_index != full_package_name.npos);
     std::string_view package_name =
@@ -352,17 +354,18 @@ benchmark_config benchmark_config::load() {
                                package_json_content.error_to_string().c_str());
                   std::exit(1);
                 }
-                std::error_code error;
+                ::boost::json::error_code error;
                 ::boost::json::value package_info = ::boost::json::parse(
-                    to_string_view(package_json_content->string_view()), error);
+                    to_boost_string_view(package_json_content->string_view()),
+                    error);
                 if (error != std::error_code()) {
                   std::fprintf(stderr, "error: %s: parsing JSON failed\n",
                                package_json_path);
                   std::exit(1);
                 }
-                metadata["vscode-eslint"] =
+                metadata["vscode-eslint"] = to_string_view(
                     look_up(package_info, "dependencies", "vscode-eslint")
-                        .as_string();
+                        .as_string());
 
                 return metadata;
               },

benchmark/benchmark-lsp/lsp-benchmarks.cpp

@@ -167,8 +167,8 @@ class change_wait_benchmark : public benchmark {
       while (!remaining_uris.empty()) {
         ::boost::json::object notification =
             co_await server.wait_for_first_diagnostics_notification_async();
-        string8 notification_uri = to_string8(
-            std::string(look_up(notification, "params", "uri").get_string()));
+        string8 notification_uri = to_string8(to_string_view(
+            look_up(notification, "params", "uri").get_string()));
 
         auto uri_it = remaining_uris.find(notification_uri);
         QLJS_ALWAYS_ASSERT(uri_it != remaining_uris.end());

benchmark/benchmark-lsp/lsp-server-process.cpp

@@ -269,7 +269,7 @@ lsp_task<::boost::json::array> lsp_server_process::wait_for_diagnostics_async(
       [&](::boost::json::object& params) {
         ::boost::json::string diagnostics_uri =
             look_up(params, "uri").get_string();
-        if (diagnostics_uri != to_string_view(document_uri)) {
+        if (diagnostics_uri != to_boost_string_view(document_uri)) {
           return false;
         }
         std::int64_t* diagnostics_version = if_int64(params, "version");
@@ -421,9 +421,9 @@ void lsp_server_process::create_file_on_disk_if_needed(string8_view path) {
 
 ::boost::json::value lsp_server_process::get_message_awaitable::await_resume() {
   QLJS_ASSERT(!this->message_content_.empty());
-  std::error_code error;
+  ::boost::json::error_code error;
   ::boost::json::value root =
-      ::boost::json::parse(to_string_view(this->message_content_), error);
+      ::boost::json::parse(to_boost_string_view(this->message_content_), error);
   if (error != std::error_code()) {
     std::fprintf(stderr, "error: parsing JSON from LSP server failed\n");
     std::exit(1);

src/boost-json.cpp

@@ -18,11 +18,9 @@ ::boost::json::string_view to_boost_string_view(std::string_view sv) {
 }
 #endif
 
-#if !defined(BOOST_JSON_STANDALONE)
 std::string_view to_string_view(::boost::json::string_view sv) {
   return std::string_view(sv.data(), sv.size());
 }
-#endif
 
 std::string_view to_string_view(const ::boost::json::string& s) {
   return std::string_view(s.data(), s.size());

src/boost.cpp

@@ -6,6 +6,10 @@
 
 namespace boost {
 void throw_exception(const std::exception&) { std::terminate(); }
+
+void throw_exception(const std::exception&, boost::source_location const&) {
+  std::terminate();
+}
 }
 
 // quick-lint-js finds bugs in JavaScript programs.

src/char8.cpp

@@ -25,6 +25,8 @@ string8 to_string8(const std::string &s) {
 string8 to_string8(const std::string &s) { return s; }
 #endif
 
+string8 to_string8(std::string_view s) { return string8(to_string8_view(s)); }
+
 #if QLJS_HAVE_CHAR8_T
 std::string to_string(const string8_view &s) {
   return std::string(reinterpret_cast<const char *>(s.data()), s.size());

src/quick-lint-js/boost-json.h

@@ -16,9 +16,7 @@ ::boost::json::string_view to_boost_string_view(string8_view sv);
 ::boost::json::string_view to_boost_string_view(std::string_view sv);
 #endif
 
-#if !defined(BOOST_JSON_STANDALONE)
 std::string_view to_string_view(::boost::json::string_view sv);
-#endif
 std::string_view to_string_view(const ::boost::json::string &s);
 
 template <class... Keys>

src/quick-lint-js/char8.h

@@ -40,6 +40,7 @@ inline string8_view out_string8(string8_view sv) noexcept { return sv; }
 #endif
 
 string8 to_string8(const std::string &);
+string8 to_string8(std::string_view);
 std::string to_string(const string8_view &);
 
 std::string_view to_string_view(string8_view);

vendor/README.txt

@@ -47,21 +47,13 @@ release archive:
 
 Additionally, the following patches have been manually applied:
 
-* boost-json-pmr.patch
 * boost-static-var.patch
 
 Additionally, the following directories and files have been deleted to reduce
 storage consumption:
 
-* boost/boost/align/
-* boost/boost/io/
-* boost/boost/predef/
 * boost/boost/shared_ptr.hpp
 * boost/boost/smart_ptr/
-* boost/boost/system/
-* boost/boost/type_traits/
-* boost/boost/utility/
-* boost/boost/winapi/
 
 Copyright: various
 Download URL: https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2