From 37dd6bb15907f96eb8050bc259ca0660a0d0e7a4 Mon Sep 17 00:00:00 2001
From: Charles Milette <charles.milette@gmail.com>
Date: Mon, 25 Apr 2022 21:59:56 -0400
Subject: [PATCH] Address PR review comments

---
 include/spdlog/details/fmt_helper.h    |  6 +++---
 include/spdlog/details/os-inl.h        |  2 +-
 include/spdlog/sinks/ringbuffer_sink.h |  3 ++-
 tests/test_daily_logger.cpp            | 14 +++++++-------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h
index 9a1b69d3..9ed30d0e 100644
--- a/include/spdlog/details/fmt_helper.h
+++ b/include/spdlog/details/fmt_helper.h
@@ -25,13 +25,13 @@ inline spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEX
 
 #ifdef SPDLOG_USE_STD_FORMAT
 template<typename T>
-std::basic_string<T> to_string(const std::basic_string<T> &buf)
+std::basic_string<T> to_string(std::basic_string<T> &&buf)
 {
-    return buf;
+    return std::move(buf);
 }
 #else
 template<typename T, size_t Size>
-std::basic_string<T> to_string(const fmt::basic_memory_buffer<T, Size> &buf)
+std::basic_string<T> to_string(fmt::basic_memory_buffer<T, Size> &&buf)
 {
     return fmt::to_string(buf);
 }
diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h
index 4c17804b..aaefcf83 100644
--- a/include/spdlog/details/os-inl.h
+++ b/include/spdlog/details/os-inl.h
@@ -389,7 +389,7 @@ SPDLOG_INLINE std::string filename_to_str(const filename_t &filename)
 {
     memory_buf_t buf;
     wstr_to_utf8buf(filename, buf);
-    return fmt_helper::to_string(buf);
+    return fmt_helper::to_string(std::move(buf));
 }
 #else
 SPDLOG_INLINE std::string filename_to_str(const filename_t &filename)
diff --git a/include/spdlog/sinks/ringbuffer_sink.h b/include/spdlog/sinks/ringbuffer_sink.h
index de31c99c..7e0c56d0 100644
--- a/include/spdlog/sinks/ringbuffer_sink.h
+++ b/include/spdlog/sinks/ringbuffer_sink.h
@@ -5,6 +5,7 @@
 
 #include "spdlog/sinks/base_sink.h"
 #include "spdlog/details/circular_q.h"
+#include "spdlog/details/fmt_helper.h"
 #include "spdlog/details/log_msg_buffer.h"
 #include "spdlog/details/null_mutex.h"
 
@@ -50,7 +51,7 @@ public:
         {
             memory_buf_t formatted;
             base_sink<Mutex>::formatter_->format(q_.at(i), formatted);
-            ret.push_back(fmt_helper::to_string(formatted));
+            ret.push_back(details::fmt_helper::to_string(std::move(formatted)));
         }
         return ret;
     }
diff --git a/tests/test_daily_logger.cpp b/tests/test_daily_logger.cpp
index 8bcc6d72..a83c4c48 100644
--- a/tests/test_daily_logger.cpp
+++ b/tests/test_daily_logger.cpp
@@ -10,16 +10,16 @@ using filename_memory_buf_t = fmt::basic_memory_buffer<spdlog::filename_t::value
 #endif
 
 #ifdef SPDLOG_WCHAR_FILENAMES
-std::string filename_buf_to_utf8string(const filename_memory_buf_t &w)
+std::string filename_buf_to_utf8string(filename_memory_buf_t &&w)
 {
     spdlog::memory_buf_t buf;
     spdlog::details::os::wstr_to_utf8buf(spdlog::wstring_view_t(w.data(), w.size()), buf);
-    return spdlog::details::fmt_helper::to_string(buf);
+    return spdlog::details::fmt_helper::to_string(std::move(buf));
 }
 #else
-std::string filename_buf_to_utf8string(const filename_memory_buf_t &w)
+std::string filename_buf_to_utf8string(filename_memory_buf_t &&w)
 {
-    return spdlog::details::fmt_helper::to_string(w);
+    return spdlog::details::fmt_helper::to_string(std::move(w));
 }
 #endif
 
@@ -44,7 +44,7 @@ TEST_CASE("daily_logger with dateonly calculator", "[daily_logger]")
     }
     logger->flush();
 
-    require_message_count(filename_buf_to_utf8string(w), 10);
+    require_message_count(filename_buf_to_utf8string(std::move(w)), 10);
 }
 
 struct custom_daily_file_name_calculator
@@ -55,7 +55,7 @@ struct custom_daily_file_name_calculator
         spdlog::fmt_lib::format_to(std::back_inserter(w), SPDLOG_FILENAME_T("{}{:04d}{:02d}{:02d}"), basename, now_tm.tm_year + 1900,
             now_tm.tm_mon + 1, now_tm.tm_mday);
 
-        return spdlog::details::fmt_helper::to_string(w);
+        return spdlog::details::fmt_helper::to_string(std::move(w));
     }
 };
 
@@ -80,7 +80,7 @@ TEST_CASE("daily_logger with custom calculator", "[daily_logger]")
 
     logger->flush();
 
-    require_message_count(filename_buf_to_utf8string(w), 10);
+    require_message_count(filename_buf_to_utf8string(std::move(w)), 10);
 }
 
 /*