[tidy] use FMT_STRING()/fmt::to_string() where possible

Author: tstack

src/base/humanize.network.tests.cc

@@ -72,7 +72,7 @@ TEST_CASE("humanize::network::path")
         CHECK(!rp.p_locality.l_service.has_value());
         CHECK(rp.p_path == "/var/log");
 
-        CHECK(fmt::format(FMT_STRING("{}"), rp.p_locality)
+        CHECK(fmt::to_string(rp.p_locality)
               == "dean@[fe80::184f:c67:baf1:fe02%en0]");
     }
 
@@ -88,7 +88,7 @@ TEST_CASE("humanize::network::path")
         CHECK(!rp.p_locality.l_service.has_value());
         CHECK(rp.p_path == "/var/log");
 
-        CHECK(fmt::format("{}", rp.p_locality)
+        CHECK(fmt::to_string(rp.p_locality)
               == "[fe80::184f:c67:baf1:fe02%en0]");
     }
 

src/files_sub_source.cc

@@ -445,8 +445,8 @@ files_overlay_source::list_static_overlay(const listview_curses& lv,
         const auto& prog = sp->sp_extractions.front();
 
         value_out.with_ansi_string(fmt::format(
-            "{} Extracting " ANSI_COLOR(COLOR_CYAN) "{}" ANSI_NORM
-                                                    "... {:>8}/{}",
+            FMT_STRING("{} Extracting " ANSI_COLOR(COLOR_CYAN) "{}" ANSI_NORM
+                                                              "... {:>8}/{}"),
             humanize::sparkline(prog.ep_out_size, prog.ep_total_size),
             prog.ep_path.filename().string(),
             humanize::file_size(prog.ep_out_size, humanize::alignment::none),
@@ -458,7 +458,8 @@ files_overlay_source::list_static_overlay(const listview_curses& lv,
         auto first_iter = sp->sp_tailers.begin();
 
         value_out.with_ansi_string(fmt::format(
-            "{} Connecting to " ANSI_COLOR(COLOR_CYAN) "{}" ANSI_NORM ": {}",
+            FMT_STRING("{} Connecting to " ANSI_COLOR(COLOR_CYAN) "{}" ANSI_NORM
+                                                                 ": {}"),
             PROG[spinner_index() % PROG_SIZE],
             first_iter->first,
             first_iter->second.tp_message));

src/lnav.prompt.cc

@@ -391,9 +391,8 @@ prompt::refresh_sql_completions(textview_curses& tc)
                     this->insert_sql_completion(
                         name, sql_function_t{func->ht_parameters.size()});
                     if (!func->ht_prql_path.empty()) {
-                        auto prql_name
-                            = fmt::format(FMT_STRING("{}"),
-                                          fmt::join(func->ht_prql_path, "."));
+                        auto prql_name = fmt::to_string(
+                            fmt::join(func->ht_prql_path, "."));
                         this->insert_sql_completion(prql_name,
                                                     prql_function_t{});
                     }
@@ -1008,8 +1007,7 @@ prompt::get_cmd_parameter_completion(textview_curses& tc,
                     && rp_opt)
                 {
                     auto rp_path = rp_opt.value();
-                    auto remote_prefix
-                        = fmt::format(FMT_STRING("{}"), rp_path.p_locality);
+                    auto remote_prefix = fmt::to_string(rp_path.p_locality);
 
                     log_info("completing remote path: %s -- %s",
                              remote_prefix.c_str(),

src/log_format.cc

@@ -2951,8 +2951,8 @@ rewrite_json_field(yajlpp_parse_context* ypc,
                 {
                     jlu->jlu_format->lf_date_time.relock(ls);
                     jlu->jlu_scan_error = log_format::scan_error{
-                        fmt::format("failed to parse timestamp '{}' in string "
-                                    "property '{}'",
+                        fmt::format(FMT_STRING("failed to parse timestamp "
+                                               "'{}' in string property '{}'"),
                                     frag,
                                     field_name)};
                 }

src/plain_text_source.cc

@@ -30,8 +30,8 @@
 #include "plain_text_source.hh"
 
 #include "base/intern_string.hh"
-#include "base/string_util.hh"
 #include "base/itertools.hh"
+#include "base/string_util.hh"
 #include "config.h"
 #include "document.sections.hh"
 #include "scn/scan.h"
@@ -178,12 +178,8 @@ plain_text_source::text_value_for_line(textview_curses& tc,
     value_out = this->tds_lines[row].tl_value.get_string();
     this->tds_line_indent_size = compute_indent_size(value_out);
     if (this->tds_line_indent_size == 0 && value_out.empty()) {
-        for (auto next = row + 1;
-             next < (int) this->tds_lines.size();
-             ++next)
-        {
-            const auto& next_str
-                = this->tds_lines[next].tl_value.get_string();
+        for (auto next = row + 1; next < (int) this->tds_lines.size(); ++next) {
+            const auto& next_str = this->tds_lines[next].tl_value.get_string();
             this->tds_line_indent_size = compute_indent_size(next_str) + 1;
             if (!next_str.empty()) {
                 break;
@@ -517,7 +513,7 @@ plain_text_source::adjacent_anchor(vis_line_t vl, direction dir)
         tl.tl_offset, tl.tl_offset + tl.tl_value.al_string.length());
 
     log_trace("adjacent_anchor: curr path = %s",
-              fmt::format(FMT_STRING("{}"), path_for_line).c_str());
+              fmt::to_string(path_for_line).c_str());
     const auto& md = this->tds_doc_sections;
     if (path_for_line.empty()) {
         auto neighbors_res = md.m_sections_root->line_neighbors(vl);

src/sqlite-extension-func.cc

@@ -100,8 +100,7 @@ struct prql_hier {
 static void
 register_help(prql_hier& phier, const help_text& ht)
 {
-    auto prql_fqid
-        = fmt::format(FMT_STRING("{}"), fmt::join(ht.ht_prql_path, "."));
+    auto prql_fqid = fmt::to_string(fmt::join(ht.ht_prql_path, "."));
     lnav::sql::prql_functions.emplace(prql_fqid, &ht);
 
     auto* curr_hier = &phier;