Reduce canonical_path->std::string conversions

Author: strager

src/configuration-loader.cpp

@@ -46,7 +46,7 @@ configuration* configuration_loader::load_config_file(const char* config_path) {
       std::forward_as_tuple());
   QLJS_ASSERT(inserted);
   configuration* config = &config_it->second;
-  config->set_config_file_path(canonical_config_path.c_str());
+  config->set_config_file_path(std::move(canonical_config_path).canonical());
   config->load_from_json(&config_json.content);
   return config;
 }
@@ -93,7 +93,7 @@ configuration* configuration_loader::find_and_load_config_file(
             std::forward_as_tuple());
         QLJS_ASSERT(inserted);
         configuration* config = &config_it->second;
-        config->set_config_file_path(std::move(config_path).path());
+        config->set_config_file_path(std::move(config_path));
         config->load_from_json(&config_json.content);
         return config;
       }

src/configuration.cpp

@@ -136,7 +136,7 @@ const global_declared_variable_set& configuration::globals() noexcept {
   return this->globals_;
 }
 
-const std::string& configuration::config_file_path() const noexcept {
+std::optional<canonical_path> configuration::config_file_path() const {
   return this->config_file_path_;
 }
 
@@ -208,7 +208,7 @@ void configuration::load_from_json(padded_string_view json) {
   }
 }
 
-void configuration::set_config_file_path(std::string&& path) {
+void configuration::set_config_file_path(canonical_path&& path) {
   this->config_file_path_ = std::move(path);
 }
 

src/quick-lint-js/configuration.h

@@ -4,7 +4,9 @@
 #ifndef QUICK_LINT_JS_CONFIGURATION_H
 #define QUICK_LINT_JS_CONFIGURATION_H
 
+#include <optional>
 #include <quick-lint-js/char8.h>
+#include <quick-lint-js/file-canonical.h>
 #include <quick-lint-js/lint.h>
 #include <quick-lint-js/monotonic-allocator.h>
 #include <quick-lint-js/padded-string.h>
@@ -16,8 +18,7 @@ class configuration {
  public:
   const global_declared_variable_set& globals() noexcept;
 
-  // If a config file path was not set, this function returns an empty string.
-  const std::string& config_file_path() const noexcept;
+  std::optional<canonical_path> config_file_path() const;
 
   void reset_global_groups();
   bool add_global_group(string8_view group_name);
@@ -26,7 +27,7 @@ class configuration {
   void remove_global_variable(string8_view name);
 
   void load_from_json(padded_string_view);
-  void set_config_file_path(std::string&&);
+  void set_config_file_path(canonical_path&&);
 
  private:
   void load_global_groups_from_json(simdjson::ondemand::value&);
@@ -36,7 +37,7 @@ class configuration {
 
   global_declared_variable_set globals_;
   std::vector<string8> globals_to_remove_;
-  std::string config_file_path_;
+  std::optional<canonical_path> config_file_path_;
   bool add_global_group_node_js_ = true;
   bool add_global_group_ecmascript_ = true;
   monotonic_allocator string_allocator_;

test/quick-lint-js/file-matcher.h

@@ -7,6 +7,8 @@
 #include <cerrno>
 #include <cstring>
 #include <gtest/gtest.h>
+#include <optional>
+#include <quick-lint-js/file-canonical.h>
 #include <quick-lint-js/file.h>
 #include <quick-lint-js/have.h>
 
@@ -69,6 +71,15 @@ inline ::testing::AssertionResult assert_same_file(const char* lhs_expr,
   return assert_same_file(lhs_expr, rhs_expr, std::string(lhs_path).c_str(),
                           std::string(rhs_path).c_str());
 }
+
+inline ::testing::AssertionResult assert_same_file(
+    const char* lhs_expr, const char* rhs_expr,
+    const std::optional<canonical_path>& lhs_path,
+    const std::string& rhs_path) {
+  return assert_same_file(lhs_expr, rhs_expr,
+                          lhs_path.has_value() ? lhs_path->c_str() : "",
+                          rhs_path);
+}
 }
 
 #endif