update spdlog (it still dont work), fix 6.3(1)

Project Reboot 3.0/addresses.cpp

@@ -331,8 +331,8 @@ void Addresses::FindAll()
 	LOG_INFO(LogDev, "Finished finding!");
 }
 
-#define PRINT_CRITICAL_OFFSET(offset) if (!offset) LOG_ERROR(LogDev, "Failed to find {}", #offset) \
+#define PRINT_CRITICAL_OFFSET(offset) if (!offset) { LOG_ERROR(LogDev, "Failed to find {}", #offset) } \
-	else LOG_INFO(LogDev, "{}: 0x{:x}", #offset, offset - __int64(GetModuleHandleW(0)));
+	else { LOG_INFO(LogDev, "{}: 0x{:x}", #offset, offset - __int64(GetModuleHandleW(0))) };
 
 void Addresses::Print()
 {
@@ -608,7 +608,10 @@ std::vector<uint64> Addresses::GetFunctionsToNull()
 	if (Engine_Version == 421)
 	{
 		toNull.push_back(Memcury::Scanner::FindPattern("48 8B C4 48 89 58 08 48 89 70 10 57 48 81 EC ? ? ? ? 48 8B BA ? ? ? ? 48 8B DA 0F 29").Get()); // Pawn Overlap
-		toNull.push_back(Memcury::Scanner::FindStringRef(L"Widget Class %s - Running Initialize On Archetype, %s.").ScanFor({ 0x40, 0x55 }, false).Get()); // Widget class
+
+		std::vector<uint8_t> BytesToFind = Fortnite_Version < 6.3 ? std::vector<uint8_t>{ 0x40, 0x55 } : std::vector<uint8_t>{ 0x48, 0x89, 0x5C };
+
+		toNull.push_back(Memcury::Scanner::FindStringRef(L"Widget Class %s - Running Initialize On Archetype, %s.").ScanFor(BytesToFind, false).Get()); // Widget class
 	}
 
 	if (Engine_Version >= 422 

Project Reboot 3.0/dllmain.cpp

@@ -818,6 +818,8 @@ DWORD WINAPI Main(LPVOID)
         return 1;
     }
 
+    std::cout << std::format("Base Address: 0x{:x}\n", __int64(GetModuleHandleW(0)));
+
     LOG_INFO(LogInit, "Initializing Project Reboot!");
     LOG_INFO(LogDev, "Built on {} {}", __DATE__, __TIME__);
 

Project Reboot 3.0/finder.h

@@ -1771,9 +1771,10 @@ static inline uint64 FindReplaceBuildingActor()
 		return Memcury::Scanner::FindPattern("4C 89 44 24 ? 55 56 57 41 55 41 56 41 57 48 8D AC 24 ? ? ? ? 48 81 EC ? ? ? ? 45").Get(); // 1.7.2 & 2.4.2
 	}
 
-	return FindBytes(StringRef, 
+	auto BytesToFind = Engine_Version == 420 || (Engine_Version == 421 && Fortnite_Version < 6.30) || Engine_Version >= 427 ? std::vector<uint8_t>{ 0x48, 0x8B, 0xC4 }
-		(Engine_Version == 420 || Engine_Version == 421 || Engine_Version >= 427 ? std::vector<uint8_t>{ 0x48, 0x8B, 0xC4 } : std::vector<uint8_t>{ 0x4C, 0x8B }),
+		: std::vector<uint8_t>{ 0x4C, 0x8B };
-		1000, 0, true);
+
+	return FindBytes(StringRef, BytesToFind, 1000, 0, true);
 }
 
 static inline uint64 FindSendClientAdjustment()

Project Reboot 3.0/log.h

@@ -12,6 +12,8 @@
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include <filesystem>
 
+// #define ENABLE_SPD_LOG
+
 static inline std::vector<spdlog::sink_ptr> sinks;
 
 enum ELogLevel : uint8_t
@@ -55,6 +57,8 @@ inline void InitLogger()
 
     SetConsoleTitleA("Project Reboot 3.0");
     
+#ifdef ENABLE_SPD_LOG
+
     std::string logName = "reboot.log"; // GenerateLogFileName();
 
     sinks.emplace_back(std::make_shared<spdlog::sinks::stdout_color_sink_mt>())->set_pattern("[%D-%T] %n: %^%v%$");
@@ -89,8 +93,10 @@ inline void InitLogger()
     MakeLogger("LogRebooting");
     MakeLogger("LogObjectViewer");
     MakeLogger("LogLateGame");
+#endif
 }
 
+#ifdef ENABLE_SPD_LOG
 #define LOG_DEBUG(loggerName, ...)                                            \
     if (spdlog::get(#loggerName))          \
         spdlog::get(#loggerName)->debug(std::format(__VA_ARGS__));
@@ -106,3 +112,10 @@ inline void InitLogger()
 #define LOG_FATAL(loggerName, ...)                                               \
     if (spdlog::get(#loggerName))             \
         spdlog::get(#loggerName)->critical(std::format(__VA_ARGS__));
+#else
+#define LOG_DEBUG(loggerName, ...)
+#define LOG_INFO(loggerName, ...)
+#define LOG_WARN(loggerName, ...)
+#define LOG_ERROR(loggerName, ...)
+#define LOG_FATAL(loggerName, ...)
+#endif

vendor/spdlog/async.h

@@ -18,9 +18,9 @@
 #include <spdlog/details/registry.h>
 #include <spdlog/details/thread_pool.h>
 
+#include <functional>
 #include <memory>
 #include <mutex>
-#include <functional>
 
 namespace spdlog {
 
@@ -31,12 +31,10 @@ static const size_t default_async_q_size = 8192;
 // async logger factory - creates async loggers backed with thread pool.
 // if a global thread pool doesn't already exist, create it with default queue
 // size of 8192 items and single thread.
-template<async_overflow_policy OverflowPolicy = async_overflow_policy::block>
+template <async_overflow_policy OverflowPolicy = async_overflow_policy::block>
-struct async_factory_impl
+struct async_factory_impl {
-{
+    template <typename Sink, typename... SinkArgs>
-    template<typename Sink, typename... SinkArgs>
+    static std::shared_ptr<async_logger> create(std::string logger_name, SinkArgs &&...args) {
-    static std::shared_ptr<async_logger> create(std::string logger_name, SinkArgs &&... args)
-    {
         auto &registry_inst = details::registry::instance();
 
         // create global thread pool if not already exists..
@@ -44,14 +42,14 @@ struct async_factory_impl
         auto &mutex = registry_inst.tp_mutex();
         std::lock_guard<std::recursive_mutex> tp_lock(mutex);
         auto tp = registry_inst.get_tp();
-        if (tp == nullptr)
+        if (tp == nullptr) {
-        {
             tp = std::make_shared<details::thread_pool>(details::default_async_q_size, 1U);
             registry_inst.set_tp(tp);
         }
 
         auto sink = std::make_shared<Sink>(std::forward<SinkArgs>(args)...);
-        auto new_logger = std::make_shared<async_logger>(std::move(logger_name), std::move(sink), std::move(tp), OverflowPolicy);
+        auto new_logger = std::make_shared<async_logger>(std::move(logger_name), std::move(sink),
+                                                         std::move(tp), OverflowPolicy);
         registry_inst.initialize_logger(new_logger);
         return new_logger;
     }
@@ -60,40 +58,43 @@ struct async_factory_impl
 using async_factory = async_factory_impl<async_overflow_policy::block>;
 using async_factory_nonblock = async_factory_impl<async_overflow_policy::overrun_oldest>;
 
-template<typename Sink, typename... SinkArgs>
+template <typename Sink, typename... SinkArgs>
-inline std::shared_ptr<spdlog::logger> create_async(std::string logger_name, SinkArgs &&... sink_args)
+inline std::shared_ptr<spdlog::logger> create_async(std::string logger_name,
-{
+                                                    SinkArgs &&...sink_args) {
-    return async_factory::create<Sink>(std::move(logger_name), std::forward<SinkArgs>(sink_args)...);
+    return async_factory::create<Sink>(std::move(logger_name),
+                                       std::forward<SinkArgs>(sink_args)...);
 }
 
-template<typename Sink, typename... SinkArgs>
+template <typename Sink, typename... SinkArgs>
-inline std::shared_ptr<spdlog::logger> create_async_nb(std::string logger_name, SinkArgs &&... sink_args)
+inline std::shared_ptr<spdlog::logger> create_async_nb(std::string logger_name,
-{
+                                                       SinkArgs &&...sink_args) {
-    return async_factory_nonblock::create<Sink>(std::move(logger_name), std::forward<SinkArgs>(sink_args)...);
+    return async_factory_nonblock::create<Sink>(std::move(logger_name),
+                                                std::forward<SinkArgs>(sink_args)...);
 }
 
 // set global thread pool.
-inline void init_thread_pool(
+inline void init_thread_pool(size_t q_size,
-    size_t q_size, size_t thread_count, std::function<void()> on_thread_start, std::function<void()> on_thread_stop)
+                             size_t thread_count,
-{
+                             std::function<void()> on_thread_start,
-    auto tp = std::make_shared<details::thread_pool>(q_size, thread_count, on_thread_start, on_thread_stop);
+                             std::function<void()> on_thread_stop) {
+    auto tp = std::make_shared<details::thread_pool>(q_size, thread_count, on_thread_start,
+                                                     on_thread_stop);
     details::registry::instance().set_tp(std::move(tp));
 }
 
-inline void init_thread_pool(size_t q_size, size_t thread_count, std::function<void()> on_thread_start)
+inline void init_thread_pool(size_t q_size,
-{
+                             size_t thread_count,
+                             std::function<void()> on_thread_start) {
     init_thread_pool(q_size, thread_count, on_thread_start, [] {});
 }
 
-inline void init_thread_pool(size_t q_size, size_t thread_count)
+inline void init_thread_pool(size_t q_size, size_t thread_count) {
-{
     init_thread_pool(
         q_size, thread_count, [] {}, [] {});
 }
 
 // get the global thread pool.
-inline std::shared_ptr<spdlog::details::thread_pool> thread_pool()
+inline std::shared_ptr<spdlog::details::thread_pool> thread_pool() {
-{
     return details::registry::instance().get_tp();
 }
 }  // namespace spdlog

vendor/spdlog/async_logger-inl.h

@@ -4,88 +4,82 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/async_logger.h>
+    #include <spdlog/async_logger.h>
 #endif
 
-#include <spdlog/sinks/sink.h>
 #include <spdlog/details/thread_pool.h>
+#include <spdlog/sinks/sink.h>
 
 #include <memory>
 #include <string>
 
-SPDLOG_INLINE spdlog::async_logger::async_logger(
+SPDLOG_INLINE spdlog::async_logger::async_logger(std::string logger_name,
-    std::string logger_name, sinks_init_list sinks_list, std::weak_ptr<details::thread_pool> tp, async_overflow_policy overflow_policy)
+                                                 sinks_init_list sinks_list,
-    : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), std::move(tp), overflow_policy)
+                                                 std::weak_ptr<details::thread_pool> tp,
-{}
+                                                 async_overflow_policy overflow_policy)
+    : async_logger(std::move(logger_name),
+                   sinks_list.begin(),
+                   sinks_list.end(),
+                   std::move(tp),
+                   overflow_policy) {}
 
-SPDLOG_INLINE spdlog::async_logger::async_logger(
+SPDLOG_INLINE spdlog::async_logger::async_logger(std::string logger_name,
-    std::string logger_name, sink_ptr single_sink, std::weak_ptr<details::thread_pool> tp, async_overflow_policy overflow_policy)
+                                                 sink_ptr single_sink,
-    : async_logger(std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy)
+                                                 std::weak_ptr<details::thread_pool> tp,
-{}
+                                                 async_overflow_policy overflow_policy)
+    : async_logger(
+          std::move(logger_name), {std::move(single_sink)}, std::move(tp), overflow_policy) {}
 
 // send the log message to the thread pool
-SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg)
+SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg){
-{
+    SPDLOG_TRY{if (auto pool_ptr = thread_pool_.lock()){
-    if (auto pool_ptr = thread_pool_.lock())
-    {
         pool_ptr->post_log(shared_from_this(), msg, overflow_policy_);
-    }
+}
-    else
+else {
-    {
     throw_spdlog_ex("async log: thread pool doesn't exist anymore");
-    }
+}
+}
+SPDLOG_LOGGER_CATCH(msg.source)
 }
 
 // send flush request to the thread pool
-SPDLOG_INLINE void spdlog::async_logger::flush_()
+SPDLOG_INLINE void spdlog::async_logger::flush_(){SPDLOG_TRY{auto pool_ptr = thread_pool_.lock();
-{
+if (!pool_ptr) {
-    if (auto pool_ptr = thread_pool_.lock())
-    {
-        pool_ptr->post_flush(shared_from_this(), overflow_policy_);
-    }
-    else
-    {
     throw_spdlog_ex("async flush: thread pool doesn't exist anymore");
-    }
+}
+
+std::future<void> future = pool_ptr->post_flush(shared_from_this(), overflow_policy_);
+// Wait for the flush operation to complete.
+// This might throw exception if the flush message get dropped because of overflow.
+future.get();
+}
+SPDLOG_LOGGER_CATCH(source_loc())
 }
 
 //
 // backend functions - called from the thread pool to do the actual job
 //
-SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg)
+SPDLOG_INLINE void spdlog::async_logger::backend_sink_it_(const details::log_msg &msg) {
-{
+    for (auto &sink : sinks_) {
-    for (auto &sink : sinks_)
+        if (sink->should_log(msg.level)) {
-    {
+            SPDLOG_TRY { sink->log(msg); }
-        if (sink->should_log(msg.level))
-        {
-            SPDLOG_TRY
-            {
-                sink->log(msg);
-            }
             SPDLOG_LOGGER_CATCH(msg.source)
         }
     }
 
-    if (should_flush_(msg))
+    if (should_flush_(msg)) {
-    {
         backend_flush_();
     }
 }
 
-SPDLOG_INLINE void spdlog::async_logger::backend_flush_()
+SPDLOG_INLINE void spdlog::async_logger::backend_flush_() {
-{
+    for (auto &sink : sinks_) {
-    for (auto &sink : sinks_)
+        SPDLOG_TRY { sink->flush(); }
-    {
-        SPDLOG_TRY
-        {
-            sink->flush();
-        }
         SPDLOG_LOGGER_CATCH(source_loc())
     }
 }
 
-SPDLOG_INLINE std::shared_ptr<spdlog::logger> spdlog::async_logger::clone(std::string new_name)
+SPDLOG_INLINE std::shared_ptr<spdlog::logger> spdlog::async_logger::clone(std::string new_name) {
-{
     auto cloned = std::make_shared<spdlog::async_logger>(*this);
     cloned->name_ = std::move(new_name);
     return cloned;

vendor/spdlog/async_logger.h

@@ -19,34 +19,40 @@
 namespace spdlog {
 
 // Async overflow policy - block by default.
-enum class async_overflow_policy
+enum class async_overflow_policy {
-{
     block,           // Block until message can be enqueued
-    overrun_oldest // Discard oldest message in the queue if full when trying to
+    overrun_oldest,  // Discard oldest message in the queue if full when trying to
                      // add new item.
+    discard_new      // Discard new message if the queue is full when trying to add new item.
 };
 
 namespace details {
 class thread_pool;
 }
 
-class SPDLOG_API async_logger final : public std::enable_shared_from_this<async_logger>, public logger
+class SPDLOG_API async_logger final : public std::enable_shared_from_this<async_logger>,
-{
+                                      public logger {
     friend class details::thread_pool;
 
 public:
-    template<typename It>
+    template <typename It>
-    async_logger(std::string logger_name, It begin, It end, std::weak_ptr<details::thread_pool> tp,
+    async_logger(std::string logger_name,
+                 It begin,
+                 It end,
+                 std::weak_ptr<details::thread_pool> tp,
                  async_overflow_policy overflow_policy = async_overflow_policy::block)
-        : logger(std::move(logger_name), begin, end)
+        : logger(std::move(logger_name), begin, end),
-        , thread_pool_(std::move(tp))
+          thread_pool_(std::move(tp)),
-        , overflow_policy_(overflow_policy)
+          overflow_policy_(overflow_policy) {}
-    {}
 
-    async_logger(std::string logger_name, sinks_init_list sinks_list, std::weak_ptr<details::thread_pool> tp,
+    async_logger(std::string logger_name,
+                 sinks_init_list sinks_list,
+                 std::weak_ptr<details::thread_pool> tp,
                  async_overflow_policy overflow_policy = async_overflow_policy::block);
 
-    async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr<details::thread_pool> tp,
+    async_logger(std::string logger_name,
+                 sink_ptr single_sink,
+                 std::weak_ptr<details::thread_pool> tp,
                  async_overflow_policy overflow_policy = async_overflow_policy::block);
 
     std::shared_ptr<logger> clone(std::string new_name) override;
@@ -64,5 +70,5 @@ private:
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "async_logger-inl.h"
+    #include "async_logger-inl.h"
 #endif

vendor/spdlog/cfg/argv.h

@@ -21,22 +21,18 @@ namespace spdlog {
 namespace cfg {
 
 // search for SPDLOG_LEVEL= in the args and use it to init the levels
-inline void load_argv_levels(int argc, const char **argv)
+inline void load_argv_levels(int argc, const char **argv) {
-{
     const std::string spdlog_level_prefix = "SPDLOG_LEVEL=";
-    for (int i = 1; i < argc; i++)
+    for (int i = 1; i < argc; i++) {
-    {
         std::string arg = argv[i];
-        if (arg.find(spdlog_level_prefix) == 0)
+        if (arg.find(spdlog_level_prefix) == 0) {
-        {
             auto levels_string = arg.substr(spdlog_level_prefix.size());
             helpers::load_levels(levels_string);
         }
     }
 }
 
-inline void load_argv_levels(int argc, char **argv)
+inline void load_argv_levels(int argc, char **argv) {
-{
     load_argv_levels(argc, const_cast<const char **>(argv));
 }
 

vendor/spdlog/cfg/env.h

@@ -3,8 +3,8 @@
 
 #pragma once
 #include <spdlog/cfg/helpers.h>
-#include <spdlog/details/registry.h>
 #include <spdlog/details/os.h>
+#include <spdlog/details/registry.h>
 
 //
 // Init levels and patterns from env variables SPDLOG_LEVEL
@@ -25,11 +25,9 @@
 
 namespace spdlog {
 namespace cfg {
-inline void load_env_levels()
+inline void load_env_levels() {
-{
     auto env_val = details::os::getenv("SPDLOG_LEVEL");
-    if (!env_val.empty())
+    if (!env_val.empty()) {
-    {
         helpers::load_levels(env_val);
     }
 }

vendor/spdlog/cfg/helpers-inl.h

@@ -4,33 +4,32 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/cfg/helpers.h>
+    #include <spdlog/cfg/helpers.h>
 #endif
 
-#include <spdlog/spdlog.h>
 #include <spdlog/details/os.h>
 #include <spdlog/details/registry.h>
+#include <spdlog/spdlog.h>
 
 #include <algorithm>
+#include <sstream>
 #include <string>
 #include <utility>
-#include <sstream>
 
 namespace spdlog {
 namespace cfg {
 namespace helpers {
 
 // inplace convert to lowercase
-inline std::string &to_lower_(std::string &str)
+inline std::string &to_lower_(std::string &str) {
-{
+    std::transform(str.begin(), str.end(), str.begin(), [](char ch) {
-    std::transform(
+        return static_cast<char>((ch >= 'A' && ch <= 'Z') ? ch + ('a' - 'A') : ch);
-        str.begin(), str.end(), str.begin(), [](char ch) { return static_cast<char>((ch >= 'A' && ch <= 'Z') ? ch + ('a' - 'A') : ch); });
+    });
     return str;
 }
 
 // inplace trim spaces
-inline std::string &trim_(std::string &str)
+inline std::string &trim_(std::string &str) {
-{
     const char *spaces = " \n\r\t";
     str.erase(str.find_last_not_of(spaces) + 1);
     str.erase(0, str.find_first_not_of(spaces));
@@ -44,16 +43,12 @@ inline std::string &trim_(std::string &str)
 // "key=" => ("key", "")
 // "val" => ("", "val")
 
-inline std::pair<std::string, std::string> extract_kv_(char sep, const std::string &str)
+inline std::pair<std::string, std::string> extract_kv_(char sep, const std::string &str) {
-{
     auto n = str.find(sep);
     std::string k, v;
-    if (n == std::string::npos)
+    if (n == std::string::npos) {
-    {
         v = str;
-    }
+    } else {
-    else
-    {
         k = str.substr(0, n);
         v = str.substr(n + 1);
     }
@@ -62,15 +57,12 @@ inline std::pair<std::string, std::string> extract_kv_(char sep, const std::stri
 
 // return vector of key/value pairs from sequence of "K1=V1,K2=V2,.."
 // "a=AAA,b=BBB,c=CCC,.." => {("a","AAA"),("b","BBB"),("c", "CCC"),...}
-inline std::unordered_map<std::string, std::string> extract_key_vals_(const std::string &str)
+inline std::unordered_map<std::string, std::string> extract_key_vals_(const std::string &str) {
-{
     std::string token;
     std::istringstream token_stream(str);
     std::unordered_map<std::string, std::string> rv{};
-    while (std::getline(token_stream, token, ','))
+    while (std::getline(token_stream, token, ',')) {
-    {
+        if (token.empty()) {
-        if (token.empty())
-        {
             continue;
         }
         auto kv = extract_kv_('=', token);
@@ -79,10 +71,8 @@ inline std::unordered_map<std::string, std::string> extract_key_vals_(const std:
     return rv;
 }
 
-SPDLOG_INLINE void load_levels(const std::string &input)
+SPDLOG_INLINE void load_levels(const std::string &input) {
-{
+    if (input.empty() || input.size() > 512) {
-    if (input.empty() || input.size() > 512)
-    {
         return;
     }
 
@@ -91,28 +81,25 @@ SPDLOG_INLINE void load_levels(const std::string &input)
     level::level_enum global_level = level::info;
     bool global_level_found = false;
 
-    for (auto &name_level : key_vals)
+    for (auto &name_level : key_vals) {
-    {
         auto &logger_name = name_level.first;
         auto level_name = to_lower_(name_level.second);
         auto level = level::from_str(level_name);
         // ignore unrecognized level names
-        if (level == level::off && level_name != "off")
+        if (level == level::off && level_name != "off") {
-        {
             continue;
         }
         if (logger_name.empty())  // no logger name indicate global level
         {
             global_level_found = true;
             global_level = level;
-        }
+        } else {
-        else
-        {
             levels[logger_name] = level;
         }
     }
 
-    details::registry::instance().set_levels(std::move(levels), global_level_found ? &global_level : nullptr);
+    details::registry::instance().set_levels(std::move(levels),
+                                             global_level_found ? &global_level : nullptr);
 }
 
 }  // namespace helpers

vendor/spdlog/cfg/helpers.h

@@ -25,5 +25,5 @@ SPDLOG_API void load_levels(const std::string &txt);
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "helpers-inl.h"
+    #include "helpers-inl.h"
 #endif  // SPDLOG_HEADER_ONLY

vendor/spdlog/common-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/common.h>
+    #include <spdlog/common.h>
 #endif
 
 #include <algorithm>
@@ -20,29 +20,24 @@ constexpr
 
 static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES;
 
-SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
+SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT {
-{
     return level_string_views[l];
 }
 
-SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
+SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT {
-{
     return short_level_names[l];
 }
 
-SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT
+SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT {
-{
     auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name);
     if (it != std::end(level_string_views))
-        return static_cast<level::level_enum>(it - std::begin(level_string_views));
+        return static_cast<level::level_enum>(std::distance(std::begin(level_string_views), it));
 
     // check also for "warn" and "err" before giving up..
-    if (name == "warn")
+    if (name == "warn") {
-    {
         return level::warn;
     }
-    if (name == "err")
+    if (name == "err") {
-    {
         return level::err;
     }
     return level::off;
@@ -50,11 +45,9 @@ SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG
 }  // namespace level
 
 SPDLOG_INLINE spdlog_ex::spdlog_ex(std::string msg)
-    : msg_(std::move(msg))
+    : msg_(std::move(msg)) {}
-{}
 
-SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno)
+SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) {
-{
 #ifdef SPDLOG_USE_STD_FORMAT
     msg_ = std::system_error(std::error_code(last_errno, std::generic_category()), msg).what();
 #else
@@ -64,19 +57,12 @@ SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno)
 #endif
 }
 
-SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT
+SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT { return msg_.c_str(); }
-{
-    return msg_.c_str();
-}
 
-SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno)
+SPDLOG_INLINE void throw_spdlog_ex(const std::string &msg, int last_errno) {
-{
     SPDLOG_THROW(spdlog_ex(msg, last_errno));
 }
 
-SPDLOG_INLINE void throw_spdlog_ex(std::string msg)
+SPDLOG_INLINE void throw_spdlog_ex(std::string msg) { SPDLOG_THROW(spdlog_ex(std::move(msg))); }
-{
-    SPDLOG_THROW(spdlog_ex(std::move(msg)));
-}
 
 }  // namespace spdlog

vendor/spdlog/common.h

@@ -3,104 +3,121 @@
 
 #pragma once
 
-#include <spdlog/tweakme.h>
 #include <spdlog/details/null_mutex.h>
+#include <spdlog/tweakme.h>
 
 #include <atomic>
 #include <chrono>
+#include <cstdio>
+#include <exception>
+#include <functional>
 #include <initializer_list>
 #include <memory>
-#include <exception>
 #include <string>
 #include <type_traits>
-#include <functional>
-#include <cstdio>
 
 #ifdef SPDLOG_USE_STD_FORMAT
-#    include <string_view>
+    #include <version>
+    #if __cpp_lib_format >= 202207L
+        #include <format>
+    #else
+        #include <string_view>
+    #endif
 #endif
 
 #ifdef SPDLOG_COMPILED_LIB
-#    undef SPDLOG_HEADER_ONLY
+    #undef SPDLOG_HEADER_ONLY
-#    if defined(SPDLOG_SHARED_LIB)
+    #if defined(SPDLOG_SHARED_LIB)
-#        if defined(_WIN32)
+        #if defined(_WIN32)
-#            ifdef spdlog_EXPORTS
+            #ifdef spdlog_EXPORTS
-#                define SPDLOG_API __declspec(dllexport)
+                #define SPDLOG_API __declspec(dllexport)
-#            else // !spdlog_EXPORTS
+            #else  // !spdlog_EXPORTS
-#                define SPDLOG_API __declspec(dllimport)
+                #define SPDLOG_API __declspec(dllimport)
-#            endif
+            #endif
-#        else // !defined(_WIN32)
+        #else  // !defined(_WIN32)
-#            define SPDLOG_API __attribute__((visibility("default")))
+            #define SPDLOG_API __attribute__((visibility("default")))
-#        endif
+        #endif
-#    else // !defined(SPDLOG_SHARED_LIB)
+    #else  // !defined(SPDLOG_SHARED_LIB)
-#        define SPDLOG_API
+        #define SPDLOG_API
-#    endif
+    #endif
-#    define SPDLOG_INLINE
+    #define SPDLOG_INLINE
 #else  // !defined(SPDLOG_COMPILED_LIB)
-#    define SPDLOG_API
+    #define SPDLOG_API
-#    define SPDLOG_HEADER_ONLY
+    #define SPDLOG_HEADER_ONLY
-#    define SPDLOG_INLINE inline
+    #define SPDLOG_INLINE inline
 #endif  // #ifdef SPDLOG_COMPILED_LIB
 
 #include <spdlog/fmt/fmt.h>
 
-#if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION >= 80000 // backward compatibility with fmt versions older than 8
+#if !defined(SPDLOG_USE_STD_FORMAT) && \
-#    define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string)
+    FMT_VERSION >= 80000  // backward compatibility with fmt versions older than 8
-#    if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+    #define SPDLOG_FMT_RUNTIME(format_string) fmt::runtime(format_string)
-#        include <spdlog/fmt/xchar.h>
+    #define SPDLOG_FMT_STRING(format_string) FMT_STRING(format_string)
-#    endif
+    #if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+        #include <spdlog/fmt/xchar.h>
+    #endif
 #else
-#    define SPDLOG_FMT_RUNTIME(format_string) format_string
+    #define SPDLOG_FMT_RUNTIME(format_string) format_string
+    #define SPDLOG_FMT_STRING(format_string) format_string
 #endif
 
 // visual studio up to 2013 does not support noexcept nor constexpr
 #if defined(_MSC_VER) && (_MSC_VER < 1900)
-#    define SPDLOG_NOEXCEPT _NOEXCEPT
+    #define SPDLOG_NOEXCEPT _NOEXCEPT
-#    define SPDLOG_CONSTEXPR
+    #define SPDLOG_CONSTEXPR
-#    define SPDLOG_CONSTEXPR_FUNC
 #else
-#    define SPDLOG_NOEXCEPT noexcept
+    #define SPDLOG_NOEXCEPT noexcept
-#    define SPDLOG_CONSTEXPR constexpr
+    #define SPDLOG_CONSTEXPR constexpr
-#    if __cplusplus >= 201402L
+#endif
-#        define SPDLOG_CONSTEXPR_FUNC constexpr
+
-#    else
+// If building with std::format, can just use constexpr, otherwise if building with fmt
-#        define SPDLOG_CONSTEXPR_FUNC
+// SPDLOG_CONSTEXPR_FUNC needs to be set the same as FMT_CONSTEXPR to avoid situations where
-#    endif
+// a constexpr function in spdlog could end up calling a non-constexpr function in fmt
+// depending on the compiler
+// If fmt determines it can't use constexpr, we should inline the function instead
+#ifdef SPDLOG_USE_STD_FORMAT
+    #define SPDLOG_CONSTEXPR_FUNC constexpr
+#else  // Being built with fmt
+    #if FMT_USE_CONSTEXPR
+        #define SPDLOG_CONSTEXPR_FUNC FMT_CONSTEXPR
+    #else
+        #define SPDLOG_CONSTEXPR_FUNC inline
+    #endif
 #endif
 
 #if defined(__GNUC__) || defined(__clang__)
-#    define SPDLOG_DEPRECATED __attribute__((deprecated))
+    #define SPDLOG_DEPRECATED __attribute__((deprecated))
 #elif defined(_MSC_VER)
-#    define SPDLOG_DEPRECATED __declspec(deprecated)
+    #define SPDLOG_DEPRECATED __declspec(deprecated)
 #else
-#    define SPDLOG_DEPRECATED
+    #define SPDLOG_DEPRECATED
 #endif
 
 // disable thread local on msvc 2013
 #ifndef SPDLOG_NO_TLS
-#    if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt)
+    #if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__cplusplus_winrt)
-#        define SPDLOG_NO_TLS 1
+        #define SPDLOG_NO_TLS 1
-#    endif
+    #endif
 #endif
 
 #ifndef SPDLOG_FUNCTION
-#    define SPDLOG_FUNCTION static_cast<const char *>(__FUNCTION__)
+    #define SPDLOG_FUNCTION static_cast<const char *>(__FUNCTION__)
 #endif
 
 #ifdef SPDLOG_NO_EXCEPTIONS
-#    define SPDLOG_TRY
+    #define SPDLOG_TRY
-#    define SPDLOG_THROW(ex)                                                                                                               \
+    #define SPDLOG_THROW(ex)                               \
-        do                                                                                                                                 \
+        do {                                               \
-        {                                                                                                                                  \
             printf("spdlog fatal error: %s\n", ex.what()); \
             std::abort();                                  \
         } while (0)
-#    define SPDLOG_CATCH_STD
+    #define SPDLOG_CATCH_STD
 #else
-#    define SPDLOG_TRY try
+    #define SPDLOG_TRY try
-#    define SPDLOG_THROW(ex) throw(ex)
+    #define SPDLOG_THROW(ex) throw(ex)
-#    define SPDLOG_CATCH_STD                                                                                                               \
+    #define SPDLOG_CATCH_STD             \
-        catch (const std::exception &) {}
+        catch (const std::exception &) { \
+        }
 #endif
 
 namespace spdlog {
@@ -113,12 +130,12 @@ class sink;
 
 #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
 using filename_t = std::wstring;
-// allow macro expansion to occur in SPDLOG_FILENAME_T
+    // allow macro expansion to occur in SPDLOG_FILENAME_T
-#    define SPDLOG_FILENAME_T_INNER(s) L##s
+    #define SPDLOG_FILENAME_T_INNER(s) L##s
-#    define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s)
+    #define SPDLOG_FILENAME_T(s) SPDLOG_FILENAME_T_INNER(s)
 #else
 using filename_t = std::string;
-#    define SPDLOG_FILENAME_T(s) s
+    #define SPDLOG_FILENAME_T(s) s
 #endif
 
 using log_clock = std::chrono::system_clock;
@@ -131,61 +148,79 @@ namespace fmt_lib = std;
 using string_view_t = std::string_view;
 using memory_buf_t = std::string;
 
-template<typename... Args>
+template <typename... Args>
+    #if __cpp_lib_format >= 202207L
+using format_string_t = std::format_string<Args...>;
+    #else
 using format_string_t = std::string_view;
+    #endif
 
-template<class T, class Char = char>
+template <class T, class Char = char>
-struct is_convertible_to_basic_format_string : std::integral_constant<bool, std::is_convertible<T, std::basic_string_view<Char>>::value>
+struct is_convertible_to_basic_format_string
-{};
+    : std::integral_constant<bool, std::is_convertible<T, std::basic_string_view<Char>>::value> {};
 
-#    if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+    #if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
 using wstring_view_t = std::wstring_view;
 using wmemory_buf_t = std::wstring;
 
-template<typename... Args>
+template <typename... Args>
+        #if __cpp_lib_format >= 202207L
+using wformat_string_t = std::wformat_string<Args...>;
+        #else
 using wformat_string_t = std::wstring_view;
-#    endif
+        #endif
-#    define SPDLOG_BUF_TO_STRING(x) x
+    #endif
+    #define SPDLOG_BUF_TO_STRING(x) x
 #else  // use fmt lib instead of std::format
 namespace fmt_lib = fmt;
 
 using string_view_t = fmt::basic_string_view<char>;
 using memory_buf_t = fmt::basic_memory_buffer<char, 250>;
 
-template<typename... Args>
+template <typename... Args>
 using format_string_t = fmt::format_string<Args...>;
 
-template<class T>
+template <class T>
 using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
 
-// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here,
+template <typename Char>
-// in addition, fmt::basic_runtime<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char>
+    #if FMT_VERSION >= 90101
-template<class T, class Char = char>
+using fmt_runtime_string = fmt::runtime_format_string<Char>;
+    #else
+using fmt_runtime_string = fmt::basic_runtime<Char>;
+    #endif
+
+// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the
+// condition from basic_format_string here, in addition, fmt::basic_runtime<Char> is only
+// convertible to basic_format_string<Char> but not basic_string_view<Char>
+template <class T, class Char = char>
 struct is_convertible_to_basic_format_string
     : std::integral_constant<bool,
-          std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value>
+                             std::is_convertible<T, fmt::basic_string_view<Char>>::value ||
-{};
+                                 std::is_same<remove_cvref_t<T>, fmt_runtime_string<Char>>::value> {
+};
 
-#    if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+    #if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
 using wstring_view_t = fmt::basic_string_view<wchar_t>;
 using wmemory_buf_t = fmt::basic_memory_buffer<wchar_t, 250>;
 
-template<typename... Args>
+template <typename... Args>
 using wformat_string_t = fmt::wformat_string<Args...>;
-#    endif
+    #endif
-#    define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x)
+    #define SPDLOG_BUF_TO_STRING(x) fmt::to_string(x)
 #endif
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-#    ifndef _WIN32
+    #ifndef _WIN32
-#        error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
+        #error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
-#    endif // _WIN32
+    #endif  // _WIN32
 #endif      // SPDLOG_WCHAR_TO_UTF8_SUPPORT
 
-template<class T>
+template <class T>
-struct is_convertible_to_any_format_string : std::integral_constant<bool, is_convertible_to_basic_format_string<T, char>::value ||
+struct is_convertible_to_any_format_string
-                                                                              is_convertible_to_basic_format_string<T, wchar_t>::value>
+    : std::integral_constant<bool,
-{};
+                             is_convertible_to_basic_format_string<T, char>::value ||
+                                 is_convertible_to_basic_format_string<T, wchar_t>::value> {};
 
 #if defined(SPDLOG_NO_ATOMIC_LEVELS)
 using level_t = details::null_atomic_int;
@@ -202,13 +237,12 @@ using level_t = std::atomic<int>;
 #define SPDLOG_LEVEL_OFF 6
 
 #if !defined(SPDLOG_ACTIVE_LEVEL)
-#    define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO
+    #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO
 #endif
 
 // Log level enum
 namespace level {
-enum level_enum : int
+enum level_enum : int {
-{
     trace = SPDLOG_LEVEL_TRACE,
     debug = SPDLOG_LEVEL_DEBUG,
     info = SPDLOG_LEVEL_INFO,
@@ -228,19 +262,18 @@ enum level_enum : int
 #define SPDLOG_LEVEL_NAME_OFF spdlog::string_view_t("off", 3)
 
 #if !defined(SPDLOG_LEVEL_NAMES)
-#    define SPDLOG_LEVEL_NAMES                                                                                                             \
+    #define SPDLOG_LEVEL_NAMES                                                                  \
         {                                                                                       \
-            SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO, SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR,  \
+            SPDLOG_LEVEL_NAME_TRACE, SPDLOG_LEVEL_NAME_DEBUG, SPDLOG_LEVEL_NAME_INFO,           \
-                SPDLOG_LEVEL_NAME_CRITICAL, SPDLOG_LEVEL_NAME_OFF                                                                          \
+                SPDLOG_LEVEL_NAME_WARNING, SPDLOG_LEVEL_NAME_ERROR, SPDLOG_LEVEL_NAME_CRITICAL, \
+                SPDLOG_LEVEL_NAME_OFF                                                           \
         }
 #endif
 
 #if !defined(SPDLOG_SHORT_LEVEL_NAMES)
 
-#    define SPDLOG_SHORT_LEVEL_NAMES                                                                                                       \
+    #define SPDLOG_SHORT_LEVEL_NAMES \
-        {                                                                                                                                  \
+        { "T", "D", "I", "W", "E", "C", "O" }
-            "T", "D", "I", "W", "E", "C", "O"                                                                                              \
-        }
 #endif
 
 SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT;
@@ -252,19 +285,13 @@ SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NO
 //
 // Color mode used by sinks with color support.
 //
-enum class color_mode
+enum class color_mode { always, automatic, never };
-{
-    always,
-    automatic,
-    never
-};
 
 //
 // Pattern time - specific time getting to use for pattern_formatter.
 // local time by default
 //
-enum class pattern_time_type
+enum class pattern_time_type {
-{
     local,  // log localtime
     utc     // log utc
 };
@@ -272,8 +299,7 @@ enum class pattern_time_type
 //
 // Log exception
 //
-class SPDLOG_API spdlog_ex : public std::exception
+class SPDLOG_API spdlog_ex : public std::exception {
-{
 public:
     explicit spdlog_ex(std::string msg);
     spdlog_ex(const std::string &msg, int last_errno);
@@ -286,26 +312,26 @@ private:
 [[noreturn]] SPDLOG_API void throw_spdlog_ex(const std::string &msg, int last_errno);
 [[noreturn]] SPDLOG_API void throw_spdlog_ex(std::string msg);
 
-struct source_loc
+struct source_loc {
-{
     SPDLOG_CONSTEXPR source_loc() = default;
     SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in)
-        : filename{filename_in}
+        : filename{filename_in},
-        , line{line_in}
+          line{line_in},
-        , funcname{funcname_in}
+          funcname{funcname_in} {}
-    {}
 
-    SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT
+    SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT { return line <= 0; }
-    {
-        return line == 0;
-    }
     const char *filename{nullptr};
     int line{0};
     const char *funcname{nullptr};
 };
 
-struct file_event_handlers
+struct file_event_handlers {
-{
+    file_event_handlers()
+        : before_open(nullptr),
+          after_open(nullptr),
+          before_close(nullptr),
+          after_close(nullptr) {}
+
     std::function<void(const filename_t &filename)> before_open;
     std::function<void(const filename_t &filename, std::FILE *file_stream)> after_open;
     std::function<void(const filename_t &filename, std::FILE *file_stream)> before_close;
@@ -314,33 +340,66 @@ struct file_event_handlers
 
 namespace details {
 
-// make_unique support for pre c++14
+// to_string_view
 
+SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf)
+    SPDLOG_NOEXCEPT {
+    return spdlog::string_view_t{buf.data(), buf.size()};
+}
+
+SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str)
+    SPDLOG_NOEXCEPT {
+    return str;
+}
+
+#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf)
+    SPDLOG_NOEXCEPT {
+    return spdlog::wstring_view_t{buf.data(), buf.size()};
+}
+
+SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str)
+    SPDLOG_NOEXCEPT {
+    return str;
+}
+#endif
+
+#ifndef SPDLOG_USE_STD_FORMAT
+template <typename T, typename... Args>
+inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
+    return fmt;
+}
+#elif __cpp_lib_format >= 202207L
+template <typename T, typename... Args>
+SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(
+    std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT {
+    return fmt.get();
+}
+#endif
+
+// make_unique support for pre c++14
 #if __cplusplus >= 201402L  // C++14 and beyond
 using std::enable_if_t;
 using std::make_unique;
 #else
-template<bool B, class T = void>
+template <bool B, class T = void>
 using enable_if_t = typename std::enable_if<B, T>::type;
 
-template<typename T, typename... Args>
+template <typename T, typename... Args>
-std::unique_ptr<T> make_unique(Args &&... args)
+std::unique_ptr<T> make_unique(Args &&...args) {
-{
     static_assert(!std::is_array<T>::value, "arrays not supported");
     return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
 }
 #endif
 
 // to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
-template<typename T, typename U, enable_if_t<!std::is_same<T, U>::value, int> = 0>
+template <typename T, typename U, enable_if_t<!std::is_same<T, U>::value, int> = 0>
-constexpr T conditional_static_cast(U value)
+constexpr T conditional_static_cast(U value) {
-{
     return static_cast<T>(value);
 }
 
-template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
+template <typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
-constexpr T conditional_static_cast(U value)
+constexpr T conditional_static_cast(U value) {
-{
     return value;
 }
 
@@ -348,5 +407,5 @@ constexpr T conditional_static_cast(U value)
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "common-inl.h"
+    #include "common-inl.h"
 #endif

vendor/spdlog/details/backtracer-inl.h

@@ -4,62 +4,56 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/backtracer.h>
+    #include <spdlog/details/backtracer.h>
 #endif
 namespace spdlog {
 namespace details {
-SPDLOG_INLINE backtracer::backtracer(const backtracer &other)
+SPDLOG_INLINE backtracer::backtracer(const backtracer &other) {
-{
     std::lock_guard<std::mutex> lock(other.mutex_);
     enabled_ = other.enabled();
     messages_ = other.messages_;
 }
 
-SPDLOG_INLINE backtracer::backtracer(backtracer &&other) SPDLOG_NOEXCEPT
+SPDLOG_INLINE backtracer::backtracer(backtracer &&other) SPDLOG_NOEXCEPT {
-{
     std::lock_guard<std::mutex> lock(other.mutex_);
     enabled_ = other.enabled();
     messages_ = std::move(other.messages_);
 }
 
-SPDLOG_INLINE backtracer &backtracer::operator=(backtracer other)
+SPDLOG_INLINE backtracer &backtracer::operator=(backtracer other) {
-{
     std::lock_guard<std::mutex> lock(mutex_);
     enabled_ = other.enabled();
     messages_ = std::move(other.messages_);
     return *this;
 }
 
-SPDLOG_INLINE void backtracer::enable(size_t size)
+SPDLOG_INLINE void backtracer::enable(size_t size) {
-{
     std::lock_guard<std::mutex> lock{mutex_};
     enabled_.store(true, std::memory_order_relaxed);
     messages_ = circular_q<log_msg_buffer>{size};
 }
 
-SPDLOG_INLINE void backtracer::disable()
+SPDLOG_INLINE void backtracer::disable() {
-{
     std::lock_guard<std::mutex> lock{mutex_};
     enabled_.store(false, std::memory_order_relaxed);
 }
 
-SPDLOG_INLINE bool backtracer::enabled() const
+SPDLOG_INLINE bool backtracer::enabled() const { return enabled_.load(std::memory_order_relaxed); }
-{
-    return enabled_.load(std::memory_order_relaxed);
-}
 
-SPDLOG_INLINE void backtracer::push_back(const log_msg &msg)
+SPDLOG_INLINE void backtracer::push_back(const log_msg &msg) {
-{
     std::lock_guard<std::mutex> lock{mutex_};
     messages_.push_back(log_msg_buffer{msg});
 }
 
-// pop all items in the q and apply the given fun on each of them.
+SPDLOG_INLINE bool backtracer::empty() const {
-SPDLOG_INLINE void backtracer::foreach_pop(std::function<void(const details::log_msg &)> fun)
-{
     std::lock_guard<std::mutex> lock{mutex_};
-    while (!messages_.empty())
+    return messages_.empty();
-    {
+}
+
+// pop all items in the q and apply the given fun on each of them.
+SPDLOG_INLINE void backtracer::foreach_pop(std::function<void(const details::log_msg &)> fun) {
+    std::lock_guard<std::mutex> lock{mutex_};
+    while (!messages_.empty()) {
         auto &front_msg = messages_.front();
         fun(front_msg);
         messages_.pop_front();

vendor/spdlog/details/backtracer.h

@@ -3,20 +3,19 @@
 
 #pragma once
 
-#include <spdlog/details/log_msg_buffer.h>
 #include <spdlog/details/circular_q.h>
+#include <spdlog/details/log_msg_buffer.h>
 
 #include <atomic>
-#include <mutex>
 #include <functional>
+#include <mutex>
 
 // Store log messages in circular buffer.
 // Useful for storing debug data in case of error/warning happens.
 
 namespace spdlog {
 namespace details {
-class SPDLOG_API backtracer
+class SPDLOG_API backtracer {
-{
     mutable std::mutex mutex_;
     std::atomic<bool> enabled_{false};
     circular_q<log_msg_buffer> messages_;
@@ -32,6 +31,7 @@ public:
     void disable();
     bool enabled() const;
     void push_back(const log_msg &msg);
+    bool empty() const;
 
     // pop all items in the q and apply the given fun on each of them.
     void foreach_pop(std::function<void(const details::log_msg &)> fun);
@@ -41,5 +41,5 @@ public:
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "backtracer-inl.h"
+    #include "backtracer-inl.h"
 #endif

vendor/spdlog/details/circular_q.h

@@ -4,14 +4,15 @@
 // circular q view of std::vector.
 #pragma once
 
-#include <vector>
 #include <cassert>
+#include <vector>
+
+#include "spdlog/common.h"
 
 namespace spdlog {
 namespace details {
-template<typename T>
+template <typename T>
-class circular_q
+class circular_q {
-{
     size_t max_items_ = 0;
     typename std::vector<T>::size_type head_ = 0;
     typename std::vector<T>::size_type tail_ = 0;
@@ -26,30 +27,24 @@ public:
 
     explicit circular_q(size_t max_items)
         : max_items_(max_items + 1)  // one item is reserved as marker for full q
-        , v_(max_items_)
+          ,
-    {}
+          v_(max_items_) {}
 
     circular_q(const circular_q &) = default;
     circular_q &operator=(const circular_q &) = default;
 
     // move cannot be default,
     // since we need to reset head_, tail_, etc to zero in the moved object
-    circular_q(circular_q &&other) SPDLOG_NOEXCEPT
+    circular_q(circular_q &&other) SPDLOG_NOEXCEPT { copy_moveable(std::move(other)); }
-    {
-        copy_moveable(std::move(other));
-    }
 
-    circular_q &operator=(circular_q &&other) SPDLOG_NOEXCEPT
+    circular_q &operator=(circular_q &&other) SPDLOG_NOEXCEPT {
-    {
         copy_moveable(std::move(other));
         return *this;
     }
 
     // push back, overrun (oldest) item if no room left
-    void push_back(T &&item)
+    void push_back(T &&item) {
-    {
+        if (max_items_ > 0) {
-        if (max_items_ > 0)
-        {
             v_[tail_] = std::move(item);
             tail_ = (tail_ + 1) % max_items_;
 
@@ -63,68 +58,47 @@ public:
 
     // Return reference to the front item.
     // If there are no elements in the container, the behavior is undefined.
-    const T &front() const
+    const T &front() const { return v_[head_]; }
-    {
-        return v_[head_];
-    }
 
-    T &front()
+    T &front() { return v_[head_]; }
-    {
-        return v_[head_];
-    }
 
     // Return number of elements actually stored
-    size_t size() const
+    size_t size() const {
-    {
+        if (tail_ >= head_) {
-        if (tail_ >= head_)
-        {
             return tail_ - head_;
-        }
+        } else {
-        else
-        {
             return max_items_ - (head_ - tail_);
         }
     }
 
     // Return const reference to item by index.
     // If index is out of range 0…size()-1, the behavior is undefined.
-    const T &at(size_t i) const
+    const T &at(size_t i) const {
-    {
         assert(i < size());
         return v_[(head_ + i) % max_items_];
     }
 
     // Pop item from front.
     // If there are no elements in the container, the behavior is undefined.
-    void pop_front()
+    void pop_front() { head_ = (head_ + 1) % max_items_; }
-    {
-        head_ = (head_ + 1) % max_items_;
-    }
 
-    bool empty() const
+    bool empty() const { return tail_ == head_; }
-    {
-        return tail_ == head_;
-    }
 
-    bool full() const
+    bool full() const {
-    {
         // head is ahead of the tail by 1
-        if (max_items_ > 0)
+        if (max_items_ > 0) {
-        {
             return ((tail_ + 1) % max_items_) == head_;
         }
         return false;
     }
 
-    size_t overrun_counter() const
+    size_t overrun_counter() const { return overrun_counter_; }
-    {
+
-        return overrun_counter_;
+    void reset_overrun_counter() { overrun_counter_ = 0; }
-    }
 
 private:
     // copy from other&& and reset it to disabled state
-    void copy_moveable(circular_q &&other) SPDLOG_NOEXCEPT
+    void copy_moveable(circular_q &&other) SPDLOG_NOEXCEPT {
-    {
         max_items_ = other.max_items_;
         head_ = other.head_;
         tail_ = other.tail_;

vendor/spdlog/details/console_globals.h

@@ -3,27 +3,23 @@
 
 #pragma once
 
-#include <spdlog/details/null_mutex.h>
 #include <mutex>
+#include <spdlog/details/null_mutex.h>
 
 namespace spdlog {
 namespace details {
 
-struct console_mutex
+struct console_mutex {
-{
     using mutex_t = std::mutex;
-    static mutex_t &mutex()
+    static mutex_t &mutex() {
-    {
         static mutex_t s_mutex;
         return s_mutex;
     }
 };
 
-struct console_nullmutex
+struct console_nullmutex {
-{
     using mutex_t = null_mutex;
-    static mutex_t &mutex()
+    static mutex_t &mutex() {
-    {
         static mutex_t s_mutex;
         return s_mutex;
     }

vendor/spdlog/details/file_helper-inl.h

@@ -4,11 +4,11 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/file_helper.h>
+    #include <spdlog/details/file_helper.h>
 #endif
 
-#include <spdlog/details/os.h>
 #include <spdlog/common.h>
+#include <spdlog/details/os.h>
 
 #include <cerrno>
 #include <chrono>
@@ -21,47 +21,36 @@ namespace spdlog {
 namespace details {
 
 SPDLOG_INLINE file_helper::file_helper(const file_event_handlers &event_handlers)
-    : event_handlers_(event_handlers)
+    : event_handlers_(event_handlers) {}
-{}
 
-SPDLOG_INLINE file_helper::~file_helper()
+SPDLOG_INLINE file_helper::~file_helper() { close(); }
-{
-    close();
-}
 
-SPDLOG_INLINE void file_helper::open(const filename_t &fname, bool truncate)
+SPDLOG_INLINE void file_helper::open(const filename_t &fname, bool truncate) {
-{
     close();
     filename_ = fname;
 
     auto *mode = SPDLOG_FILENAME_T("ab");
     auto *trunc_mode = SPDLOG_FILENAME_T("wb");
 
-    if (event_handlers_.before_open)
+    if (event_handlers_.before_open) {
-    {
         event_handlers_.before_open(filename_);
     }
-    for (int tries = 0; tries < open_tries_; ++tries)
+    for (int tries = 0; tries < open_tries_; ++tries) {
-    {
         // create containing folder if not exists already.
         os::create_dir(os::dir_name(fname));
-        if (truncate)
+        if (truncate) {
-        {
             // Truncate by opening-and-closing a tmp file in "wb" mode, always
             // opening the actual log-we-write-to in "ab" mode, since that
             // interacts more politely with eternal processes that might
             // rotate/truncate the file underneath us.
             std::FILE *tmp;
-            if (os::fopen_s(&tmp, fname, trunc_mode))
+            if (os::fopen_s(&tmp, fname, trunc_mode)) {
-            {
                 continue;
             }
             std::fclose(tmp);
         }
-        if (!os::fopen_s(&fd_, fname, mode))
+        if (!os::fopen_s(&fd_, fname, mode)) {
-        {
+            if (event_handlers_.after_open) {
-            if (event_handlers_.after_open)
-            {
                 event_handlers_.after_open(filename_, fd_);
             }
             return;
@@ -70,68 +59,61 @@ SPDLOG_INLINE void file_helper::open(const filename_t &fname, bool truncate)
         details::os::sleep_for_millis(open_interval_);
     }
 
-    throw_spdlog_ex("Failed opening file " + os::filename_to_str(filename_) + " for writing", errno);
+    throw_spdlog_ex("Failed opening file " + os::filename_to_str(filename_) + " for writing",
+                    errno);
 }
 
-SPDLOG_INLINE void file_helper::reopen(bool truncate)
+SPDLOG_INLINE void file_helper::reopen(bool truncate) {
-{
+    if (filename_.empty()) {
-    if (filename_.empty())
-    {
         throw_spdlog_ex("Failed re opening file - was not opened before");
     }
     this->open(filename_, truncate);
 }
 
-SPDLOG_INLINE void file_helper::flush()
+SPDLOG_INLINE void file_helper::flush() {
-{
+    if (std::fflush(fd_) != 0) {
-    if (std::fflush(fd_) != 0)
-    {
         throw_spdlog_ex("Failed flush to file " + os::filename_to_str(filename_), errno);
     }
 }
 
-SPDLOG_INLINE void file_helper::close()
+SPDLOG_INLINE void file_helper::sync() {
-{
+    if (!os::fsync(fd_)) {
-    if (fd_ != nullptr)
+        throw_spdlog_ex("Failed to fsync file " + os::filename_to_str(filename_), errno);
-    {
+    }
-        if (event_handlers_.before_close)
+}
-        {
+
+SPDLOG_INLINE void file_helper::close() {
+    if (fd_ != nullptr) {
+        if (event_handlers_.before_close) {
             event_handlers_.before_close(filename_, fd_);
         }
 
         std::fclose(fd_);
         fd_ = nullptr;
 
-        if (event_handlers_.after_close)
+        if (event_handlers_.after_close) {
-        {
             event_handlers_.after_close(filename_);
         }
     }
 }
 
-SPDLOG_INLINE void file_helper::write(const memory_buf_t &buf)
+SPDLOG_INLINE void file_helper::write(const memory_buf_t &buf) {
-{
+    if (fd_ == nullptr) return;
     size_t msg_size = buf.size();
     auto data = buf.data();
-    if (std::fwrite(data, 1, msg_size, fd_) != msg_size)
+    if (std::fwrite(data, 1, msg_size, fd_) != msg_size) {
-    {
         throw_spdlog_ex("Failed writing to file " + os::filename_to_str(filename_), errno);
     }
 }
 
-SPDLOG_INLINE size_t file_helper::size() const
+SPDLOG_INLINE size_t file_helper::size() const {
-{
+    if (fd_ == nullptr) {
-    if (fd_ == nullptr)
-    {
         throw_spdlog_ex("Cannot use size() on closed file " + os::filename_to_str(filename_));
     }
     return os::filesize(fd_);
 }
 
-SPDLOG_INLINE const filename_t &file_helper::filename() const
+SPDLOG_INLINE const filename_t &file_helper::filename() const { return filename_; }
-{
-    return filename_;
-}
 
 //
 // return file path and its extension:
@@ -146,21 +128,19 @@ SPDLOG_INLINE const filename_t &file_helper::filename() const
 // ".mylog" => (".mylog". "")
 // "my_folder/.mylog" => ("my_folder/.mylog", "")
 // "my_folder/.mylog.txt" => ("my_folder/.mylog", ".txt")
-SPDLOG_INLINE std::tuple<filename_t, filename_t> file_helper::split_by_extension(const filename_t &fname)
+SPDLOG_INLINE std::tuple<filename_t, filename_t> file_helper::split_by_extension(
-{
+    const filename_t &fname) {
     auto ext_index = fname.rfind('.');
 
     // no valid extension found - return whole path and empty string as
     // extension
-    if (ext_index == filename_t::npos || ext_index == 0 || ext_index == fname.size() - 1)
+    if (ext_index == filename_t::npos || ext_index == 0 || ext_index == fname.size() - 1) {
-    {
         return std::make_tuple(fname, filename_t());
     }
 
     // treat cases like "/etc/rc.d/somelogfile or "/abc/.hiddenfile"
     auto folder_index = fname.find_last_of(details::os::folder_seps_filename);
-    if (folder_index != filename_t::npos && folder_index >= ext_index - 1)
+    if (folder_index != filename_t::npos && folder_index >= ext_index - 1) {
-    {
         return std::make_tuple(fname, filename_t());
     }
 

vendor/spdlog/details/file_helper.h

@@ -13,8 +13,7 @@ namespace details {
 // When failing to open a file, retry several times(5) with a delay interval(10 ms).
 // Throw spdlog_ex exception on errors.
 
-class SPDLOG_API file_helper
+class SPDLOG_API file_helper {
-{
 public:
     file_helper() = default;
     explicit file_helper(const file_event_handlers &event_handlers);
@@ -26,6 +25,7 @@ public:
     void open(const filename_t &fname, bool truncate = false);
     void reopen(bool truncate);
     void flush();
+    void sync();
     void close();
     void write(const memory_buf_t &buf);
     size_t size() const;
@@ -57,5 +57,5 @@ private:
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "file_helper-inl.h"
+    #include "file_helper-inl.h"
 #endif

vendor/spdlog/details/fmt_helper.h

@@ -3,14 +3,14 @@
 #pragma once
 
 #include <chrono>
-#include <type_traits>
 #include <iterator>
-#include <spdlog/fmt/fmt.h>
 #include <spdlog/common.h>
+#include <spdlog/fmt/fmt.h>
+#include <type_traits>
 
 #ifdef SPDLOG_USE_STD_FORMAT
-#    include <charconv>
+    #include <charconv>
-#    include <limits>
+    #include <limits>
 #endif
 
 // Some fmt helpers to efficiently format and pad ints and strings
@@ -18,145 +18,117 @@ namespace spdlog {
 namespace details {
 namespace fmt_helper {
 
-inline spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT
+inline void append_string_view(spdlog::string_view_t view, memory_buf_t &dest) {
-{
-    return spdlog::string_view_t{buf.data(), buf.size()};
-}
-
-inline void append_string_view(spdlog::string_view_t view, memory_buf_t &dest)
-{
     auto *buf_ptr = view.data();
     dest.append(buf_ptr, buf_ptr + view.size());
 }
 
 #ifdef SPDLOG_USE_STD_FORMAT
-template<typename T>
+template <typename T>
-inline void append_int(T n, memory_buf_t &dest)
+inline void append_int(T n, memory_buf_t &dest) {
-{
     // Buffer should be large enough to hold all digits (digits10 + 1) and a sign
     SPDLOG_CONSTEXPR const auto BUF_SIZE = std::numeric_limits<T>::digits10 + 2;
     char buf[BUF_SIZE];
 
     auto [ptr, ec] = std::to_chars(buf, buf + BUF_SIZE, n, 10);
-    if (ec == std::errc())
+    if (ec == std::errc()) {
-    {
         dest.append(buf, ptr);
-    }
+    } else {
-    else
-    {
         throw_spdlog_ex("Failed to format int", static_cast<int>(ec));
     }
 }
 #else
-template<typename T>
+template <typename T>
-inline void append_int(T n, memory_buf_t &dest)
+inline void append_int(T n, memory_buf_t &dest) {
-{
     fmt::format_int i(n);
     dest.append(i.data(), i.data() + i.size());
 }
 #endif
 
-template<typename T>
+template <typename T>
-SPDLOG_CONSTEXPR_FUNC unsigned int count_digits_fallback(T n)
+SPDLOG_CONSTEXPR_FUNC unsigned int count_digits_fallback(T n) {
-{
     // taken from fmt: https://github.com/fmtlib/fmt/blob/8.0.1/include/fmt/format.h#L899-L912
     unsigned int count = 1;
-    for (;;)
+    for (;;) {
-    {
         // Integer division is slow so do it for a group of four digits instead
         // of for every digit. The idea comes from the talk by Alexandrescu
         // "Three Optimization Tips for C++". See speed-test for a comparison.
-        if (n < 10)
+        if (n < 10) return count;
-            return count;
+        if (n < 100) return count + 1;
-        if (n < 100)
+        if (n < 1000) return count + 2;
-            return count + 1;
+        if (n < 10000) return count + 3;
-        if (n < 1000)
-            return count + 2;
-        if (n < 10000)
-            return count + 3;
         n /= 10000u;
         count += 4;
     }
 }
 
-template<typename T>
+template <typename T>
-inline unsigned int count_digits(T n)
+inline unsigned int count_digits(T n) {
-{
+    using count_type =
-    using count_type = typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
+        typename std::conditional<(sizeof(T) > sizeof(uint32_t)), uint64_t, uint32_t>::type;
 #ifdef SPDLOG_USE_STD_FORMAT
     return count_digits_fallback(static_cast<count_type>(n));
 #else
     return static_cast<unsigned int>(fmt::
-// fmt 7.0.0 renamed the internal namespace to detail.
+    // fmt 7.0.0 renamed the internal namespace to detail.
-// See: https://github.com/fmtlib/fmt/issues/1538
+    // See: https://github.com/fmtlib/fmt/issues/1538
-#    if FMT_VERSION < 70000
+    #if FMT_VERSION < 70000
                                          internal
-#    else
+    #else
                                          detail
-#    endif
+    #endif
                                      ::count_digits(static_cast<count_type>(n)));
 #endif
 }
 
-inline void pad2(int n, memory_buf_t &dest)
+inline void pad2(int n, memory_buf_t &dest) {
-{
     if (n >= 0 && n < 100)  // 0-99
     {
         dest.push_back(static_cast<char>('0' + n / 10));
         dest.push_back(static_cast<char>('0' + n % 10));
-    }
+    } else  // unlikely, but just in case, let fmt deal with it
-    else // unlikely, but just in case, let fmt deal with it
     {
-        fmt_lib::format_to(std::back_inserter(dest), "{:02}", n);
+        fmt_lib::format_to(std::back_inserter(dest), SPDLOG_FMT_STRING("{:02}"), n);
     }
 }
 
-template<typename T>
+template <typename T>
-inline void pad_uint(T n, unsigned int width, memory_buf_t &dest)
+inline void pad_uint(T n, unsigned int width, memory_buf_t &dest) {
-{
     static_assert(std::is_unsigned<T>::value, "pad_uint must get unsigned T");
-    for (auto digits = count_digits(n); digits < width; digits++)
+    for (auto digits = count_digits(n); digits < width; digits++) {
-    {
         dest.push_back('0');
     }
     append_int(n, dest);
 }
 
-template<typename T>
+template <typename T>
-inline void pad3(T n, memory_buf_t &dest)
+inline void pad3(T n, memory_buf_t &dest) {
-{
     static_assert(std::is_unsigned<T>::value, "pad3 must get unsigned T");
-    if (n < 1000)
+    if (n < 1000) {
-    {
         dest.push_back(static_cast<char>(n / 100 + '0'));
         n = n % 100;
         dest.push_back(static_cast<char>((n / 10) + '0'));
         dest.push_back(static_cast<char>((n % 10) + '0'));
-    }
+    } else {
-    else
-    {
         append_int(n, dest);
     }
 }
 
-template<typename T>
+template <typename T>
-inline void pad6(T n, memory_buf_t &dest)
+inline void pad6(T n, memory_buf_t &dest) {
-{
     pad_uint(n, 6, dest);
 }
 
-template<typename T>
+template <typename T>
-inline void pad9(T n, memory_buf_t &dest)
+inline void pad9(T n, memory_buf_t &dest) {
-{
     pad_uint(n, 9, dest);
 }
 
 // return fraction of a second of the given time_point.
 // e.g.
 // fraction<std::milliseconds>(tp) -> will return the millis part of the second
-template<typename ToDuration>
+template <typename ToDuration>
-inline ToDuration time_fraction(log_clock::time_point tp)
+inline ToDuration time_fraction(log_clock::time_point tp) {
-{
     using std::chrono::duration_cast;
     using std::chrono::seconds;
     auto duration = tp.time_since_epoch();

vendor/spdlog/details/log_msg-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/log_msg.h>
+    #include <spdlog/details/log_msg.h>
 #endif
 
 #include <spdlog/details/os.h>
@@ -12,26 +12,33 @@
 namespace spdlog {
 namespace details {
 
-SPDLOG_INLINE log_msg::log_msg(spdlog::log_clock::time_point log_time, spdlog::source_loc loc, string_view_t a_logger_name,
+SPDLOG_INLINE log_msg::log_msg(spdlog::log_clock::time_point log_time,
-    spdlog::level::level_enum lvl, spdlog::string_view_t msg)
+                               spdlog::source_loc loc,
-    : logger_name(a_logger_name)
+                               string_view_t a_logger_name,
-    , level(lvl)
+                               spdlog::level::level_enum lvl,
-    , time(log_time)
+                               spdlog::string_view_t msg)
+    : logger_name(a_logger_name),
+      level(lvl),
+      time(log_time)
 #ifndef SPDLOG_NO_THREAD_ID
-    , thread_id(os::thread_id())
+      ,
+      thread_id(os::thread_id())
 #endif
-    , source(loc)
+      ,
-    , payload(msg)
+      source(loc),
-{}
+      payload(msg) {
+}
 
-SPDLOG_INLINE log_msg::log_msg(
+SPDLOG_INLINE log_msg::log_msg(spdlog::source_loc loc,
-    spdlog::source_loc loc, string_view_t a_logger_name, spdlog::level::level_enum lvl, spdlog::string_view_t msg)
+                               string_view_t a_logger_name,
-    : log_msg(os::now(), loc, a_logger_name, lvl, msg)
+                               spdlog::level::level_enum lvl,
-{}
+                               spdlog::string_view_t msg)
+    : log_msg(os::now(), loc, a_logger_name, lvl, msg) {}
 
-SPDLOG_INLINE log_msg::log_msg(string_view_t a_logger_name, spdlog::level::level_enum lvl, spdlog::string_view_t msg)
+SPDLOG_INLINE log_msg::log_msg(string_view_t a_logger_name,
-    : log_msg(os::now(), source_loc{}, a_logger_name, lvl, msg)
+                               spdlog::level::level_enum lvl,
-{}
+                               spdlog::string_view_t msg)
+    : log_msg(os::now(), source_loc{}, a_logger_name, lvl, msg) {}
 
 }  // namespace details
 }  // namespace spdlog

vendor/spdlog/details/log_msg.h

@@ -8,10 +8,13 @@
 
 namespace spdlog {
 namespace details {
-struct SPDLOG_API log_msg
+struct SPDLOG_API log_msg {
-{
     log_msg() = default;
-    log_msg(log_clock::time_point log_time, source_loc loc, string_view_t logger_name, level::level_enum lvl, string_view_t msg);
+    log_msg(log_clock::time_point log_time,
+            source_loc loc,
+            string_view_t logger_name,
+            level::level_enum lvl,
+            string_view_t msg);
     log_msg(source_loc loc, string_view_t logger_name, level::level_enum lvl, string_view_t msg);
     log_msg(string_view_t logger_name, level::level_enum lvl, string_view_t msg);
     log_msg(const log_msg &other) = default;
@@ -33,5 +36,5 @@ struct SPDLOG_API log_msg
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "log_msg-inl.h"
+    #include "log_msg-inl.h"
 #endif

vendor/spdlog/details/log_msg_buffer-inl.h

@@ -4,35 +4,33 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/log_msg_buffer.h>
+    #include <spdlog/details/log_msg_buffer.h>
 #endif
 
 namespace spdlog {
 namespace details {
 
 SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg &orig_msg)
-    : log_msg{orig_msg}
+    : log_msg{orig_msg} {
-{
     buffer.append(logger_name.begin(), logger_name.end());
     buffer.append(payload.begin(), payload.end());
     update_string_views();
 }
 
 SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg_buffer &other)
-    : log_msg{other}
+    : log_msg{other} {
-{
     buffer.append(logger_name.begin(), logger_name.end());
     buffer.append(payload.begin(), payload.end());
     update_string_views();
 }
 
-SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT : log_msg{other}, buffer{std::move(other.buffer)}
+SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT
-{
+    : log_msg{other},
+      buffer{std::move(other.buffer)} {
     update_string_views();
 }
 
-SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(const log_msg_buffer &other)
+SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(const log_msg_buffer &other) {
-{
     log_msg::operator=(other);
     buffer.clear();
     buffer.append(other.buffer.data(), other.buffer.data() + other.buffer.size());
@@ -40,16 +38,14 @@ SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(const log_msg_buffer &ot
     return *this;
 }
 
-SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT
+SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT {
-{
     log_msg::operator=(other);
     buffer = std::move(other.buffer);
     update_string_views();
     return *this;
 }
 
-SPDLOG_INLINE void log_msg_buffer::update_string_views()
+SPDLOG_INLINE void log_msg_buffer::update_string_views() {
-{
     logger_name = string_view_t{buffer.data(), logger_name.size()};
     payload = string_view_t{buffer.data() + logger_name.size(), payload.size()};
 }

vendor/spdlog/details/log_msg_buffer.h

@@ -11,8 +11,7 @@ namespace details {
 // Extend log_msg with internal buffer to store its payload.
 // This is needed since log_msg holds string_views that points to stack data.
 
-class SPDLOG_API log_msg_buffer : public log_msg
+class SPDLOG_API log_msg_buffer : public log_msg {
-{
     memory_buf_t buffer;
     void update_string_views();
 
@@ -29,5 +28,5 @@ public:
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "log_msg_buffer-inl.h"
+    #include "log_msg_buffer-inl.h"
 #endif

vendor/spdlog/details/mpmc_blocking_q.h

@@ -12,25 +12,23 @@
 
 #include <spdlog/details/circular_q.h>
 
+#include <atomic>
 #include <condition_variable>
 #include <mutex>
 
 namespace spdlog {
 namespace details {
 
-template<typename T>
+template <typename T>
-class mpmc_blocking_queue
+class mpmc_blocking_queue {
-{
 public:
     using item_type = T;
     explicit mpmc_blocking_queue(size_t max_items)
-        : q_(max_items)
+        : q_(max_items) {}
-    {}
 
 #ifndef __MINGW32__
     // try to enqueue and block if no room left
-    void enqueue(T &&item)
+    void enqueue(T &&item) {
-    {
         {
             std::unique_lock<std::mutex> lock(queue_mutex_);
             pop_cv_.wait(lock, [this] { return !this->q_.full(); });
@@ -40,8 +38,7 @@ public:
     }
 
     // enqueue immediately. overrun oldest message in the queue if no room left.
-    void enqueue_nowait(T &&item)
+    void enqueue_nowait(T &&item) {
-    {
         {
             std::unique_lock<std::mutex> lock(queue_mutex_);
             q_.push_back(std::move(item));
@@ -49,14 +46,29 @@ public:
         push_cv_.notify_one();
     }
 
-    // try to dequeue item. if no item found. wait up to timeout and try again
+    void enqueue_if_have_room(T &&item) {
-    // Return true, if succeeded dequeue item, false otherwise
+        bool pushed = false;
-    bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
-    {
         {
             std::unique_lock<std::mutex> lock(queue_mutex_);
-            if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
+            if (!q_.full()) {
+                q_.push_back(std::move(item));
+                pushed = true;
+            }
+        }
+
+        if (pushed) {
+            push_cv_.notify_one();
+        } else {
+            ++discard_counter_;
+        }
+    }
+
+    // dequeue with a timeout.
+    // Return true, if succeeded dequeue item, false otherwise
+    bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration) {
         {
+            std::unique_lock<std::mutex> lock(queue_mutex_);
+            if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); })) {
                 return false;
             }
             popped_item = std::move(q_.front());
@@ -66,13 +78,23 @@ public:
         return true;
     }
 
+    // blocking dequeue without a timeout.
+    void dequeue(T &popped_item) {
+        {
+            std::unique_lock<std::mutex> lock(queue_mutex_);
+            push_cv_.wait(lock, [this] { return !this->q_.empty(); });
+            popped_item = std::move(q_.front());
+            q_.pop_front();
+        }
+        pop_cv_.notify_one();
+    }
+
 #else
     // apparently mingw deadlocks if the mutex is released before cv.notify_one(),
     // so release the mutex at the very end each function.
 
     // try to enqueue and block if no room left
-    void enqueue(T &&item)
+    void enqueue(T &&item) {
-    {
         std::unique_lock<std::mutex> lock(queue_mutex_);
         pop_cv_.wait(lock, [this] { return !this->q_.full(); });
         q_.push_back(std::move(item));
@@ -80,20 +102,32 @@ public:
     }
 
     // enqueue immediately. overrun oldest message in the queue if no room left.
-    void enqueue_nowait(T &&item)
+    void enqueue_nowait(T &&item) {
-    {
         std::unique_lock<std::mutex> lock(queue_mutex_);
         q_.push_back(std::move(item));
         push_cv_.notify_one();
     }
 
-    // try to dequeue item. if no item found. wait up to timeout and try again
+    void enqueue_if_have_room(T &&item) {
-    // Return true, if succeeded dequeue item, false otherwise
+        bool pushed = false;
-    bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
-    {
         std::unique_lock<std::mutex> lock(queue_mutex_);
-        if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
+        if (!q_.full()) {
-        {
+            q_.push_back(std::move(item));
+            pushed = true;
+        }
+
+        if (pushed) {
+            push_cv_.notify_one();
+        } else {
+            ++discard_counter_;
+        }
+    }
+
+    // dequeue with a timeout.
+    // Return true, if succeeded dequeue item, false otherwise
+    bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration) {
+        std::unique_lock<std::mutex> lock(queue_mutex_);
+        if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); })) {
             return false;
         }
         popped_item = std::move(q_.front());
@@ -102,25 +136,42 @@ public:
         return true;
     }
 
+    // blocking dequeue without a timeout.
+    void dequeue(T &popped_item) {
+        std::unique_lock<std::mutex> lock(queue_mutex_);
+        push_cv_.wait(lock, [this] { return !this->q_.empty(); });
+        popped_item = std::move(q_.front());
+        q_.pop_front();
+        pop_cv_.notify_one();
+    }
+
 #endif
 
-    size_t overrun_counter()
+    size_t overrun_counter() {
-    {
         std::unique_lock<std::mutex> lock(queue_mutex_);
         return q_.overrun_counter();
     }
 
-    size_t size()
+    size_t discard_counter() { return discard_counter_.load(std::memory_order_relaxed); }
-    {
+
+    size_t size() {
         std::unique_lock<std::mutex> lock(queue_mutex_);
         return q_.size();
     }
 
+    void reset_overrun_counter() {
+        std::unique_lock<std::mutex> lock(queue_mutex_);
+        q_.reset_overrun_counter();
+    }
+
+    void reset_discard_counter() { discard_counter_.store(0, std::memory_order_relaxed); }
+
 private:
     std::mutex queue_mutex_;
     std::condition_variable push_cv_;
     std::condition_variable pop_cv_;
     spdlog::details::circular_q<T> q_;
+    std::atomic<size_t> discard_counter_{0};
 };
 }  // namespace details
 }  // namespace spdlog

vendor/spdlog/details/null_mutex.h

@@ -9,37 +9,23 @@
 
 namespace spdlog {
 namespace details {
-struct null_mutex
+struct null_mutex {
-{
     void lock() const {}
     void unlock() const {}
-    bool try_lock() const
-    {
-        return true;
-    }
 };
 
-struct null_atomic_int
+struct null_atomic_int {
-{
     int value;
     null_atomic_int() = default;
 
     explicit null_atomic_int(int new_value)
-        : value(new_value)
+        : value(new_value) {}
-    {}
 
-    int load(std::memory_order = std::memory_order_relaxed) const
+    int load(std::memory_order = std::memory_order_relaxed) const { return value; }
-    {
-        return value;
-    }
 
-    void store(int new_value, std::memory_order = std::memory_order_relaxed)
+    void store(int new_value, std::memory_order = std::memory_order_relaxed) { value = new_value; }
-    {
-        value = new_value;
-    }
 
-    int exchange(int new_value, std::memory_order = std::memory_order_relaxed)
+    int exchange(int new_value, std::memory_order = std::memory_order_relaxed) {
-    {
         std::swap(new_value, value);
         return new_value;  // return value before the call
     }

vendor/spdlog/details/os-inl.h

@@ -4,86 +4,88 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/os.h>
+    #include <spdlog/details/os.h>
 #endif
 
 #include <spdlog/common.h>
 
 #include <algorithm>
+#include <array>
 #include <chrono>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
 #include <string>
-#include <thread>
-#include <array>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <thread>
 
 #ifdef _WIN32
+    #include <spdlog/details/windows_include.h>
+    #include <fileapi.h>  // for FlushFileBuffers
+    #include <io.h>       // for _get_osfhandle, _isatty, _fileno
+    #include <process.h>  // for _get_pid
 
-#    include <io.h>      // _get_osfhandle and _isatty support
+    #ifdef __MINGW32__
-#    include <process.h> //  _get_pid support
+        #include <share.h>
-#    include <spdlog/details/windows_include.h>
+    #endif
 
-#    ifdef __MINGW32__
+    #if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)
-#        include <share.h>
+        #include <cassert>
-#    endif
+        #include <limits>
+    #endif
 
-#    if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)
+    #include <direct.h>  // for _mkdir/_wmkdir
-#        include <limits>
-#    endif
-
-#    include <direct.h> // for _mkdir/_wmkdir
 
 #else  // unix
 
-#    include <fcntl.h>
+    #include <fcntl.h>
-#    include <unistd.h>
+    #include <unistd.h>
 
-#    ifdef __linux__
+    #ifdef __linux__
-#        include <sys/syscall.h> //Use gettid() syscall under linux to get thread id
+        #include <sys/syscall.h>  //Use gettid() syscall under linux to get thread id
 
-#    elif defined(_AIX)
+    #elif defined(_AIX)
-#        include <pthread.h> // for pthread_getthrds_np
+        #include <pthread.h>  // for pthread_getthrds_np
 
-#    elif defined(__DragonFly__) || defined(__FreeBSD__)
+    #elif defined(__DragonFly__) || defined(__FreeBSD__)
-#        include <pthread_np.h> // for pthread_getthreadid_np
+        #include <pthread_np.h>  // for pthread_getthreadid_np
 
-#    elif defined(__NetBSD__)
+    #elif defined(__NetBSD__)
-#        include <lwp.h> // for _lwp_self
+        #include <lwp.h>  // for _lwp_self
 
-#    elif defined(__sun)
+    #elif defined(__sun)
-#        include <thread.h> // for thr_self
+        #include <thread.h>  // for thr_self
-#    endif
+    #endif
 
 #endif  // unix
 
+#if defined __APPLE__
+    #include <AvailabilityMacros.h>
+#endif
+
 #ifndef __has_feature           // Clang - feature checking macros.
-#    define __has_feature(x) 0 // Compatibility with non-clang compilers.
+    #define __has_feature(x) 0  // Compatibility with non-clang compilers.
 #endif
 
 namespace spdlog {
 namespace details {
 namespace os {
 
-SPDLOG_INLINE spdlog::log_clock::time_point now() SPDLOG_NOEXCEPT
+SPDLOG_INLINE spdlog::log_clock::time_point now() SPDLOG_NOEXCEPT {
-{
-
 #if defined __linux__ && defined SPDLOG_CLOCK_COARSE
     timespec ts;
     ::clock_gettime(CLOCK_REALTIME_COARSE, &ts);
     return std::chrono::time_point<log_clock, typename log_clock::duration>(
-        std::chrono::duration_cast<typename log_clock::duration>(std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)));
+        std::chrono::duration_cast<typename log_clock::duration>(
+            std::chrono::seconds(ts.tv_sec) + std::chrono::nanoseconds(ts.tv_nsec)));
 
 #else
     return log_clock::now();
 #endif
 }
-SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
+SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT {
-{
-
 #ifdef _WIN32
     std::tm tm;
     ::localtime_s(&tm, &time_tt);
@@ -94,15 +96,12 @@ SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
     return tm;
 }
 
-SPDLOG_INLINE std::tm localtime() SPDLOG_NOEXCEPT
+SPDLOG_INLINE std::tm localtime() SPDLOG_NOEXCEPT {
-{
     std::time_t now_t = ::time(nullptr);
     return localtime(now_t);
 }
 
-SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
+SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT {
-{
-
 #ifdef _WIN32
     std::tm tm;
     ::gmtime_s(&tm, &time_tt);
@@ -113,55 +112,49 @@ SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT
     return tm;
 }
 
-SPDLOG_INLINE std::tm gmtime() SPDLOG_NOEXCEPT
+SPDLOG_INLINE std::tm gmtime() SPDLOG_NOEXCEPT {
-{
     std::time_t now_t = ::time(nullptr);
     return gmtime(now_t);
 }
 
 // fopen_s on non windows for writing
-SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename_t &mode)
+SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename_t &mode) {
-{
 #ifdef _WIN32
-#    ifdef SPDLOG_WCHAR_FILENAMES
+    #ifdef SPDLOG_WCHAR_FILENAMES
     *fp = ::_wfsopen((filename.c_str()), mode.c_str(), _SH_DENYNO);
-#    else
+    #else
     *fp = ::_fsopen((filename.c_str()), mode.c_str(), _SH_DENYNO);
-#    endif
+    #endif
-#    if defined(SPDLOG_PREVENT_CHILD_FD)
+    #if defined(SPDLOG_PREVENT_CHILD_FD)
-    if (*fp != nullptr)
+    if (*fp != nullptr) {
-    {
         auto file_handle = reinterpret_cast<HANDLE>(_get_osfhandle(::_fileno(*fp)));
-        if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0))
+        if (!::SetHandleInformation(file_handle, HANDLE_FLAG_INHERIT, 0)) {
-        {
             ::fclose(*fp);
             *fp = nullptr;
         }
     }
-#    endif
+    #endif
 #else  // unix
-#    if defined(SPDLOG_PREVENT_CHILD_FD)
+    #if defined(SPDLOG_PREVENT_CHILD_FD)
     const int mode_flag = mode == SPDLOG_FILENAME_T("ab") ? O_APPEND : O_TRUNC;
-    const int fd = ::open((filename.c_str()), O_CREAT | O_WRONLY | O_CLOEXEC | mode_flag, mode_t(0644));
+    const int fd =
-    if (fd == -1)
+        ::open((filename.c_str()), O_CREAT | O_WRONLY | O_CLOEXEC | mode_flag, mode_t(0644));
-    {
+    if (fd == -1) {
         return true;
     }
     *fp = ::fdopen(fd, mode.c_str());
-    if (*fp == nullptr)
+    if (*fp == nullptr) {
-    {
         ::close(fd);
     }
-#    else
+    #else
     *fp = ::fopen((filename.c_str()), mode.c_str());
-#    endif
+    #endif
 #endif
 
     return *fp == nullptr;
 }
 
-SPDLOG_INLINE int remove(const filename_t &filename) SPDLOG_NOEXCEPT
+SPDLOG_INLINE int remove(const filename_t &filename) SPDLOG_NOEXCEPT {
-{
 #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
     return ::_wremove(filename.c_str());
 #else
@@ -169,13 +162,11 @@ SPDLOG_INLINE int remove(const filename_t &filename) SPDLOG_NOEXCEPT
 #endif
 }
 
-SPDLOG_INLINE int remove_if_exists(const filename_t &filename) SPDLOG_NOEXCEPT
+SPDLOG_INLINE int remove_if_exists(const filename_t &filename) SPDLOG_NOEXCEPT {
-{
     return path_exists(filename) ? remove(filename) : 0;
 }
 
-SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename2) SPDLOG_NOEXCEPT
+SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename2) SPDLOG_NOEXCEPT {
-{
 #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
     return ::_wrename(filename1.c_str(), filename2.c_str());
 #else
@@ -184,15 +175,14 @@ SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename
 }
 
 // Return true if path exists (file or directory)
-SPDLOG_INLINE bool path_exists(const filename_t &filename) SPDLOG_NOEXCEPT
+SPDLOG_INLINE bool path_exists(const filename_t &filename) SPDLOG_NOEXCEPT {
-{
 #ifdef _WIN32
-#    ifdef SPDLOG_WCHAR_FILENAMES
+    struct _stat buffer;
-    auto attribs = ::GetFileAttributesW(filename.c_str());
+    #ifdef SPDLOG_WCHAR_FILENAMES
-#    else
+    return (::_wstat(filename.c_str(), &buffer) == 0);
-    auto attribs = ::GetFileAttributesA(filename.c_str());
+    #else
-#    endif
+    return (::_stat(filename.c_str(), &buffer) == 0);
-    return attribs != INVALID_FILE_ATTRIBUTES;
+    #endif
 #else  // common linux/unix all have the stat system call
     struct stat buffer;
     return (::stat(filename.c_str(), &buffer) == 0);
@@ -200,98 +190,88 @@ SPDLOG_INLINE bool path_exists(const filename_t &filename) SPDLOG_NOEXCEPT
 }
 
 #ifdef _MSC_VER
-// avoid warning about unreachable statement at the end of filesize()
+    // avoid warning about unreachable statement at the end of filesize()
-#    pragma warning(push)
+    #pragma warning(push)
-#    pragma warning(disable : 4702)
+    #pragma warning(disable : 4702)
 #endif
 
 // Return file size according to open FILE* object
-SPDLOG_INLINE size_t filesize(FILE *f)
+SPDLOG_INLINE size_t filesize(FILE *f) {
-{
+    if (f == nullptr) {
-    if (f == nullptr)
-    {
         throw_spdlog_ex("Failed getting file size. fd is null");
     }
 #if defined(_WIN32) && !defined(__CYGWIN__)
     int fd = ::_fileno(f);
-#    if defined(_WIN64) // 64 bits
+    #if defined(_WIN64)  // 64 bits
     __int64 ret = ::_filelengthi64(fd);
-    if (ret >= 0)
+    if (ret >= 0) {
-    {
         return static_cast<size_t>(ret);
     }
 
-#    else // windows 32 bits
+    #else  // windows 32 bits
     long ret = ::_filelength(fd);
-    if (ret >= 0)
+    if (ret >= 0) {
-    {
         return static_cast<size_t>(ret);
     }
-#    endif
+    #endif
 
 #else  // unix
-// OpenBSD and AIX doesn't compile with :: before the fileno(..)
+    // OpenBSD and AIX doesn't compile with :: before the fileno(..)
-#    if defined(__OpenBSD__) || defined(_AIX)
+    #if defined(__OpenBSD__) || defined(_AIX)
     int fd = fileno(f);
-#    else
+    #else
     int fd = ::fileno(f);
-#    endif
+    #endif
-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
+    // 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
-#    if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
+    #if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && \
+        (defined(__LP64__) || defined(_LP64))
     struct stat64 st;
-    if (::fstat64(fd, &st) == 0)
+    if (::fstat64(fd, &st) == 0) {
-    {
         return static_cast<size_t>(st.st_size);
     }
-#    else // other unix or linux 32 bits or cygwin
+    #else  // other unix or linux 32 bits or cygwin
     struct stat st;
-    if (::fstat(fd, &st) == 0)
+    if (::fstat(fd, &st) == 0) {
-    {
         return static_cast<size_t>(st.st_size);
     }
-#    endif
+    #endif
 #endif
     throw_spdlog_ex("Failed getting file size from fd", errno);
     return 0;  // will not be reached.
 }
 
 #ifdef _MSC_VER
-#    pragma warning(pop)
+    #pragma warning(pop)
 #endif
 
 // Return utc offset in minutes or throw spdlog_ex on failure
-SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm)
+SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm) {
-{
-
 #ifdef _WIN32
-#    if _WIN32_WINNT < _WIN32_WINNT_WS08
+    #if _WIN32_WINNT < _WIN32_WINNT_WS08
     TIME_ZONE_INFORMATION tzinfo;
     auto rv = ::GetTimeZoneInformation(&tzinfo);
-#    else
+    #else
     DYNAMIC_TIME_ZONE_INFORMATION tzinfo;
     auto rv = ::GetDynamicTimeZoneInformation(&tzinfo);
-#    endif
+    #endif
-    if (rv == TIME_ZONE_ID_INVALID)
+    if (rv == TIME_ZONE_ID_INVALID) throw_spdlog_ex("Failed getting timezone info. ", errno);
-        throw_spdlog_ex("Failed getting timezone info. ", errno);
 
     int offset = -tzinfo.Bias;
-    if (tm.tm_isdst)
+    if (tm.tm_isdst) {
-    {
         offset -= tzinfo.DaylightBias;
-    }
+    } else {
-    else
-    {
         offset -= tzinfo.StandardBias;
     }
     return offset;
 #else
 
-#    if defined(sun) || defined(__sun) || defined(_AIX) || (!defined(_BSD_SOURCE) && !defined(_GNU_SOURCE))
+    #if defined(sun) || defined(__sun) || defined(_AIX) || \
+        (defined(__NEWLIB__) && !defined(__TM_GMTOFF)) ||  \
+        (!defined(_BSD_SOURCE) && !defined(_GNU_SOURCE))
     // 'tm_gmtoff' field is BSD extension and it's missing on SunOS/Solaris
-    struct helper
+    struct helper {
-    {
+        static long int calculate_gmt_offset(const std::tm &localtm = details::os::localtime(),
-        static long int calculate_gmt_offset(const std::tm &localtm = details::os::localtime(), const std::tm &gmtm = details::os::gmtime())
+                                             const std::tm &gmtm = details::os::gmtime()) {
-        {
             int local_year = localtm.tm_year + (1900 - 1);
             int gmt_year = gmtm.tm_year + (1900 - 1);
 
@@ -316,9 +296,9 @@ SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm)
     };
 
     auto offset_seconds = helper::calculate_gmt_offset(tm);
-#    else
+    #else
     auto offset_seconds = tm.tm_gmtoff;
-#    endif
+    #endif
 
     return static_cast<int>(offset_seconds / 60);
 #endif
@@ -327,14 +307,13 @@ SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm)
 // Return current thread id as size_t
 // It exists because the std::this_thread::get_id() is much slower(especially
 // under VS 2013)
-SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT
+SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT {
-{
 #ifdef _WIN32
     return static_cast<size_t>(::GetCurrentThreadId());
 #elif defined(__linux__)
-#    if defined(__ANDROID__) && defined(__ANDROID_API__) && (__ANDROID_API__ < 21)
+    #if defined(__ANDROID__) && defined(__ANDROID_API__) && (__ANDROID_API__ < 21)
-#        define SYS_gettid __NR_gettid
+        #define SYS_gettid __NR_gettid
-#    endif
+    #endif
     return static_cast<size_t>(::syscall(SYS_gettid));
 #elif defined(_AIX)
     struct __pthrdsinfo buf;
@@ -353,7 +332,25 @@ SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT
     return static_cast<size_t>(::thr_self());
 #elif __APPLE__
     uint64_t tid;
+    // There is no pthread_threadid_np prior to Mac OS X 10.6, and it is not supported on any PPC,
+    // including 10.6.8 Rosetta. __POWERPC__ is Apple-specific define encompassing ppc and ppc64.
+    #ifdef MAC_OS_X_VERSION_MAX_ALLOWED
+    {
+        #if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) || defined(__POWERPC__)
+        tid = pthread_mach_thread_np(pthread_self());
+        #elif MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+        if (&pthread_threadid_np) {
             pthread_threadid_np(nullptr, &tid);
+        } else {
+            tid = pthread_mach_thread_np(pthread_self());
+        }
+        #else
+        pthread_threadid_np(nullptr, &tid);
+        #endif
+    }
+    #else
+    pthread_threadid_np(nullptr, &tid);
+    #endif
     return static_cast<size_t>(tid);
 #else  // Default to standard C++11 (other Unix)
     return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
@@ -361,8 +358,7 @@ SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT
 }
 
 // Return current thread id as size_t (from thread local storage)
-SPDLOG_INLINE size_t thread_id() SPDLOG_NOEXCEPT
+SPDLOG_INLINE size_t thread_id() SPDLOG_NOEXCEPT {
-{
 #if defined(SPDLOG_NO_TLS)
     return _thread_id();
 #else  // cache thread id in tls
@@ -373,8 +369,7 @@ SPDLOG_INLINE size_t thread_id() SPDLOG_NOEXCEPT
 
 // This is avoid msvc issue in sleep_for that happens if the clock changes.
 // See https://github.com/gabime/spdlog/issues/609
-SPDLOG_INLINE void sleep_for_millis(unsigned int milliseconds) SPDLOG_NOEXCEPT
+SPDLOG_INLINE void sleep_for_millis(unsigned int milliseconds) SPDLOG_NOEXCEPT {
-{
 #if defined(_WIN32)
     ::Sleep(milliseconds);
 #else
@@ -384,22 +379,16 @@ SPDLOG_INLINE void sleep_for_millis(unsigned int milliseconds) SPDLOG_NOEXCEPT
 
 // wchar support for windows file names (SPDLOG_WCHAR_FILENAMES must be defined)
 #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
-SPDLOG_INLINE std::string filename_to_str(const filename_t &filename)
+SPDLOG_INLINE std::string filename_to_str(const filename_t &filename) {
-{
     memory_buf_t buf;
     wstr_to_utf8buf(filename, buf);
     return SPDLOG_BUF_TO_STRING(buf);
 }
 #else
-SPDLOG_INLINE std::string filename_to_str(const filename_t &filename)
+SPDLOG_INLINE std::string filename_to_str(const filename_t &filename) { return filename; }
-{
-    return filename;
-}
 #endif
 
-SPDLOG_INLINE int pid() SPDLOG_NOEXCEPT
+SPDLOG_INLINE int pid() SPDLOG_NOEXCEPT {
-{
-
 #ifdef _WIN32
     return conditional_static_cast<int>(::GetCurrentProcessId());
 #else
@@ -409,29 +398,29 @@ SPDLOG_INLINE int pid() SPDLOG_NOEXCEPT
 
 // Determine if the terminal supports colors
 // Based on: https://github.com/agauniyal/rang/
-SPDLOG_INLINE bool is_color_terminal() SPDLOG_NOEXCEPT
+SPDLOG_INLINE bool is_color_terminal() SPDLOG_NOEXCEPT {
-{
 #ifdef _WIN32
     return true;
 #else
 
     static const bool result = []() {
         const char *env_colorterm_p = std::getenv("COLORTERM");
-        if (env_colorterm_p != nullptr)
+        if (env_colorterm_p != nullptr) {
-        {
             return true;
         }
 
-        static constexpr std::array<const char *, 16> terms = {{"ansi", "color", "console", "cygwin", "gnome", "konsole", "kterm", "linux",
+        static constexpr std::array<const char *, 16> terms = {
-            "msys", "putty", "rxvt", "screen", "vt100", "xterm", "alacritty", "vt102"}};
+            {"ansi", "color", "console", "cygwin", "gnome", "konsole", "kterm", "linux", "msys",
+             "putty", "rxvt", "screen", "vt100", "xterm", "alacritty", "vt102"}};
 
         const char *env_term_p = std::getenv("TERM");
-        if (env_term_p == nullptr)
+        if (env_term_p == nullptr) {
-        {
             return false;
         }
 
-        return std::any_of(terms.begin(), terms.end(), [&](const char *term) { return std::strstr(env_term_p, term) != nullptr; });
+        return std::any_of(terms.begin(), terms.end(), [&](const char *term) {
+            return std::strstr(env_term_p, term) != nullptr;
+        });
     }();
 
     return result;
@@ -440,9 +429,7 @@ SPDLOG_INLINE bool is_color_terminal() SPDLOG_NOEXCEPT
 
 // Determine if the terminal attached
 // Source: https://github.com/agauniyal/rang/
-SPDLOG_INLINE bool in_terminal(FILE *file) SPDLOG_NOEXCEPT
+SPDLOG_INLINE bool in_terminal(FILE *file) SPDLOG_NOEXCEPT {
-{
-
 #ifdef _WIN32
     return ::_isatty(_fileno(file)) != 0;
 #else
@@ -451,86 +438,77 @@ SPDLOG_INLINE bool in_terminal(FILE *file) SPDLOG_NOEXCEPT
 }
 
 #if (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32)
-SPDLOG_INLINE void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target)
+SPDLOG_INLINE void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target) {
-{
+    if (wstr.size() > static_cast<size_t>((std::numeric_limits<int>::max)()) / 4 - 1) {
-    if (wstr.size() > static_cast<size_t>((std::numeric_limits<int>::max)()) / 2 - 1)
-    {
         throw_spdlog_ex("UTF-16 string is too big to be converted to UTF-8");
     }
 
     int wstr_size = static_cast<int>(wstr.size());
-    if (wstr_size == 0)
+    if (wstr_size == 0) {
-    {
         target.resize(0);
         return;
     }
 
     int result_size = static_cast<int>(target.capacity());
-    if ((wstr_size + 1) * 2 > result_size)
+    if ((wstr_size + 1) * 4 > result_size) {
-    {
+        result_size =
-        result_size = ::WideCharToMultiByte(CP_UTF8, 0, wstr.data(), wstr_size, NULL, 0, NULL, NULL);
+            ::WideCharToMultiByte(CP_UTF8, 0, wstr.data(), wstr_size, NULL, 0, NULL, NULL);
     }
 
-    if (result_size > 0)
+    if (result_size > 0) {
-    {
         target.resize(result_size);
-        result_size = ::WideCharToMultiByte(CP_UTF8, 0, wstr.data(), wstr_size, target.data(), result_size, NULL, NULL);
+        result_size = ::WideCharToMultiByte(CP_UTF8, 0, wstr.data(), wstr_size, target.data(),
+                                            result_size, NULL, NULL);
 
-        if (result_size > 0)
+        if (result_size > 0) {
-        {
             target.resize(result_size);
             return;
         }
     }
 
-    throw_spdlog_ex(fmt_lib::format("WideCharToMultiByte failed. Last error: {}", ::GetLastError()));
+    throw_spdlog_ex(
+        fmt_lib::format("WideCharToMultiByte failed. Last error: {}", ::GetLastError()));
 }
 
-SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, wmemory_buf_t &target)
+SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, wmemory_buf_t &target) {
-{
+    if (str.size() > static_cast<size_t>((std::numeric_limits<int>::max)()) - 1) {
-    if (str.size() > static_cast<size_t>((std::numeric_limits<int>::max)()) - 1)
-    {
         throw_spdlog_ex("UTF-8 string is too big to be converted to UTF-16");
     }
 
     int str_size = static_cast<int>(str.size());
-    if (str_size == 0)
+    if (str_size == 0) {
-    {
         target.resize(0);
         return;
     }
 
-    int result_size = static_cast<int>(target.capacity());
+    // find the size to allocate for the result buffer
-    if (str_size + 1 > result_size)
+    int result_size =
-    {
+        ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size, NULL, 0);
-        result_size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size, NULL, 0);
-    }
 
-    if (result_size > 0)
+    if (result_size > 0) {
-    {
-        target.resize(result_size);
-        result_size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size, target.data(), result_size);
-
-        if (result_size > 0)
-        {
         target.resize(result_size);
+        result_size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size,
+                                            target.data(), result_size);
+        if (result_size > 0) {
+            assert(result_size == target.size());
             return;
         }
     }
 
-    throw_spdlog_ex(fmt_lib::format("MultiByteToWideChar failed. Last error: {}", ::GetLastError()));
+    throw_spdlog_ex(
+        fmt_lib::format("MultiByteToWideChar failed. Last error: {}", ::GetLastError()));
 }
-#endif // (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) && defined(_WIN32)
+#endif  // (defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT) || defined(SPDLOG_WCHAR_FILENAMES)) &&
+        // defined(_WIN32)
 
 // return true on success
-static SPDLOG_INLINE bool mkdir_(const filename_t &path)
+static SPDLOG_INLINE bool mkdir_(const filename_t &path) {
-{
 #ifdef _WIN32
-#    ifdef SPDLOG_WCHAR_FILENAMES
+    #ifdef SPDLOG_WCHAR_FILENAMES
     return ::_wmkdir(path.c_str()) == 0;
-#    else
+    #else
     return ::_mkdir(path.c_str()) == 0;
-#    endif
+    #endif
 #else
     return ::mkdir(path.c_str(), mode_t(0755)) == 0;
 #endif
@@ -538,32 +516,35 @@ static SPDLOG_INLINE bool mkdir_(const filename_t &path)
 
 // create the given directory - and all directories leading to it
 // return true on success or if the directory already exists
-SPDLOG_INLINE bool create_dir(const filename_t &path)
+SPDLOG_INLINE bool create_dir(const filename_t &path) {
-{
+    if (path_exists(path)) {
-    if (path_exists(path))
-    {
         return true;
     }
 
-    if (path.empty())
+    if (path.empty()) {
-    {
         return false;
     }
 
     size_t search_offset = 0;
-    do
+    do {
-    {
         auto token_pos = path.find_first_of(folder_seps_filename, search_offset);
         // treat the entire path as a folder if no folder separator not found
-        if (token_pos == filename_t::npos)
+        if (token_pos == filename_t::npos) {
-        {
             token_pos = path.size();
         }
 
         auto subdir = path.substr(0, token_pos);
+#ifdef _WIN32
+        // if subdir is just a drive letter, add a slash e.g. "c:"=>"c:\",
+        // otherwise path_exists(subdir) returns false (issue #3079)
+        const bool is_drive = subdir.length() == 2 && subdir[1] == ':';
+        if (is_drive) {
+            subdir += '\\';
+            token_pos++;
+        }
+#endif
 
-        if (!subdir.empty() && !path_exists(subdir) && !mkdir_(subdir))
+        if (!subdir.empty() && !path_exists(subdir) && !mkdir_(subdir)) {
-        {
             return false;  // return error if failed creating dir
         }
         search_offset = token_pos + 1;
@@ -577,30 +558,37 @@ SPDLOG_INLINE bool create_dir(const filename_t &path)
 // "abc/" => "abc"
 // "abc" => ""
 // "abc///" => "abc//"
-SPDLOG_INLINE filename_t dir_name(const filename_t &path)
+SPDLOG_INLINE filename_t dir_name(const filename_t &path) {
-{
     auto pos = path.find_last_of(folder_seps_filename);
     return pos != filename_t::npos ? path.substr(0, pos) : filename_t{};
 }
 
-std::string SPDLOG_INLINE getenv(const char *field)
+std::string SPDLOG_INLINE getenv(const char *field) {
-{
-
 #if defined(_MSC_VER)
-#    if defined(__cplusplus_winrt)
+    #if defined(__cplusplus_winrt)
     return std::string{};  // not supported under uwp
-#    else
+    #else
     size_t len = 0;
     char buf[128];
     bool ok = ::getenv_s(&len, buf, sizeof(buf), field) == 0;
     return ok ? buf : std::string{};
-#    endif
+    #endif
 #else  // revert to getenv
     char *buf = ::getenv(field);
     return buf ? buf : std::string{};
 #endif
 }
 
+// Do fsync by FILE handlerpointer
+// Return true on success
+SPDLOG_INLINE bool fsync(FILE *fp) {
+#ifdef _WIN32
+    return FlushFileBuffers(reinterpret_cast<HANDLE>(_get_osfhandle(_fileno(fp)))) != 0;
+#else
+    return ::fsync(fileno(fp)) == 0;
+#endif
+}
+
 }  // namespace os
 }  // namespace details
 }  // namespace spdlog

vendor/spdlog/details/os.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <spdlog/common.h>
 #include <ctime>  // std::time_t
+#include <spdlog/common.h>
 
 namespace spdlog {
 namespace details {
@@ -22,26 +22,27 @@ SPDLOG_API std::tm gmtime() SPDLOG_NOEXCEPT;
 
 // eol definition
 #if !defined(SPDLOG_EOL)
-#    ifdef _WIN32
+    #ifdef _WIN32
-#        define SPDLOG_EOL "\r\n"
+        #define SPDLOG_EOL "\r\n"
-#    else
+    #else
-#        define SPDLOG_EOL "\n"
+        #define SPDLOG_EOL "\n"
-#    endif
+    #endif
 #endif
 
 SPDLOG_CONSTEXPR static const char *default_eol = SPDLOG_EOL;
 
 // folder separator
 #if !defined(SPDLOG_FOLDER_SEPS)
-#    ifdef _WIN32
+    #ifdef _WIN32
-#        define SPDLOG_FOLDER_SEPS "\\/"
+        #define SPDLOG_FOLDER_SEPS "\\/"
-#    else
+    #else
-#        define SPDLOG_FOLDER_SEPS "/"
+        #define SPDLOG_FOLDER_SEPS "/"
-#    endif
+    #endif
 #endif
 
 SPDLOG_CONSTEXPR static const char folder_seps[] = SPDLOG_FOLDER_SEPS;
-SPDLOG_CONSTEXPR static const filename_t::value_type folder_seps_filename[] = SPDLOG_FILENAME_T(SPDLOG_FOLDER_SEPS);
+SPDLOG_CONSTEXPR static const filename_t::value_type folder_seps_filename[] =
+    SPDLOG_FILENAME_T(SPDLOG_FOLDER_SEPS);
 
 // fopen_s on non windows for writing
 SPDLOG_API bool fopen_s(FILE **fp, const filename_t &filename, const filename_t &mode);
@@ -109,10 +110,14 @@ SPDLOG_API bool create_dir(const filename_t &path);
 // return empty string if field not found
 SPDLOG_API std::string getenv(const char *field);
 
+// Do fsync by FILE objectpointer.
+// Return true on success.
+SPDLOG_API bool fsync(FILE *fp);
+
 }  // namespace os
 }  // namespace details
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "os-inl.h"
+    #include "os-inl.h"
 #endif

vendor/spdlog/details/periodic_worker-inl.h

@@ -4,38 +4,15 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/periodic_worker.h>
+    #include <spdlog/details/periodic_worker.h>
 #endif
 
 namespace spdlog {
 namespace details {
 
-SPDLOG_INLINE periodic_worker::periodic_worker(const std::function<void()> &callback_fun, std::chrono::seconds interval)
-{
-    active_ = (interval > std::chrono::seconds::zero());
-    if (!active_)
-    {
-        return;
-    }
-
-    worker_thread_ = std::thread([this, callback_fun, interval]() {
-        for (;;)
-        {
-            std::unique_lock<std::mutex> lock(this->mutex_);
-            if (this->cv_.wait_for(lock, interval, [this] { return !this->active_; }))
-            {
-                return; // active_ == false, so exit this thread
-            }
-            callback_fun();
-        }
-    });
-}
-
 // stop the worker thread and join it
-SPDLOG_INLINE periodic_worker::~periodic_worker()
+SPDLOG_INLINE periodic_worker::~periodic_worker() {
-{
+    if (worker_thread_.joinable()) {
-    if (worker_thread_.joinable())
-    {
         {
             std::lock_guard<std::mutex> lock(mutex_);
             active_ = false;

vendor/spdlog/details/periodic_worker.h

@@ -7,7 +7,8 @@
 //
 // RAII over the owned thread:
 //    creates the thread on construction.
-//    stops and joins the thread on destruction (if the thread is executing a callback, wait for it to finish first).
+//    stops and joins the thread on destruction (if the thread is executing a callback, wait for it
+//    to finish first).
 
 #include <chrono>
 #include <condition_variable>
@@ -17,10 +18,27 @@
 namespace spdlog {
 namespace details {
 
-class SPDLOG_API periodic_worker
+class SPDLOG_API periodic_worker {
-{
 public:
-    periodic_worker(const std::function<void()> &callback_fun, std::chrono::seconds interval);
+    template <typename Rep, typename Period>
+    periodic_worker(const std::function<void()> &callback_fun,
+                    std::chrono::duration<Rep, Period> interval) {
+        active_ = (interval > std::chrono::duration<Rep, Period>::zero());
+        if (!active_) {
+            return;
+        }
+
+        worker_thread_ = std::thread([this, callback_fun, interval]() {
+            for (;;) {
+                std::unique_lock<std::mutex> lock(this->mutex_);
+                if (this->cv_.wait_for(lock, interval, [this] { return !this->active_; })) {
+                    return;  // active_ == false, so exit this thread
+                }
+                callback_fun();
+            }
+        });
+    }
+    std::thread &get_thread() { return worker_thread_; }
     periodic_worker(const periodic_worker &) = delete;
     periodic_worker &operator=(const periodic_worker &) = delete;
     // stop the worker thread and join it
@@ -36,5 +54,5 @@ private:
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "periodic_worker-inl.h"
+    #include "periodic_worker-inl.h"
 #endif

vendor/spdlog/details/registry-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/registry.h>
+    #include <spdlog/details/registry.h>
 #endif
 
 #include <spdlog/common.h>
@@ -13,12 +13,12 @@
 #include <spdlog/pattern_formatter.h>
 
 #ifndef SPDLOG_DISABLE_DEFAULT_LOGGER
-// support for the default stdout color logger
+    // support for the default stdout color logger
-#    ifdef _WIN32
+    #ifdef _WIN32
-#        include <spdlog/sinks/wincolor_sink.h>
+        #include <spdlog/sinks/wincolor_sink.h>
-#    else
+    #else
-#        include <spdlog/sinks/ansicolor_sink.h>
+        #include <spdlog/sinks/ansicolor_sink.h>
-#    endif
+    #endif
 #endif  // SPDLOG_DISABLE_DEFAULT_LOGGER
 
 #include <chrono>
@@ -31,16 +31,14 @@ namespace spdlog {
 namespace details {
 
 SPDLOG_INLINE registry::registry()
-    : formatter_(new pattern_formatter())
+    : formatter_(new pattern_formatter()) {
-{
-
 #ifndef SPDLOG_DISABLE_DEFAULT_LOGGER
     // create default logger (ansicolor_stdout_sink_mt or wincolor_stdout_sink_mt in windows).
-#    ifdef _WIN32
+    #ifdef _WIN32
     auto color_sink = std::make_shared<sinks::wincolor_stdout_sink_mt>();
-#    else
+    #else
     auto color_sink = std::make_shared<sinks::ansicolor_stdout_sink_mt>();
-#    endif
+    #endif
 
     const char *default_logger_name = "";
     default_logger_ = std::make_shared<spdlog::logger>(default_logger_name, std::move(color_sink));
@@ -51,19 +49,16 @@ SPDLOG_INLINE registry::registry()
 
 SPDLOG_INLINE registry::~registry() = default;
 
-SPDLOG_INLINE void registry::register_logger(std::shared_ptr<logger> new_logger)
+SPDLOG_INLINE void registry::register_logger(std::shared_ptr<logger> new_logger) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     register_logger_(std::move(new_logger));
 }
 
-SPDLOG_INLINE void registry::initialize_logger(std::shared_ptr<logger> new_logger)
+SPDLOG_INLINE void registry::initialize_logger(std::shared_ptr<logger> new_logger) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     new_logger->set_formatter(formatter_->clone());
 
-    if (err_handler_)
+    if (err_handler_) {
-    {
         new_logger->set_error_handler(err_handler_);
     }
 
@@ -74,26 +69,22 @@ SPDLOG_INLINE void registry::initialize_logger(std::shared_ptr<logger> new_logge
 
     new_logger->flush_on(flush_level_);
 
-    if (backtrace_n_messages_ > 0)
+    if (backtrace_n_messages_ > 0) {
-    {
         new_logger->enable_backtrace(backtrace_n_messages_);
     }
 
-    if (automatic_registration_)
+    if (automatic_registration_) {
-    {
         register_logger_(std::move(new_logger));
     }
 }
 
-SPDLOG_INLINE std::shared_ptr<logger> registry::get(const std::string &logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> registry::get(const std::string &logger_name) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     auto found = loggers_.find(logger_name);
     return found == loggers_.end() ? nullptr : found->second;
 }
 
-SPDLOG_INLINE std::shared_ptr<logger> registry::default_logger()
+SPDLOG_INLINE std::shared_ptr<logger> registry::default_logger() {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     return default_logger_;
 }
@@ -102,147 +93,110 @@ SPDLOG_INLINE std::shared_ptr<logger> registry::default_logger()
 // To be used directly by the spdlog default api (e.g. spdlog::info)
 // This make the default API faster, but cannot be used concurrently with set_default_logger().
 // e.g do not call set_default_logger() from one thread while calling spdlog::info() from another.
-SPDLOG_INLINE logger *registry::get_default_raw()
+SPDLOG_INLINE logger *registry::get_default_raw() { return default_logger_.get(); }
-{
-    return default_logger_.get();
-}
 
 // set default logger.
 // default logger is stored in default_logger_ (for faster retrieval) and in the loggers_ map.
-SPDLOG_INLINE void registry::set_default_logger(std::shared_ptr<logger> new_default_logger)
+SPDLOG_INLINE void registry::set_default_logger(std::shared_ptr<logger> new_default_logger) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    // remove previous default logger from the map
+    if (new_default_logger != nullptr) {
-    if (default_logger_ != nullptr)
-    {
-        loggers_.erase(default_logger_->name());
-    }
-    if (new_default_logger != nullptr)
-    {
         loggers_[new_default_logger->name()] = new_default_logger;
     }
     default_logger_ = std::move(new_default_logger);
 }
 
-SPDLOG_INLINE void registry::set_tp(std::shared_ptr<thread_pool> tp)
+SPDLOG_INLINE void registry::set_tp(std::shared_ptr<thread_pool> tp) {
-{
     std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
     tp_ = std::move(tp);
 }
 
-SPDLOG_INLINE std::shared_ptr<thread_pool> registry::get_tp()
+SPDLOG_INLINE std::shared_ptr<thread_pool> registry::get_tp() {
-{
     std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
     return tp_;
 }
 
 // Set global formatter. Each sink in each logger will get a clone of this object
-SPDLOG_INLINE void registry::set_formatter(std::unique_ptr<formatter> formatter)
+SPDLOG_INLINE void registry::set_formatter(std::unique_ptr<formatter> formatter) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     formatter_ = std::move(formatter);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->set_formatter(formatter_->clone());
     }
 }
 
-SPDLOG_INLINE void registry::enable_backtrace(size_t n_messages)
+SPDLOG_INLINE void registry::enable_backtrace(size_t n_messages) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     backtrace_n_messages_ = n_messages;
 
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->enable_backtrace(n_messages);
     }
 }
 
-SPDLOG_INLINE void registry::disable_backtrace()
+SPDLOG_INLINE void registry::disable_backtrace() {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     backtrace_n_messages_ = 0;
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->disable_backtrace();
     }
 }
 
-SPDLOG_INLINE void registry::set_level(level::level_enum log_level)
+SPDLOG_INLINE void registry::set_level(level::level_enum log_level) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->set_level(log_level);
     }
     global_log_level_ = log_level;
 }
 
-SPDLOG_INLINE void registry::flush_on(level::level_enum log_level)
+SPDLOG_INLINE void registry::flush_on(level::level_enum log_level) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->flush_on(log_level);
     }
     flush_level_ = log_level;
 }
 
-SPDLOG_INLINE void registry::flush_every(std::chrono::seconds interval)
+SPDLOG_INLINE void registry::set_error_handler(err_handler handler) {
-{
-    std::lock_guard<std::mutex> lock(flusher_mutex_);
-    auto clbk = [this]() { this->flush_all(); };
-    periodic_flusher_ = details::make_unique<periodic_worker>(clbk, interval);
-}
-
-SPDLOG_INLINE void registry::set_error_handler(err_handler handler)
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->set_error_handler(handler);
     }
     err_handler_ = std::move(handler);
 }
 
-SPDLOG_INLINE void registry::apply_all(const std::function<void(const std::shared_ptr<logger>)> &fun)
+SPDLOG_INLINE void registry::apply_all(
-{
+    const std::function<void(const std::shared_ptr<logger>)> &fun) {
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         fun(l.second);
     }
 }
 
-SPDLOG_INLINE void registry::flush_all()
+SPDLOG_INLINE void registry::flush_all() {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    for (auto &l : loggers_)
+    for (auto &l : loggers_) {
-    {
         l.second->flush();
     }
 }
 
-SPDLOG_INLINE void registry::drop(const std::string &logger_name)
+SPDLOG_INLINE void registry::drop(const std::string &logger_name) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
+    auto is_default_logger = default_logger_ && default_logger_->name() == logger_name;
     loggers_.erase(logger_name);
-    if (default_logger_ && default_logger_->name() == logger_name)
+    if (is_default_logger) {
-    {
         default_logger_.reset();
     }
 }
 
-SPDLOG_INLINE void registry::drop_all()
+SPDLOG_INLINE void registry::drop_all() {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     loggers_.clear();
     default_logger_.reset();
 }
 
 // clean all resources and threads started by the registry
-SPDLOG_INLINE void registry::shutdown()
+SPDLOG_INLINE void registry::shutdown() {
-{
     {
         std::lock_guard<std::mutex> lock(flusher_mutex_);
         periodic_flusher_.reset();
@@ -256,54 +210,48 @@ SPDLOG_INLINE void registry::shutdown()
     }
 }
 
-SPDLOG_INLINE std::recursive_mutex &registry::tp_mutex()
+SPDLOG_INLINE std::recursive_mutex &registry::tp_mutex() { return tp_mutex_; }
-{
-    return tp_mutex_;
-}
 
-SPDLOG_INLINE void registry::set_automatic_registration(bool automatic_registration)
+SPDLOG_INLINE void registry::set_automatic_registration(bool automatic_registration) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     automatic_registration_ = automatic_registration;
 }
 
-SPDLOG_INLINE void registry::set_levels(log_levels levels, level::level_enum *global_level)
+SPDLOG_INLINE void registry::set_levels(log_levels levels, level::level_enum *global_level) {
-{
     std::lock_guard<std::mutex> lock(logger_map_mutex_);
     log_levels_ = std::move(levels);
     auto global_level_requested = global_level != nullptr;
     global_log_level_ = global_level_requested ? *global_level : global_log_level_;
 
-    for (auto &logger : loggers_)
+    for (auto &logger : loggers_) {
-    {
         auto logger_entry = log_levels_.find(logger.first);
-        if (logger_entry != log_levels_.end())
+        if (logger_entry != log_levels_.end()) {
-        {
             logger.second->set_level(logger_entry->second);
-        }
+        } else if (global_level_requested) {
-        else if (global_level_requested)
-        {
             logger.second->set_level(*global_level);
         }
     }
 }
 
-SPDLOG_INLINE registry &registry::instance()
+SPDLOG_INLINE registry &registry::instance() {
-{
     static registry s_instance;
     return s_instance;
 }
 
-SPDLOG_INLINE void registry::throw_if_exists_(const std::string &logger_name)
+SPDLOG_INLINE void registry::apply_logger_env_levels(std::shared_ptr<logger> new_logger) {
-{
+    std::lock_guard<std::mutex> lock(logger_map_mutex_);
-    if (loggers_.find(logger_name) != loggers_.end())
+    auto it = log_levels_.find(new_logger->name());
-    {
+    auto new_level = it != log_levels_.end() ? it->second : global_log_level_;
+    new_logger->set_level(new_level);
+}
+
+SPDLOG_INLINE void registry::throw_if_exists_(const std::string &logger_name) {
+    if (loggers_.find(logger_name) != loggers_.end()) {
         throw_spdlog_ex("logger with name '" + logger_name + "' already exists");
     }
 }
 
-SPDLOG_INLINE void registry::register_logger_(std::shared_ptr<logger> new_logger)
+SPDLOG_INLINE void registry::register_logger_(std::shared_ptr<logger> new_logger) {
-{
     auto logger_name = new_logger->name();
     throw_if_exists_(logger_name);
     loggers_[logger_name] = std::move(new_logger);

vendor/spdlog/details/registry.h

@@ -9,23 +9,22 @@
 // This class is thread safe
 
 #include <spdlog/common.h>
+#include <spdlog/details/periodic_worker.h>
 
 #include <chrono>
 #include <functional>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <unordered_map>
-#include <mutex>
 
 namespace spdlog {
 class logger;
 
 namespace details {
 class thread_pool;
-class periodic_worker;
 
-class SPDLOG_API registry
+class SPDLOG_API registry {
-{
 public:
     using log_levels = std::unordered_map<std::string, level::level_enum>;
     registry(const registry &) = delete;
@@ -39,11 +38,14 @@ public:
     // Return raw ptr to the default logger.
     // To be used directly by the spdlog default api (e.g. spdlog::info)
     // This make the default API faster, but cannot be used concurrently with set_default_logger().
-    // e.g do not call set_default_logger() from one thread while calling spdlog::info() from another.
+    // e.g do not call set_default_logger() from one thread while calling spdlog::info() from
+    // another.
     logger *get_default_raw();
 
-    // set default logger.
+    // set default logger and add it to the registry if not registered already.
     // default logger is stored in default_logger_ (for faster retrieval) and in the loggers_ map.
+    // Note: Make sure to unregister it when no longer needed or before calling again with a new
+    // logger.
     void set_default_logger(std::shared_ptr<logger> new_default_logger);
 
     void set_tp(std::shared_ptr<thread_pool> tp);
@@ -61,7 +63,17 @@ public:
 
     void flush_on(level::level_enum log_level);
 
-    void flush_every(std::chrono::seconds interval);
+    template <typename Rep, typename Period>
+    void flush_every(std::chrono::duration<Rep, Period> interval) {
+        std::lock_guard<std::mutex> lock(flusher_mutex_);
+        auto clbk = [this]() { this->flush_all(); };
+        periodic_flusher_ = details::make_unique<periodic_worker>(clbk, interval);
+    }
+
+    std::unique_ptr<periodic_worker> &get_flusher() {
+        std::lock_guard<std::mutex> lock(flusher_mutex_);
+        return periodic_flusher_;
+    }
 
     void set_error_handler(err_handler handler);
 
@@ -85,6 +97,8 @@ public:
 
     static registry &instance();
 
+    void apply_logger_env_levels(std::shared_ptr<logger> new_logger);
+
 private:
     registry();
     ~registry();
@@ -111,5 +125,5 @@ private:
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "registry-inl.h"
+    #include "registry-inl.h"
 #endif

vendor/spdlog/details/synchronous_factory.h

@@ -10,11 +10,9 @@ namespace spdlog {
 // Default logger factory-  creates synchronous loggers
 class logger;
 
-struct synchronous_factory
+struct synchronous_factory {
-{
+    template <typename Sink, typename... SinkArgs>
-    template<typename Sink, typename... SinkArgs>
+    static std::shared_ptr<spdlog::logger> create(std::string logger_name, SinkArgs &&...args) {
-    static std::shared_ptr<spdlog::logger> create(std::string logger_name, SinkArgs &&... args)
-    {
         auto sink = std::make_shared<Sink>(std::forward<SinkArgs>(args)...);
         auto new_logger = std::make_shared<spdlog::logger>(std::move(logger_name), std::move(sink));
         details::registry::instance().initialize_logger(new_logger);

vendor/spdlog/details/tcp_client-windows.h

@@ -8,12 +8,12 @@
 #include <spdlog/common.h>
 #include <spdlog/details/os.h>
 
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string>
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 
 #pragma comment(lib, "Ws2_32.lib")
 #pragma comment(lib, "Mswsock.lib")
@@ -21,69 +21,52 @@
 
 namespace spdlog {
 namespace details {
-class tcp_client
+class tcp_client {
-{
     SOCKET socket_ = INVALID_SOCKET;
 
-    static void init_winsock_()
+    static void init_winsock_() {
-    {
         WSADATA wsaData;
         auto rv = WSAStartup(MAKEWORD(2, 2), &wsaData);
-        if (rv != 0)
+        if (rv != 0) {
-        {
             throw_winsock_error_("WSAStartup failed", ::WSAGetLastError());
         }
     }
 
-    static void throw_winsock_error_(const std::string &msg, int last_error)
+    static void throw_winsock_error_(const std::string &msg, int last_error) {
-    {
         char buf[512];
-        ::FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, last_error,
+        ::FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
-            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, (sizeof(buf) / sizeof(char)), NULL);
+                         last_error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf,
+                         (sizeof(buf) / sizeof(char)), NULL);
 
         throw_spdlog_ex(fmt_lib::format("tcp_sink - {}: {}", msg, buf));
     }
 
 public:
-    tcp_client()
+    tcp_client() { init_winsock_(); }
-    {
-        init_winsock_();
-    }
 
-    ~tcp_client()
+    ~tcp_client() {
-    {
         close();
         ::WSACleanup();
     }
 
-    bool is_connected() const
+    bool is_connected() const { return socket_ != INVALID_SOCKET; }
-    {
-        return socket_ != INVALID_SOCKET;
-    }
 
-    void close()
+    void close() {
-    {
         ::closesocket(socket_);
         socket_ = INVALID_SOCKET;
     }
 
-    SOCKET fd() const
+    SOCKET fd() const { return socket_; }
-    {
-        return socket_;
-    }
 
     // try to connect or throw on failure
-    void connect(const std::string &host, int port)
+    void connect(const std::string &host, int port) {
-    {
+        if (is_connected()) {
-        if (is_connected())
-        {
             close();
         }
-        struct addrinfo hints
+        struct addrinfo hints {};
-        {};
         ZeroMemory(&hints, sizeof(hints));
 
-        hints.ai_family = AF_INET;       // IPv4
+        hints.ai_family = AF_UNSPEC;      // To work with IPv4, IPv6, and so on
         hints.ai_socktype = SOCK_STREAM;  // TCP
         hints.ai_flags = AI_NUMERICSERV;  // port passed as as numeric value
         hints.ai_protocol = 0;
@@ -92,8 +75,7 @@ public:
         struct addrinfo *addrinfo_result;
         auto rv = ::getaddrinfo(host.c_str(), port_str.c_str(), &hints, &addrinfo_result);
         int last_error = 0;
-        if (rv != 0)
+        if (rv != 0) {
-        {
             last_error = ::WSAGetLastError();
             WSACleanup();
             throw_winsock_error_("getaddrinfo failed", last_error);
@@ -101,48 +83,41 @@ public:
 
         // Try each address until we successfully connect(2).
 
-        for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next)
+        for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next) {
-        {
             socket_ = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-            if (socket_ == INVALID_SOCKET)
+            if (socket_ == INVALID_SOCKET) {
-            {
                 last_error = ::WSAGetLastError();
                 WSACleanup();
                 continue;
             }
-            if (::connect(socket_, rp->ai_addr, (int)rp->ai_addrlen) == 0)
+            if (::connect(socket_, rp->ai_addr, (int)rp->ai_addrlen) == 0) {
-            {
                 break;
-            }
+            } else {
-            else
-            {
                 last_error = ::WSAGetLastError();
                 close();
             }
         }
         ::freeaddrinfo(addrinfo_result);
-        if (socket_ == INVALID_SOCKET)
+        if (socket_ == INVALID_SOCKET) {
-        {
             WSACleanup();
             throw_winsock_error_("connect failed", last_error);
         }
 
         // set TCP_NODELAY
         int enable_flag = 1;
-        ::setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&enable_flag), sizeof(enable_flag));
+        ::setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&enable_flag),
+                     sizeof(enable_flag));
     }
 
     // Send exactly n_bytes of the given data.
     // On error close the connection and throw.
-    void send(const char *data, size_t n_bytes)
+    void send(const char *data, size_t n_bytes) {
-    {
         size_t bytes_sent = 0;
-        while (bytes_sent < n_bytes)
+        while (bytes_sent < n_bytes) {
-        {
             const int send_flags = 0;
-            auto write_result = ::send(socket_, data + bytes_sent, (int)(n_bytes - bytes_sent), send_flags);
+            auto write_result =
-            if (write_result == SOCKET_ERROR)
+                ::send(socket_, data + bytes_sent, (int)(n_bytes - bytes_sent), send_flags);
-            {
+            if (write_result == SOCKET_ERROR) {
                 int last_error = ::WSAGetLastError();
                 close();
                 throw_winsock_error_("send failed", last_error);

vendor/spdlog/details/tcp_client.h

@@ -4,60 +4,47 @@
 #pragma once
 
 #ifdef _WIN32
-#    error include tcp_client-windows.h instead
+    #error include tcp_client-windows.h instead
 #endif
 
 // tcp client helper
 #include <spdlog/common.h>
 #include <spdlog/details/os.h>
 
-#include <sys/socket.h>
 #include <arpa/inet.h>
-#include <unistd.h>
 #include <netdb.h>
+#include <netinet/in.h>
 #include <netinet/tcp.h>
+#include <sys/socket.h>
+#include <unistd.h>
 
 #include <string>
 
 namespace spdlog {
 namespace details {
-class tcp_client
+class tcp_client {
-{
     int socket_ = -1;
 
 public:
-    bool is_connected() const
+    bool is_connected() const { return socket_ != -1; }
-    {
-        return socket_ != -1;
-    }
 
-    void close()
+    void close() {
-    {
+        if (is_connected()) {
-        if (is_connected())
-        {
             ::close(socket_);
             socket_ = -1;
         }
     }
 
-    int fd() const
+    int fd() const { return socket_; }
-    {
-        return socket_;
-    }
 
-    ~tcp_client()
+    ~tcp_client() { close(); }
-    {
-        close();
-    }
 
     // try to connect or throw on failure
-    void connect(const std::string &host, int port)
+    void connect(const std::string &host, int port) {
-    {
         close();
-        struct addrinfo hints
+        struct addrinfo hints {};
-        {};
         memset(&hints, 0, sizeof(struct addrinfo));
-        hints.ai_family = AF_INET;       // IPv4
+        hints.ai_family = AF_UNSPEC;      // To work with IPv4, IPv6, and so on
         hints.ai_socktype = SOCK_STREAM;  // TCP
         hints.ai_flags = AI_NUMERICSERV;  // port passed as as numeric value
         hints.ai_protocol = 0;
@@ -65,29 +52,25 @@ public:
         auto port_str = std::to_string(port);
         struct addrinfo *addrinfo_result;
         auto rv = ::getaddrinfo(host.c_str(), port_str.c_str(), &hints, &addrinfo_result);
-        if (rv != 0)
+        if (rv != 0) {
-        {
             throw_spdlog_ex(fmt_lib::format("::getaddrinfo failed: {}", gai_strerror(rv)));
         }
 
         // Try each address until we successfully connect(2).
         int last_errno = 0;
-        for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next)
+        for (auto *rp = addrinfo_result; rp != nullptr; rp = rp->ai_next) {
-        {
 #if defined(SOCK_CLOEXEC)
             const int flags = SOCK_CLOEXEC;
 #else
             const int flags = 0;
 #endif
             socket_ = ::socket(rp->ai_family, rp->ai_socktype | flags, rp->ai_protocol);
-            if (socket_ == -1)
+            if (socket_ == -1) {
-            {
                 last_errno = errno;
                 continue;
             }
             rv = ::connect(socket_, rp->ai_addr, rp->ai_addrlen);
-            if (rv == 0)
+            if (rv == 0) {
-            {
                 break;
             }
             last_errno = errno;
@@ -95,40 +78,39 @@ public:
             socket_ = -1;
         }
         ::freeaddrinfo(addrinfo_result);
-        if (socket_ == -1)
+        if (socket_ == -1) {
-        {
             throw_spdlog_ex("::connect failed", last_errno);
         }
 
         // set TCP_NODELAY
         int enable_flag = 1;
-        ::setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&enable_flag), sizeof(enable_flag));
+        ::setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&enable_flag),
+                     sizeof(enable_flag));
 
         // prevent sigpipe on systems where MSG_NOSIGNAL is not available
 #if defined(SO_NOSIGPIPE) && !defined(MSG_NOSIGNAL)
-        ::setsockopt(socket_, SOL_SOCKET, SO_NOSIGPIPE, reinterpret_cast<char *>(&enable_flag), sizeof(enable_flag));
+        ::setsockopt(socket_, SOL_SOCKET, SO_NOSIGPIPE, reinterpret_cast<char *>(&enable_flag),
+                     sizeof(enable_flag));
 #endif
 
 #if !defined(SO_NOSIGPIPE) && !defined(MSG_NOSIGNAL)
-#    error "tcp_sink would raise SIGPIPE since niether SO_NOSIGPIPE nor MSG_NOSIGNAL are available"
+    #error "tcp_sink would raise SIGPIPE since neither SO_NOSIGPIPE nor MSG_NOSIGNAL are available"
 #endif
     }
 
     // Send exactly n_bytes of the given data.
     // On error close the connection and throw.
-    void send(const char *data, size_t n_bytes)
+    void send(const char *data, size_t n_bytes) {
-    {
         size_t bytes_sent = 0;
-        while (bytes_sent < n_bytes)
+        while (bytes_sent < n_bytes) {
-        {
 #if defined(MSG_NOSIGNAL)
             const int send_flags = MSG_NOSIGNAL;
 #else
             const int send_flags = 0;
 #endif
-            auto write_result = ::send(socket_, data + bytes_sent, n_bytes - bytes_sent, send_flags);
+            auto write_result =
-            if (write_result < 0)
+                ::send(socket_, data + bytes_sent, n_bytes - bytes_sent, send_flags);
-            {
+            if (write_result < 0) {
                 close();
                 throw_spdlog_ex("write(2) failed", errno);
             }

vendor/spdlog/details/thread_pool-inl.h

@@ -4,26 +4,26 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/details/thread_pool.h>
+    #include <spdlog/details/thread_pool.h>
 #endif
 
-#include <spdlog/common.h>
 #include <cassert>
+#include <spdlog/common.h>
 
 namespace spdlog {
 namespace details {
 
-SPDLOG_INLINE thread_pool::thread_pool(
+SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items,
-    size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start, std::function<void()> on_thread_stop)
+                                       size_t threads_n,
-    : q_(q_max_items)
+                                       std::function<void()> on_thread_start,
-{
+                                       std::function<void()> on_thread_stop)
-    if (threads_n == 0 || threads_n > 1000)
+    : q_(q_max_items) {
-    {
+    if (threads_n == 0 || threads_n > 1000) {
-        throw_spdlog_ex("spdlog::thread_pool(): invalid threads_n param (valid "
+        throw_spdlog_ex(
+            "spdlog::thread_pool(): invalid threads_n param (valid "
             "range is 1-1000)");
     }
-    for (size_t i = 0; i < threads_n; i++)
+    for (size_t i = 0; i < threads_n; i++) {
-    {
         threads_.emplace_back([this, on_thread_start, on_thread_stop] {
             on_thread_start();
             this->thread_pool::worker_loop_();
@@ -32,91 +32,87 @@ SPDLOG_INLINE thread_pool::thread_pool(
     }
 }
 
-SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start)
+SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items,
-    : thread_pool(q_max_items, threads_n, on_thread_start, [] {})
+                                       size_t threads_n,
-{}
+                                       std::function<void()> on_thread_start)
+    : thread_pool(q_max_items, threads_n, on_thread_start, [] {}) {}
 
 SPDLOG_INLINE thread_pool::thread_pool(size_t q_max_items, size_t threads_n)
     : thread_pool(
-          q_max_items, threads_n, [] {}, [] {})
+          q_max_items, threads_n, [] {}, [] {}) {}
-{}
 
 // message all threads to terminate gracefully join them
-SPDLOG_INLINE thread_pool::~thread_pool()
+SPDLOG_INLINE thread_pool::~thread_pool() {
-{
+    SPDLOG_TRY {
-    SPDLOG_TRY
+        for (size_t i = 0; i < threads_.size(); i++) {
-    {
-        for (size_t i = 0; i < threads_.size(); i++)
-        {
             post_async_msg_(async_msg(async_msg_type::terminate), async_overflow_policy::block);
         }
 
-        for (auto &t : threads_)
+        for (auto &t : threads_) {
-        {
             t.join();
         }
     }
     SPDLOG_CATCH_STD
 }
 
-void SPDLOG_INLINE thread_pool::post_log(async_logger_ptr &&worker_ptr, const details::log_msg &msg, async_overflow_policy overflow_policy)
+void SPDLOG_INLINE thread_pool::post_log(async_logger_ptr &&worker_ptr,
-{
+                                         const details::log_msg &msg,
+                                         async_overflow_policy overflow_policy) {
     async_msg async_m(std::move(worker_ptr), async_msg_type::log, msg);
     post_async_msg_(std::move(async_m), overflow_policy);
 }
 
-void SPDLOG_INLINE thread_pool::post_flush(async_logger_ptr &&worker_ptr, async_overflow_policy overflow_policy)
+std::future<void> SPDLOG_INLINE thread_pool::post_flush(async_logger_ptr &&worker_ptr,
-{
+                                                        async_overflow_policy overflow_policy) {
-    post_async_msg_(async_msg(std::move(worker_ptr), async_msg_type::flush), overflow_policy);
+    std::promise<void> promise;
+    std::future<void> future = promise.get_future();
+    post_async_msg_(async_msg(std::move(worker_ptr), async_msg_type::flush, std::move(promise)),
+                    overflow_policy);
+    return future;
 }
 
-size_t SPDLOG_INLINE thread_pool::overrun_counter()
+size_t SPDLOG_INLINE thread_pool::overrun_counter() { return q_.overrun_counter(); }
-{
-    return q_.overrun_counter();
-}
 
-size_t SPDLOG_INLINE thread_pool::queue_size()
+void SPDLOG_INLINE thread_pool::reset_overrun_counter() { q_.reset_overrun_counter(); }
-{
-    return q_.size();
-}
 
-void SPDLOG_INLINE thread_pool::post_async_msg_(async_msg &&new_msg, async_overflow_policy overflow_policy)
+size_t SPDLOG_INLINE thread_pool::discard_counter() { return q_.discard_counter(); }
-{
+
-    if (overflow_policy == async_overflow_policy::block)
+void SPDLOG_INLINE thread_pool::reset_discard_counter() { q_.reset_discard_counter(); }
-    {
+
+size_t SPDLOG_INLINE thread_pool::queue_size() { return q_.size(); }
+
+void SPDLOG_INLINE thread_pool::post_async_msg_(async_msg &&new_msg,
+                                                async_overflow_policy overflow_policy) {
+    if (overflow_policy == async_overflow_policy::block) {
         q_.enqueue(std::move(new_msg));
-    }
+    } else if (overflow_policy == async_overflow_policy::overrun_oldest) {
-    else
-    {
         q_.enqueue_nowait(std::move(new_msg));
+    } else {
+        assert(overflow_policy == async_overflow_policy::discard_new);
+        q_.enqueue_if_have_room(std::move(new_msg));
     }
 }
 
-void SPDLOG_INLINE thread_pool::worker_loop_()
+void SPDLOG_INLINE thread_pool::worker_loop_() {
-{
+    while (process_next_msg_()) {
-    while (process_next_msg_()) {}
+    }
 }
 
 // process next message in the queue
 // return true if this thread should still be active (while no terminate msg
 // was received)
-bool SPDLOG_INLINE thread_pool::process_next_msg_()
+bool SPDLOG_INLINE thread_pool::process_next_msg_() {
-{
     async_msg incoming_async_msg;
-    bool dequeued = q_.dequeue_for(incoming_async_msg, std::chrono::seconds(10));
+    q_.dequeue(incoming_async_msg);
-    if (!dequeued)
-    {
-        return true;
-    }
 
-    switch (incoming_async_msg.msg_type)
+    switch (incoming_async_msg.msg_type) {
-    {
         case async_msg_type::log: {
             incoming_async_msg.worker_ptr->backend_sink_it_(incoming_async_msg);
             return true;
         }
         case async_msg_type::flush: {
             incoming_async_msg.worker_ptr->backend_flush_();
+            incoming_async_msg.flush_promise.set_value();
             return true;
         }
 

vendor/spdlog/details/thread_pool.h

@@ -8,10 +8,11 @@
 #include <spdlog/details/os.h>
 
 #include <chrono>
+#include <functional>
+#include <future>
 #include <memory>
 #include <thread>
 #include <vector>
-#include <functional>
 
 namespace spdlog {
 class async_logger;
@@ -20,19 +21,14 @@ namespace details {
 
 using async_logger_ptr = std::shared_ptr<spdlog::async_logger>;
 
-enum class async_msg_type
+enum class async_msg_type { log, flush, terminate };
-{
-    log,
-    flush,
-    terminate
-};
 
 // Async msg to move to/from the queue
 // Movable only. should never be copied
-struct async_msg : log_msg_buffer
+struct async_msg : log_msg_buffer {
-{
     async_msg_type msg_type{async_msg_type::log};
     async_logger_ptr worker_ptr;
+    std::promise<void> flush_promise;
 
     async_msg() = default;
     ~async_msg() = default;
@@ -43,13 +39,11 @@ struct async_msg : log_msg_buffer
 // support for vs2013 move
 #if defined(_MSC_VER) && _MSC_VER <= 1800
     async_msg(async_msg &&other)
-        : log_msg_buffer(std::move(other))
+        : log_msg_buffer(std::move(other)),
-        , msg_type(other.msg_type)
+          msg_type(other.msg_type),
-        , worker_ptr(std::move(other.worker_ptr))
+          worker_ptr(std::move(other.worker_ptr)) {}
-    {}
 
-    async_msg &operator=(async_msg &&other)
+    async_msg &operator=(async_msg &&other) {
-    {
         *static_cast<log_msg_buffer *>(this) = std::move(other);
         msg_type = other.msg_type;
         worker_ptr = std::move(other.worker_ptr);
@@ -62,29 +56,36 @@ struct async_msg : log_msg_buffer
 
     // construct from log_msg with given type
     async_msg(async_logger_ptr &&worker, async_msg_type the_type, const details::log_msg &m)
-        : log_msg_buffer{m}
+        : log_msg_buffer{m},
-        , msg_type{the_type}
+          msg_type{the_type},
-        , worker_ptr{std::move(worker)}
+          worker_ptr{std::move(worker)},
-    {}
+          flush_promise{} {}
 
     async_msg(async_logger_ptr &&worker, async_msg_type the_type)
-        : log_msg_buffer{}
+        : log_msg_buffer{},
-        , msg_type{the_type}
+          msg_type{the_type},
-        , worker_ptr{std::move(worker)}
+          worker_ptr{std::move(worker)},
-    {}
+          flush_promise{} {}
+
+    async_msg(async_logger_ptr &&worker, async_msg_type the_type, std::promise<void> &&promise)
+        : log_msg_buffer{},
+          msg_type{the_type},
+          worker_ptr{std::move(worker)},
+          flush_promise{std::move(promise)} {}
 
     explicit async_msg(async_msg_type the_type)
-        : async_msg{nullptr, the_type}
+        : async_msg{nullptr, the_type} {}
-    {}
 };
 
-class SPDLOG_API thread_pool
+class SPDLOG_API thread_pool {
-{
 public:
     using item_type = async_msg;
     using q_type = details::mpmc_blocking_queue<item_type>;
 
-    thread_pool(size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start, std::function<void()> on_thread_stop);
+    thread_pool(size_t q_max_items,
+                size_t threads_n,
+                std::function<void()> on_thread_start,
+                std::function<void()> on_thread_stop);
     thread_pool(size_t q_max_items, size_t threads_n, std::function<void()> on_thread_start);
     thread_pool(size_t q_max_items, size_t threads_n);
 
@@ -94,9 +95,15 @@ public:
     thread_pool(const thread_pool &) = delete;
     thread_pool &operator=(thread_pool &&) = delete;
 
-    void post_log(async_logger_ptr &&worker_ptr, const details::log_msg &msg, async_overflow_policy overflow_policy);
+    void post_log(async_logger_ptr &&worker_ptr,
-    void post_flush(async_logger_ptr &&worker_ptr, async_overflow_policy overflow_policy);
+                  const details::log_msg &msg,
+                  async_overflow_policy overflow_policy);
+    std::future<void> post_flush(async_logger_ptr &&worker_ptr,
+                                 async_overflow_policy overflow_policy);
     size_t overrun_counter();
+    void reset_overrun_counter();
+    size_t discard_counter();
+    void reset_discard_counter();
     size_t queue_size();
 
 private:
@@ -117,5 +124,5 @@ private:
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "thread_pool-inl.h"
+    #include "thread_pool-inl.h"
 #endif

vendor/spdlog/details/udp_client-windows.h

@@ -9,47 +9,44 @@
 #include <spdlog/common.h>
 #include <spdlog/details/os.h>
 #include <spdlog/details/windows_include.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string>
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string>
 
-#pragma comment(lib, "Ws2_32.lib")
+#if defined(_MSC_VER)
-#pragma comment(lib, "Mswsock.lib")
+    #pragma comment(lib, "Ws2_32.lib")
-#pragma comment(lib, "AdvApi32.lib")
+    #pragma comment(lib, "Mswsock.lib")
+    #pragma comment(lib, "AdvApi32.lib")
+#endif
 
 namespace spdlog {
 namespace details {
-class udp_client
+class udp_client {
-{
     static constexpr int TX_BUFFER_SIZE = 1024 * 10;
     SOCKET socket_ = INVALID_SOCKET;
-    sockaddr_in addr_ = {0};
+    sockaddr_in addr_ = {};
 
-    static void init_winsock_()
+    static void init_winsock_() {
-    {
         WSADATA wsaData;
         auto rv = ::WSAStartup(MAKEWORD(2, 2), &wsaData);
-        if (rv != 0)
+        if (rv != 0) {
-        {
             throw_winsock_error_("WSAStartup failed", ::WSAGetLastError());
         }
     }
 
-    static void throw_winsock_error_(const std::string &msg, int last_error)
+    static void throw_winsock_error_(const std::string &msg, int last_error) {
-    {
         char buf[512];
-        ::FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, last_error,
+        ::FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
-            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, (sizeof(buf) / sizeof(char)), NULL);
+                         last_error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf,
+                         (sizeof(buf) / sizeof(char)), NULL);
 
         throw_spdlog_ex(fmt_lib::format("udp_sink - {}: {}", msg, buf));
     }
 
-    void cleanup_()
+    void cleanup_() {
-    {
+        if (socket_ != INVALID_SOCKET) {
-        if (socket_ != INVALID_SOCKET)
-        {
             ::closesocket(socket_);
         }
         socket_ = INVALID_SOCKET;
@@ -57,52 +54,42 @@ class udp_client
     }
 
 public:
-    udp_client(const std::string &host, uint16_t port)
+    udp_client(const std::string &host, uint16_t port) {
-    {
         init_winsock_();
 
         addr_.sin_family = PF_INET;
         addr_.sin_port = htons(port);
         addr_.sin_addr.s_addr = INADDR_ANY;
-        if (InetPtonA(PF_INET, host.c_str(), &addr_.sin_addr.s_addr) != 1)
+        if (InetPtonA(PF_INET, host.c_str(), &addr_.sin_addr.s_addr) != 1) {
-        {
             int last_error = ::WSAGetLastError();
             ::WSACleanup();
             throw_winsock_error_("error: Invalid address!", last_error);
         }
 
         socket_ = ::socket(PF_INET, SOCK_DGRAM, 0);
-        if (socket_ == INVALID_SOCKET)
+        if (socket_ == INVALID_SOCKET) {
-        {
             int last_error = ::WSAGetLastError();
             ::WSACleanup();
             throw_winsock_error_("error: Create Socket failed", last_error);
         }
 
         int option_value = TX_BUFFER_SIZE;
-        if (::setsockopt(socket_, SOL_SOCKET, SO_SNDBUF, reinterpret_cast<const char *>(&option_value), sizeof(option_value)) < 0)
+        if (::setsockopt(socket_, SOL_SOCKET, SO_SNDBUF,
-        {
+                         reinterpret_cast<const char *>(&option_value), sizeof(option_value)) < 0) {
             int last_error = ::WSAGetLastError();
             cleanup_();
             throw_winsock_error_("error: setsockopt(SO_SNDBUF) Failed!", last_error);
         }
     }
 
-    ~udp_client()
+    ~udp_client() { cleanup_(); }
-    {
-        cleanup_();
-    }
 
-    SOCKET fd() const
+    SOCKET fd() const { return socket_; }
-    {
-        return socket_;
-    }
 
-    void send(const char *data, size_t n_bytes)
+    void send(const char *data, size_t n_bytes) {
-    {
         socklen_t tolen = sizeof(struct sockaddr);
-        if (::sendto(socket_, data, static_cast<int>(n_bytes), 0, (struct sockaddr *)&addr_, tolen) == -1)
+        if (::sendto(socket_, data, static_cast<int>(n_bytes), 0, (struct sockaddr *)&addr_,
-        {
+                     tolen) == -1) {
             throw_spdlog_ex("sendto(2) failed", errno);
         }
     }

vendor/spdlog/details/udp_client.h

@@ -7,51 +7,46 @@
 // Will throw on construction if the socket creation failed.
 
 #ifdef _WIN32
-#    error "include udp_client-windows.h instead"
+    #error "include udp_client-windows.h instead"
 #endif
 
+#include <arpa/inet.h>
+#include <cstring>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/udp.h>
 #include <spdlog/common.h>
 #include <spdlog/details/os.h>
-
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <unistd.h>
-#include <netdb.h>
-#include <netinet/udp.h>
 
 #include <string>
 
 namespace spdlog {
 namespace details {
 
-class udp_client
+class udp_client {
-{
     static constexpr int TX_BUFFER_SIZE = 1024 * 10;
     int socket_ = -1;
     struct sockaddr_in sockAddr_;
 
-    void cleanup_()
+    void cleanup_() {
-    {
+        if (socket_ != -1) {
-        if (socket_ != -1)
-        {
             ::close(socket_);
             socket_ = -1;
         }
     }
 
 public:
-    udp_client(const std::string &host, uint16_t port)
+    udp_client(const std::string &host, uint16_t port) {
-    {
         socket_ = ::socket(PF_INET, SOCK_DGRAM, 0);
-        if (socket_ < 0)
+        if (socket_ < 0) {
-        {
             throw_spdlog_ex("error: Create Socket Failed!");
         }
 
         int option_value = TX_BUFFER_SIZE;
-        if (::setsockopt(socket_, SOL_SOCKET, SO_SNDBUF, reinterpret_cast<const char *>(&option_value), sizeof(option_value)) < 0)
+        if (::setsockopt(socket_, SOL_SOCKET, SO_SNDBUF,
-        {
+                         reinterpret_cast<const char *>(&option_value), sizeof(option_value)) < 0) {
             cleanup_();
             throw_spdlog_ex("error: setsockopt(SO_SNDBUF) Failed!");
         }
@@ -59,8 +54,7 @@ public:
         sockAddr_.sin_family = AF_INET;
         sockAddr_.sin_port = htons(port);
 
-        if (::inet_aton(host.c_str(), &sockAddr_.sin_addr) == 0)
+        if (::inet_aton(host.c_str(), &sockAddr_.sin_addr) == 0) {
-        {
             cleanup_();
             throw_spdlog_ex("error: Invalid address!");
         }
@@ -68,24 +62,17 @@ public:
         ::memset(sockAddr_.sin_zero, 0x00, sizeof(sockAddr_.sin_zero));
     }
 
-    ~udp_client()
+    ~udp_client() { cleanup_(); }
-    {
-        cleanup_();
-    }
 
-    int fd() const
+    int fd() const { return socket_; }
-    {
-        return socket_;
-    }
 
     // Send exactly n_bytes of the given data.
     // On error close the connection and throw.
-    void send(const char *data, size_t n_bytes)
+    void send(const char *data, size_t n_bytes) {
-    {
         ssize_t toslen = 0;
         socklen_t tolen = sizeof(struct sockaddr);
-        if ((toslen = ::sendto(socket_, data, n_bytes, 0, (struct sockaddr *)&sockAddr_, tolen)) == -1)
+        if ((toslen = ::sendto(socket_, data, n_bytes, 0, (struct sockaddr *)&sockAddr_, tolen)) ==
-        {
+            -1) {
             throw_spdlog_ex("sendto(2) failed", errno);
         }
     }

vendor/spdlog/details/windows_include.h

@@ -1,11 +1,11 @@
 #pragma once
 
 #ifndef NOMINMAX
-#    define NOMINMAX // prevent windows redefining min/max
+    #define NOMINMAX  // prevent windows redefining min/max
 #endif
 
 #ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
+    #define WIN32_LEAN_AND_MEAN
 #endif
 
 #include <windows.h>

vendor/spdlog/fmt/bin_to_hex.h

@@ -8,12 +8,14 @@
 #include <cctype>
 #include <spdlog/common.h>
 
-#if defined(__has_include) && __has_include(<version>)
+#if defined(__has_include)
-#    include <version>
+    #if __has_include(<version>)
+        #include <version>
+    #endif
 #endif
 
 #if __cpp_lib_span >= 202002L
-#    include <span>
+    #include <span>
 #endif
 
 //
@@ -37,29 +39,18 @@
 namespace spdlog {
 namespace details {
 
-template<typename It>
+template <typename It>
-class dump_info
+class dump_info {
-{
 public:
     dump_info(It range_begin, It range_end, size_t size_per_line)
-        : begin_(range_begin)
+        : begin_(range_begin),
-        , end_(range_end)
+          end_(range_end),
-        , size_per_line_(size_per_line)
+          size_per_line_(size_per_line) {}
-    {}
 
     // do not use begin() and end() to avoid collision with fmt/ranges
-    It get_begin() const
+    It get_begin() const { return begin_; }
-    {
+    It get_end() const { return end_; }
-        return begin_;
+    size_t size_per_line() const { return size_per_line_; }
-    }
-    It get_end() const
-    {
-        return end_;
-    }
-    size_t size_per_line() const
-    {
-        return size_per_line_;
-    }
 
 private:
     It begin_, end_;
@@ -68,22 +59,23 @@ private:
 }  // namespace details
 
 // create a dump_info that wraps the given container
-template<typename Container>
+template <typename Container>
-inline details::dump_info<typename Container::const_iterator> to_hex(const Container &container, size_t size_per_line = 32)
+inline details::dump_info<typename Container::const_iterator> to_hex(const Container &container,
-{
+                                                                     size_t size_per_line = 32) {
-    static_assert(sizeof(typename Container::value_type) == 1, "sizeof(Container::value_type) != 1");
+    static_assert(sizeof(typename Container::value_type) == 1,
+                  "sizeof(Container::value_type) != 1");
     using Iter = typename Container::const_iterator;
     return details::dump_info<Iter>(std::begin(container), std::end(container), size_per_line);
 }
 
 #if __cpp_lib_span >= 202002L
 
-template<typename Value, size_t Extent>
+template <typename Value, size_t Extent>
 inline details::dump_info<typename std::span<Value, Extent>::iterator> to_hex(
-    const std::span<Value, Extent> &container, size_t size_per_line = 32)
+    const std::span<Value, Extent> &container, size_t size_per_line = 32) {
-{
     using Container = std::span<Value, Extent>;
-    static_assert(sizeof(typename Container::value_type) == 1, "sizeof(Container::value_type) != 1");
+    static_assert(sizeof(typename Container::value_type) == 1,
+                  "sizeof(Container::value_type) != 1");
     using Iter = typename Container::iterator;
     return details::dump_info<Iter>(std::begin(container), std::end(container), size_per_line);
 }
@@ -91,9 +83,10 @@ inline details::dump_info<typename std::span<Value, Extent>::iterator> to_hex(
 #endif
 
 // create dump_info from ranges
-template<typename It>
+template <typename It>
-inline details::dump_info<It> to_hex(const It range_begin, const It range_end, size_t size_per_line = 32)
+inline details::dump_info<It> to_hex(const It range_begin,
-{
+                                     const It range_end,
+                                     size_t size_per_line = 32) {
     return details::dump_info<It>(range_begin, range_end, size_per_line);
 }
 
@@ -107,9 +100,8 @@ namespace
 #endif
 {
 
-template<typename T>
+template <typename T>
-struct formatter<spdlog::details::dump_info<T>, char>
+struct formatter<spdlog::details::dump_info<T>, char> {
-{
     const char delimiter = ' ';
     bool put_newlines = true;
     bool put_delimiters = true;
@@ -118,14 +110,11 @@ struct formatter<spdlog::details::dump_info<T>, char>
     bool show_ascii = false;
 
     // parse the format string flags
-    template<typename ParseContext>
+    template <typename ParseContext>
-    SPDLOG_CONSTEXPR_FUNC auto parse(ParseContext &ctx) -> decltype(ctx.begin())
+    SPDLOG_CONSTEXPR_FUNC auto parse(ParseContext &ctx) -> decltype(ctx.begin()) {
-    {
         auto it = ctx.begin();
-        while (it != ctx.end() && *it != '}')
+        while (it != ctx.end() && *it != '}') {
-        {
+            switch (*it) {
-            switch (*it)
-            {
                 case 'X':
                     use_uppercase = true;
                     break;
@@ -140,8 +129,7 @@ struct formatter<spdlog::details::dump_info<T>, char>
                     show_ascii = false;
                     break;
                 case 'a':
-                if (put_newlines)
+                    if (put_newlines) {
-                {
                         show_ascii = true;
                     }
                     break;
@@ -153,9 +141,9 @@ struct formatter<spdlog::details::dump_info<T>, char>
     }
 
     // format the given bytes range as hex
-    template<typename FormatContext, typename Container>
+    template <typename FormatContext, typename Container>
-    auto format(const spdlog::details::dump_info<Container> &the_range, FormatContext &ctx) -> decltype(ctx.out())
+    auto format(const spdlog::details::dump_info<Container> &the_range, FormatContext &ctx) const
-    {
+        -> decltype(ctx.out()) {
         SPDLOG_CONSTEXPR const char *hex_upper = "0123456789ABCDEF";
         SPDLOG_CONSTEXPR const char *hex_lower = "0123456789abcdef";
         const char *hex_chars = use_uppercase ? hex_upper : hex_lower;
@@ -168,18 +156,15 @@ struct formatter<spdlog::details::dump_info<T>, char>
 
         int size_per_line = static_cast<int>(the_range.size_per_line());
         auto start_of_line = the_range.get_begin();
-        for (auto i = the_range.get_begin(); i != the_range.get_end(); i++)
+        for (auto i = the_range.get_begin(); i != the_range.get_end(); i++) {
-        {
             auto ch = static_cast<unsigned char>(*i);
 
-            if (put_newlines && (i == the_range.get_begin() || i - start_of_line >= size_per_line))
+            if (put_newlines &&
-            {
+                (i == the_range.get_begin() || i - start_of_line >= size_per_line)) {
-                if (show_ascii && i != the_range.get_begin())
+                if (show_ascii && i != the_range.get_begin()) {
-                {
                     *inserter++ = delimiter;
                     *inserter++ = delimiter;
-                    for (auto j = start_of_line; j < i; j++)
+                    for (auto j = start_of_line; j < i; j++) {
-                    {
                         auto pc = static_cast<unsigned char>(*j);
                         *inserter++ = std::isprint(pc) ? static_cast<char>(*j) : '.';
                     }
@@ -194,8 +179,7 @@ struct formatter<spdlog::details::dump_info<T>, char>
                 continue;
             }
 
-            if (put_delimiters)
+            if (put_delimiters && i != the_range.get_begin()) {
-            {
                 *inserter++ = delimiter;
             }
 
@@ -204,23 +188,19 @@ struct formatter<spdlog::details::dump_info<T>, char>
         }
         if (show_ascii)  // add ascii to last line
         {
-            if (the_range.get_end() - the_range.get_begin() > size_per_line)
+            if (the_range.get_end() - the_range.get_begin() > size_per_line) {
-            {
                 auto blank_num = size_per_line - (the_range.get_end() - start_of_line);
-                while (blank_num-- > 0)
+                while (blank_num-- > 0) {
-                {
                     *inserter++ = delimiter;
                     *inserter++ = delimiter;
-                    if (put_delimiters)
+                    if (put_delimiters) {
-                    {
                         *inserter++ = delimiter;
                     }
                 }
             }
             *inserter++ = delimiter;
             *inserter++ = delimiter;
-            for (auto j = start_of_line; j != the_range.get_end(); j++)
+            for (auto j = start_of_line; j != the_range.get_end(); j++) {
-            {
                 auto pc = static_cast<unsigned char>(*j);
                 *inserter++ = std::isprint(pc) ? static_cast<char>(*j) : '.';
             }
@@ -229,17 +209,15 @@ struct formatter<spdlog::details::dump_info<T>, char>
     }
 
     // put newline(and position header)
-    template<typename It>
+    template <typename It>
-    void put_newline(It inserter, std::size_t pos)
+    void put_newline(It inserter, std::size_t pos) const {
-    {
 #ifdef _WIN32
         *inserter++ = '\r';
 #endif
         *inserter++ = '\n';
 
-        if (put_positions)
+        if (put_positions) {
-        {
+            spdlog::fmt_lib::format_to(inserter, SPDLOG_FMT_STRING("{:04X}: "), pos);
-            spdlog::fmt_lib::format_to(inserter, "{:04X}: ", pos);
         }
     }
 };

vendor/spdlog/fmt/bundled/args.h

@@ -1,4 +1,4 @@
-// Formatting library for C++ - dynamic format arguments
+// Formatting library for C++ - dynamic argument lists
 //
 // Copyright (c) 2012 - present, Victor Zverovich
 // All rights reserved.
@@ -22,8 +22,9 @@ template <typename T> struct is_reference_wrapper : std::false_type {};
 template <typename T>
 struct is_reference_wrapper<std::reference_wrapper<T>> : std::true_type {};
 
-template <typename T> const T& unwrap(const T& v) { return v; }
+template <typename T> auto unwrap(const T& v) -> const T& { return v; }
-template <typename T> const T& unwrap(const std::reference_wrapper<T>& v) {
+template <typename T>
+auto unwrap(const std::reference_wrapper<T>& v) -> const T& {
   return static_cast<const T&>(v);
 }
 
@@ -50,7 +51,7 @@ class dynamic_arg_list {
   std::unique_ptr<node<>> head_;
 
  public:
-  template <typename T, typename Arg> const T& push(const Arg& arg) {
+  template <typename T, typename Arg> auto push(const Arg& arg) -> const T& {
     auto new_node = std::unique_ptr<typed_node<T>>(new typed_node<T>(arg));
     auto& value = new_node->value;
     new_node->next = std::move(head_);
@@ -95,8 +96,8 @@ class dynamic_format_arg_store
   };
 
   template <typename T>
-  using stored_type = conditional_t<detail::is_string<T>::value &&
+  using stored_type = conditional_t<
-                                        !has_formatter<T, Context>::value &&
+      std::is_convertible<T, std::basic_string<char_type>>::value &&
           !detail::is_reference_wrapper<T>::value,
       std::basic_string<char_type>, T>;
 
@@ -110,14 +111,14 @@ class dynamic_format_arg_store
 
   friend class basic_format_args<Context>;
 
-  unsigned long long get_types() const {
+  auto get_types() const -> unsigned long long {
     return detail::is_unpacked_bit | data_.size() |
            (named_info_.empty()
                 ? 0ULL
                 : static_cast<unsigned long long>(detail::has_named_args_bit));
   }
 
-  const basic_format_arg<Context>* data() const {
+  auto data() const -> const basic_format_arg<Context>* {
     return named_info_.empty() ? data_.data() : data_.data() + 1;
   }
 

vendor/spdlog/fmt/bundled/color.h

@@ -10,15 +10,8 @@
 
 #include "format.h"
 
-// __declspec(deprecated) is broken in some MSVC versions.
-#if FMT_MSC_VER
-#  define FMT_DEPRECATED_NONMSVC
-#else
-#  define FMT_DEPRECATED_NONMSVC FMT_DEPRECATED
-#endif
-
 FMT_BEGIN_NAMESPACE
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
 enum class color : uint32_t {
   alice_blue = 0xF0F8FF,               // rgb(240,248,255)
@@ -210,21 +203,20 @@ struct rgb {
   uint8_t b;
 };
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 // color is a struct of either a rgb color or a terminal color.
 struct color_type {
-  FMT_CONSTEXPR color_type() FMT_NOEXCEPT : is_rgb(), value{} {}
+  FMT_CONSTEXPR color_type() noexcept : is_rgb(), value{} {}
-  FMT_CONSTEXPR color_type(color rgb_color) FMT_NOEXCEPT : is_rgb(true),
+  FMT_CONSTEXPR color_type(color rgb_color) noexcept : is_rgb(true), value{} {
-                                                           value{} {
     value.rgb_color = static_cast<uint32_t>(rgb_color);
   }
-  FMT_CONSTEXPR color_type(rgb rgb_color) FMT_NOEXCEPT : is_rgb(true), value{} {
+  FMT_CONSTEXPR color_type(rgb rgb_color) noexcept : is_rgb(true), value{} {
     value.rgb_color = (static_cast<uint32_t>(rgb_color.r) << 16) |
                       (static_cast<uint32_t>(rgb_color.g) << 8) | rgb_color.b;
   }
-  FMT_CONSTEXPR color_type(terminal_color term_color) FMT_NOEXCEPT : is_rgb(),
+  FMT_CONSTEXPR color_type(terminal_color term_color) noexcept
-                                                                     value{} {
+      : is_rgb(), value{} {
     value.term_color = static_cast<uint8_t>(term_color);
   }
   bool is_rgb;
@@ -233,18 +225,15 @@ struct color_type {
     uint32_t rgb_color;
   } value;
 };
-
+}  // namespace detail
-FMT_END_DETAIL_NAMESPACE
 
 /** A text style consisting of foreground and background colors and emphasis. */
 class text_style {
  public:
-  FMT_CONSTEXPR text_style(emphasis em = emphasis()) FMT_NOEXCEPT
+  FMT_CONSTEXPR text_style(emphasis em = emphasis()) noexcept
-      : set_foreground_color(),
+      : set_foreground_color(), set_background_color(), ems(em) {}
-        set_background_color(),
-        ems(em) {}
 
-  FMT_CONSTEXPR text_style& operator|=(const text_style& rhs) {
+  FMT_CONSTEXPR auto operator|=(const text_style& rhs) -> text_style& {
     if (!set_foreground_color) {
       set_foreground_color = rhs.set_foreground_color;
       foreground_color = rhs.foreground_color;
@@ -268,49 +257,37 @@ class text_style {
     return *this;
   }
 
-  friend FMT_CONSTEXPR text_style operator|(text_style lhs,
+  friend FMT_CONSTEXPR auto operator|(text_style lhs, const text_style& rhs)
-                                            const text_style& rhs) {
+      -> text_style {
     return lhs |= rhs;
   }
 
-  FMT_DEPRECATED_NONMSVC FMT_CONSTEXPR text_style& operator&=(
+  FMT_CONSTEXPR auto has_foreground() const noexcept -> bool {
-      const text_style& rhs) {
-    return and_assign(rhs);
-  }
-
-  FMT_DEPRECATED_NONMSVC friend FMT_CONSTEXPR text_style
-  operator&(text_style lhs, const text_style& rhs) {
-    return lhs.and_assign(rhs);
-  }
-
-  FMT_CONSTEXPR bool has_foreground() const FMT_NOEXCEPT {
     return set_foreground_color;
   }
-  FMT_CONSTEXPR bool has_background() const FMT_NOEXCEPT {
+  FMT_CONSTEXPR auto has_background() const noexcept -> bool {
     return set_background_color;
   }
-  FMT_CONSTEXPR bool has_emphasis() const FMT_NOEXCEPT {
+  FMT_CONSTEXPR auto has_emphasis() const noexcept -> bool {
     return static_cast<uint8_t>(ems) != 0;
   }
-  FMT_CONSTEXPR detail::color_type get_foreground() const FMT_NOEXCEPT {
+  FMT_CONSTEXPR auto get_foreground() const noexcept -> detail::color_type {
     FMT_ASSERT(has_foreground(), "no foreground specified for this style");
     return foreground_color;
   }
-  FMT_CONSTEXPR detail::color_type get_background() const FMT_NOEXCEPT {
+  FMT_CONSTEXPR auto get_background() const noexcept -> detail::color_type {
     FMT_ASSERT(has_background(), "no background specified for this style");
     return background_color;
   }
-  FMT_CONSTEXPR emphasis get_emphasis() const FMT_NOEXCEPT {
+  FMT_CONSTEXPR auto get_emphasis() const noexcept -> emphasis {
     FMT_ASSERT(has_emphasis(), "no emphasis specified for this style");
     return ems;
   }
 
  private:
   FMT_CONSTEXPR text_style(bool is_foreground,
-                           detail::color_type text_color) FMT_NOEXCEPT
+                           detail::color_type text_color) noexcept
-      : set_foreground_color(),
+      : set_foreground_color(), set_background_color(), ems() {
-        set_background_color(),
-        ems() {
     if (is_foreground) {
       foreground_color = text_color;
       set_foreground_color = true;
@@ -320,36 +297,11 @@ class text_style {
     }
   }
 
-  // DEPRECATED!
+  friend FMT_CONSTEXPR auto fg(detail::color_type foreground) noexcept
-  FMT_CONSTEXPR text_style& and_assign(const text_style& rhs) {
+      -> text_style;
-    if (!set_foreground_color) {
-      set_foreground_color = rhs.set_foreground_color;
-      foreground_color = rhs.foreground_color;
-    } else if (rhs.set_foreground_color) {
-      if (!foreground_color.is_rgb || !rhs.foreground_color.is_rgb)
-        FMT_THROW(format_error("can't AND a terminal color"));
-      foreground_color.value.rgb_color &= rhs.foreground_color.value.rgb_color;
-    }
 
-    if (!set_background_color) {
+  friend FMT_CONSTEXPR auto bg(detail::color_type background) noexcept
-      set_background_color = rhs.set_background_color;
+      -> text_style;
-      background_color = rhs.background_color;
-    } else if (rhs.set_background_color) {
-      if (!background_color.is_rgb || !rhs.background_color.is_rgb)
-        FMT_THROW(format_error("can't AND a terminal color"));
-      background_color.value.rgb_color &= rhs.background_color.value.rgb_color;
-    }
-
-    ems = static_cast<emphasis>(static_cast<uint8_t>(ems) &
-                                static_cast<uint8_t>(rhs.ems));
-    return *this;
-  }
-
-  friend FMT_CONSTEXPR_DECL text_style fg(detail::color_type foreground)
-      FMT_NOEXCEPT;
-
-  friend FMT_CONSTEXPR_DECL text_style bg(detail::color_type background)
-      FMT_NOEXCEPT;
 
   detail::color_type foreground_color;
   detail::color_type background_color;
@@ -359,25 +311,27 @@ class text_style {
 };
 
 /** Creates a text style from the foreground (text) color. */
-FMT_CONSTEXPR inline text_style fg(detail::color_type foreground) FMT_NOEXCEPT {
+FMT_CONSTEXPR inline auto fg(detail::color_type foreground) noexcept
+    -> text_style {
   return text_style(true, foreground);
 }
 
 /** Creates a text style from the background color. */
-FMT_CONSTEXPR inline text_style bg(detail::color_type background) FMT_NOEXCEPT {
+FMT_CONSTEXPR inline auto bg(detail::color_type background) noexcept
+    -> text_style {
   return text_style(false, background);
 }
 
-FMT_CONSTEXPR inline text_style operator|(emphasis lhs,
+FMT_CONSTEXPR inline auto operator|(emphasis lhs, emphasis rhs) noexcept
-                                          emphasis rhs) FMT_NOEXCEPT {
+    -> text_style {
   return text_style(lhs) | rhs;
 }
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 template <typename Char> struct ansi_color_escape {
   FMT_CONSTEXPR ansi_color_escape(detail::color_type text_color,
-                                  const char* esc) FMT_NOEXCEPT {
+                                  const char* esc) noexcept {
     // If we have a terminal color, we need to output another escape code
     // sequence.
     if (!text_color.is_rgb) {
@@ -412,7 +366,7 @@ template <typename Char> struct ansi_color_escape {
     to_esc(color.b, buffer + 15, 'm');
     buffer[19] = static_cast<Char>(0);
   }
-  FMT_CONSTEXPR ansi_color_escape(emphasis em) FMT_NOEXCEPT {
+  FMT_CONSTEXPR ansi_color_escape(emphasis em) noexcept {
     uint8_t em_codes[num_emphases] = {};
     if (has_emphasis(em, emphasis::bold)) em_codes[0] = 1;
     if (has_emphasis(em, emphasis::faint)) em_codes[1] = 2;
@@ -433,10 +387,10 @@ template <typename Char> struct ansi_color_escape {
     }
     buffer[index++] = static_cast<Char>(0);
   }
-  FMT_CONSTEXPR operator const Char*() const FMT_NOEXCEPT { return buffer; }
+  FMT_CONSTEXPR operator const Char*() const noexcept { return buffer; }
 
-  FMT_CONSTEXPR const Char* begin() const FMT_NOEXCEPT { return buffer; }
+  FMT_CONSTEXPR auto begin() const noexcept -> const Char* { return buffer; }
-  FMT_CONSTEXPR_CHAR_TRAITS const Char* end() const FMT_NOEXCEPT {
+  FMT_CONSTEXPR_CHAR_TRAITS auto end() const noexcept -> const Char* {
     return buffer + std::char_traits<Char>::length(buffer);
   }
 
@@ -445,59 +399,47 @@ template <typename Char> struct ansi_color_escape {
   Char buffer[7u + 3u * num_emphases + 1u];
 
   static FMT_CONSTEXPR void to_esc(uint8_t c, Char* out,
-                                   char delimiter) FMT_NOEXCEPT {
+                                   char delimiter) noexcept {
     out[0] = static_cast<Char>('0' + c / 100);
     out[1] = static_cast<Char>('0' + c / 10 % 10);
     out[2] = static_cast<Char>('0' + c % 10);
     out[3] = static_cast<Char>(delimiter);
   }
-  static FMT_CONSTEXPR bool has_emphasis(emphasis em,
+  static FMT_CONSTEXPR auto has_emphasis(emphasis em, emphasis mask) noexcept
-                                         emphasis mask) FMT_NOEXCEPT {
+      -> bool {
     return static_cast<uint8_t>(em) & static_cast<uint8_t>(mask);
   }
 };
 
 template <typename Char>
-FMT_CONSTEXPR ansi_color_escape<Char> make_foreground_color(
+FMT_CONSTEXPR auto make_foreground_color(detail::color_type foreground) noexcept
-    detail::color_type foreground) FMT_NOEXCEPT {
+    -> ansi_color_escape<Char> {
   return ansi_color_escape<Char>(foreground, "\x1b[38;2;");
 }
 
 template <typename Char>
-FMT_CONSTEXPR ansi_color_escape<Char> make_background_color(
+FMT_CONSTEXPR auto make_background_color(detail::color_type background) noexcept
-    detail::color_type background) FMT_NOEXCEPT {
+    -> ansi_color_escape<Char> {
   return ansi_color_escape<Char>(background, "\x1b[48;2;");
 }
 
 template <typename Char>
-FMT_CONSTEXPR ansi_color_escape<Char> make_emphasis(emphasis em) FMT_NOEXCEPT {
+FMT_CONSTEXPR auto make_emphasis(emphasis em) noexcept
+    -> ansi_color_escape<Char> {
   return ansi_color_escape<Char>(em);
 }
 
-template <typename Char>
+template <typename Char> inline void reset_color(buffer<Char>& buffer) {
-inline void fputs(const Char* chars, FILE* stream) FMT_NOEXCEPT {
-  std::fputs(chars, stream);
-}
-
-template <>
-inline void fputs<wchar_t>(const wchar_t* chars, FILE* stream) FMT_NOEXCEPT {
-  std::fputws(chars, stream);
-}
-
-template <typename Char> inline void reset_color(FILE* stream) FMT_NOEXCEPT {
-  fputs("\x1b[0m", stream);
-}
-
-template <> inline void reset_color<wchar_t>(FILE* stream) FMT_NOEXCEPT {
-  fputs(L"\x1b[0m", stream);
-}
-
-template <typename Char>
-inline void reset_color(buffer<Char>& buffer) FMT_NOEXCEPT {
   auto reset_color = string_view("\x1b[0m");
   buffer.append(reset_color.begin(), reset_color.end());
 }
 
+template <typename T> struct styled_arg : detail::view {
+  const T& value;
+  text_style style;
+  styled_arg(const T& v, text_style s) : value(v), style(s) {}
+};
+
 template <typename Char>
 void vformat_to(buffer<Char>& buf, const text_style& ts,
                 basic_string_view<Char> format_str,
@@ -522,15 +464,21 @@ void vformat_to(buffer<Char>& buf, const text_style& ts,
   if (has_style) detail::reset_color<Char>(buf);
 }
 
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
 
-template <typename S, typename Char = char_t<S>>
+inline void vprint(std::FILE* f, const text_style& ts, string_view fmt,
-void vprint(std::FILE* f, const text_style& ts, const S& format,
+                   format_args args) {
-            basic_format_args<buffer_context<type_identity_t<Char>>> args) {
+  // Legacy wide streams are not supported.
-  basic_memory_buffer<Char> buf;
+  auto buf = memory_buffer();
-  detail::vformat_to(buf, ts, to_string_view(format), args);
+  detail::vformat_to(buf, ts, fmt, args);
-  buf.push_back(Char(0));
+  if (detail::is_utf8()) {
-  detail::fputs(buf.data(), f);
+    detail::print(f, string_view(buf.begin(), buf.size()));
+    return;
+  }
+  buf.push_back('\0');
+  int result = std::fputs(buf.data(), f);
+  if (result < 0)
+    FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
 }
 
 /**
@@ -549,7 +497,7 @@ template <typename S, typename... Args,
 void print(std::FILE* f, const text_style& ts, const S& format_str,
            const Args&... args) {
   vprint(f, ts, format_str,
-         fmt::make_args_checked<Args...>(format_str, args...));
+         fmt::make_format_args<buffer_context<char_t<S>>>(args...));
 }
 
 /**
@@ -570,11 +518,12 @@ void print(const text_style& ts, const S& format_str, const Args&... args) {
 }
 
 template <typename S, typename Char = char_t<S>>
-inline std::basic_string<Char> vformat(
+inline auto vformat(
     const text_style& ts, const S& format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args) {
+    basic_format_args<buffer_context<type_identity_t<Char>>> args)
+    -> std::basic_string<Char> {
   basic_memory_buffer<Char> buf;
-  detail::vformat_to(buf, ts, to_string_view(format_str), args);
+  detail::vformat_to(buf, ts, detail::to_string_view(format_str), args);
   return fmt::to_string(buf);
 }
 
@@ -591,10 +540,10 @@ inline std::basic_string<Char> vformat(
   \endrst
 */
 template <typename S, typename... Args, typename Char = char_t<S>>
-inline std::basic_string<Char> format(const text_style& ts, const S& format_str,
+inline auto format(const text_style& ts, const S& format_str,
-                                      const Args&... args) {
+                   const Args&... args) -> std::basic_string<Char> {
-  return fmt::vformat(ts, to_string_view(format_str),
+  return fmt::vformat(ts, detail::to_string_view(format_str),
-                      fmt::make_args_checked<Args...>(format_str, args...));
+                      fmt::make_format_args<buffer_context<Char>>(args...));
 }
 
 /**
@@ -602,12 +551,13 @@ inline std::basic_string<Char> format(const text_style& ts, const S& format_str,
  */
 template <typename OutputIt, typename Char,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value)>
-OutputIt vformat_to(
+auto vformat_to(OutputIt out, const text_style& ts,
-    OutputIt out, const text_style& ts, basic_string_view<Char> format_str,
+                basic_string_view<Char> format_str,
-    basic_format_args<buffer_context<type_identity_t<Char>>> args) {
+                basic_format_args<buffer_context<type_identity_t<Char>>> args)
+    -> OutputIt {
   auto&& buf = detail::get_buffer<Char>(out);
   detail::vformat_to(buf, ts, format_str, args);
-  return detail::get_iterator(buf);
+  return detail::get_iterator(buf, out);
 }
 
 /**
@@ -622,17 +572,72 @@ OutputIt vformat_to(
                    fmt::emphasis::bold | fg(fmt::color::red), "{}", 42);
   \endrst
 */
-template <typename OutputIt, typename S, typename... Args,
+template <
-          bool enable = detail::is_output_iterator<OutputIt, char_t<S>>::value&&
+    typename OutputIt, typename S, typename... Args,
+    bool enable = detail::is_output_iterator<OutputIt, char_t<S>>::value &&
                   detail::is_string<S>::value>
 inline auto format_to(OutputIt out, const text_style& ts, const S& format_str,
                       Args&&... args) ->
     typename std::enable_if<enable, OutputIt>::type {
-  return vformat_to(out, ts, to_string_view(format_str),
+  return vformat_to(out, ts, detail::to_string_view(format_str),
-                    fmt::make_args_checked<Args...>(format_str, args...));
+                    fmt::make_format_args<buffer_context<char_t<S>>>(args...));
 }
 
-FMT_MODULE_EXPORT_END
+template <typename T, typename Char>
+struct formatter<detail::styled_arg<T>, Char> : formatter<T, Char> {
+  template <typename FormatContext>
+  auto format(const detail::styled_arg<T>& arg, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    const auto& ts = arg.style;
+    const auto& value = arg.value;
+    auto out = ctx.out();
+
+    bool has_style = false;
+    if (ts.has_emphasis()) {
+      has_style = true;
+      auto emphasis = detail::make_emphasis<Char>(ts.get_emphasis());
+      out = std::copy(emphasis.begin(), emphasis.end(), out);
+    }
+    if (ts.has_foreground()) {
+      has_style = true;
+      auto foreground =
+          detail::make_foreground_color<Char>(ts.get_foreground());
+      out = std::copy(foreground.begin(), foreground.end(), out);
+    }
+    if (ts.has_background()) {
+      has_style = true;
+      auto background =
+          detail::make_background_color<Char>(ts.get_background());
+      out = std::copy(background.begin(), background.end(), out);
+    }
+    out = formatter<T, Char>::format(value, ctx);
+    if (has_style) {
+      auto reset_color = string_view("\x1b[0m");
+      out = std::copy(reset_color.begin(), reset_color.end(), out);
+    }
+    return out;
+  }
+};
+
+/**
+  \rst
+  Returns an argument that will be formatted using ANSI escape sequences,
+  to be used in a formatting function.
+
+  **Example**::
+
+    fmt::print("Elapsed time: {0:.2f} seconds",
+               fmt::styled(1.23, fmt::fg(fmt::color::green) |
+                                 fmt::bg(fmt::color::blue)));
+  \endrst
+ */
+template <typename T>
+FMT_CONSTEXPR auto styled(const T& value, text_style ts)
+    -> detail::styled_arg<remove_cvref_t<T>> {
+  return detail::styled_arg<remove_cvref_t<T>>{value, ts};
+}
+
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_COLOR_H_

vendor/spdlog/fmt/bundled/compile.h

@@ -13,130 +13,12 @@
 FMT_BEGIN_NAMESPACE
 namespace detail {
 
-// An output iterator that counts the number of objects written to it and
-// discards them.
-class counting_iterator {
- private:
-  size_t count_;
-
- public:
-  using iterator_category = std::output_iterator_tag;
-  using difference_type = std::ptrdiff_t;
-  using pointer = void;
-  using reference = void;
-  using _Unchecked_type = counting_iterator;  // Mark iterator as checked.
-
-  struct value_type {
-    template <typename T> void operator=(const T&) {}
-  };
-
-  counting_iterator() : count_(0) {}
-
-  size_t count() const { return count_; }
-
-  counting_iterator& operator++() {
-    ++count_;
-    return *this;
-  }
-  counting_iterator operator++(int) {
-    auto it = *this;
-    ++*this;
-    return it;
-  }
-
-  friend counting_iterator operator+(counting_iterator it, difference_type n) {
-    it.count_ += static_cast<size_t>(n);
-    return it;
-  }
-
-  value_type operator*() const { return {}; }
-};
-
 template <typename Char, typename InputIt>
-inline counting_iterator copy_str(InputIt begin, InputIt end,
+FMT_CONSTEXPR inline auto copy_str(InputIt begin, InputIt end,
-                                  counting_iterator it) {
+                                   counting_iterator it) -> counting_iterator {
   return it + (end - begin);
 }
 
-template <typename OutputIt> class truncating_iterator_base {
- protected:
-  OutputIt out_;
-  size_t limit_;
-  size_t count_ = 0;
-
-  truncating_iterator_base() : out_(), limit_(0) {}
-
-  truncating_iterator_base(OutputIt out, size_t limit)
-      : out_(out), limit_(limit) {}
-
- public:
-  using iterator_category = std::output_iterator_tag;
-  using value_type = typename std::iterator_traits<OutputIt>::value_type;
-  using difference_type = std::ptrdiff_t;
-  using pointer = void;
-  using reference = void;
-  using _Unchecked_type =
-      truncating_iterator_base;  // Mark iterator as checked.
-
-  OutputIt base() const { return out_; }
-  size_t count() const { return count_; }
-};
-
-// An output iterator that truncates the output and counts the number of objects
-// written to it.
-template <typename OutputIt,
-          typename Enable = typename std::is_void<
-              typename std::iterator_traits<OutputIt>::value_type>::type>
-class truncating_iterator;
-
-template <typename OutputIt>
-class truncating_iterator<OutputIt, std::false_type>
-    : public truncating_iterator_base<OutputIt> {
-  mutable typename truncating_iterator_base<OutputIt>::value_type blackhole_;
-
- public:
-  using value_type = typename truncating_iterator_base<OutputIt>::value_type;
-
-  truncating_iterator() = default;
-
-  truncating_iterator(OutputIt out, size_t limit)
-      : truncating_iterator_base<OutputIt>(out, limit) {}
-
-  truncating_iterator& operator++() {
-    if (this->count_++ < this->limit_) ++this->out_;
-    return *this;
-  }
-
-  truncating_iterator operator++(int) {
-    auto it = *this;
-    ++*this;
-    return it;
-  }
-
-  value_type& operator*() const {
-    return this->count_ < this->limit_ ? *this->out_ : blackhole_;
-  }
-};
-
-template <typename OutputIt>
-class truncating_iterator<OutputIt, std::true_type>
-    : public truncating_iterator_base<OutputIt> {
- public:
-  truncating_iterator() = default;
-
-  truncating_iterator(OutputIt out, size_t limit)
-      : truncating_iterator_base<OutputIt>(out, limit) {}
-
-  template <typename T> truncating_iterator& operator=(T val) {
-    if (this->count_++ < this->limit_) *this->out_++ = val;
-    return *this;
-  }
-
-  truncating_iterator& operator++() { return *this; }
-  truncating_iterator& operator++(int) { return *this; }
-  truncating_iterator& operator*() { return *this; }
-};
-
 // A compile-time string which is compiled into fast formatting code.
 class compiled_string {};
 
@@ -163,19 +45,19 @@ struct is_compiled_string : std::is_base_of<compiled_string, S> {};
 #  define FMT_COMPILE(s) FMT_STRING(s)
 #endif
 
-#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS
+#if FMT_USE_NONTYPE_TEMPLATE_ARGS
 template <typename Char, size_t N,
           fmt::detail_exported::fixed_string<Char, N> Str>
 struct udl_compiled_string : compiled_string {
   using char_type = Char;
-  constexpr operator basic_string_view<char_type>() const {
+  explicit constexpr operator basic_string_view<char_type>() const {
     return {Str.data, N - 1};
   }
 };
 #endif
 
 template <typename T, typename... Tail>
-const T& first(const T& value, const Tail&...) {
+auto first(const T& value, const Tail&...) -> const T& {
   return value;
 }
 
@@ -236,7 +118,8 @@ template <typename Char> struct code_unit {
 
   template <typename OutputIt, typename... Args>
   constexpr OutputIt format(OutputIt out, const Args&...) const {
-    return write<Char>(out, value);
+    *out++ = value;
+    return out;
   }
 };
 
@@ -260,7 +143,12 @@ template <typename Char, typename T, int N> struct field {
 
   template <typename OutputIt, typename... Args>
   constexpr OutputIt format(OutputIt out, const Args&... args) const {
-    return write<Char>(out, get_arg_checked<T, N>(args...));
+    const T& arg = get_arg_checked<T, N>(args...);
+    if constexpr (std::is_convertible_v<T, basic_string_view<Char>>) {
+      auto s = basic_string_view<Char>(arg);
+      return copy_str<Char>(s.begin(), s.end(), out);
+    }
+    return write<Char>(out, arg);
   }
 };
 
@@ -371,38 +259,35 @@ template <typename T, typename Char> struct parse_specs_result {
   int next_arg_id;
 };
 
-constexpr int manual_indexing_id = -1;
+enum { manual_indexing_id = -1 };
 
 template <typename T, typename Char>
 constexpr parse_specs_result<T, Char> parse_specs(basic_string_view<Char> str,
                                                   size_t pos, int next_arg_id) {
   str.remove_prefix(pos);
-  auto ctx = basic_format_parse_context<Char>(str, {}, next_arg_id);
+  auto ctx =
+      compile_parse_context<Char>(str, max_value<int>(), nullptr, next_arg_id);
   auto f = formatter<T, Char>();
   auto end = f.parse(ctx);
-  return {f, pos + fmt::detail::to_unsigned(end - str.data()) + 1,
+  return {f, pos + fmt::detail::to_unsigned(end - str.data()),
           next_arg_id == 0 ? manual_indexing_id : ctx.next_arg_id()};
 }
 
 template <typename Char> struct arg_id_handler {
   arg_ref<Char> arg_id;
 
-  constexpr int operator()() {
+  constexpr int on_auto() {
     FMT_ASSERT(false, "handler cannot be used with automatic indexing");
     return 0;
   }
-  constexpr int operator()(int id) {
+  constexpr int on_index(int id) {
     arg_id = arg_ref<Char>(id);
     return 0;
   }
-  constexpr int operator()(basic_string_view<Char> id) {
+  constexpr int on_name(basic_string_view<Char> id) {
     arg_id = arg_ref<Char>(id);
     return 0;
   }
-
-  constexpr void on_error(const char* message) {
-    FMT_THROW(format_error(message));
-  }
 };
 
 template <typename Char> struct parse_arg_id_result {
@@ -436,14 +321,21 @@ constexpr auto parse_replacement_field_then_tail(S format_str) {
     return parse_tail<Args, END_POS + 1, NEXT_ID>(
         field<char_type, typename field_type<T>::type, ARG_INDEX>(),
         format_str);
-  } else if constexpr (c == ':') {
+  } else if constexpr (c != ':') {
+    FMT_THROW(format_error("expected ':'"));
+  } else {
     constexpr auto result = parse_specs<typename field_type<T>::type>(
         str, END_POS + 1, NEXT_ID == manual_indexing_id ? 0 : NEXT_ID);
-    return parse_tail<Args, result.end, result.next_arg_id>(
+    if constexpr (result.end >= str.size() || str[result.end] != '}') {
+      FMT_THROW(format_error("expected '}'"));
+      return 0;
+    } else {
+      return parse_tail<Args, result.end + 1, result.next_arg_id>(
           spec_field<char_type, typename field_type<T>::type, ARG_INDEX>{
               result.fmt},
           format_str);
     }
+  }
 }
 
 // Compiles a non-empty format string and returns the compiled representation
@@ -484,14 +376,13 @@ constexpr auto compile_format_string(S format_str) {
       } else if constexpr (arg_id_result.arg_id.kind == arg_id_kind::name) {
         constexpr auto arg_index =
             get_arg_index_by_name(arg_id_result.arg_id.val.name, Args{});
-        if constexpr (arg_index != invalid_arg_index) {
+        if constexpr (arg_index >= 0) {
           constexpr auto next_id =
               ID != manual_indexing_id ? ID + 1 : manual_indexing_id;
           return parse_replacement_field_then_tail<
               decltype(get_type<arg_index, Args>::value), Args, arg_id_end_pos,
               arg_index, next_id>(format_str);
-        } else {
+        } else if constexpr (c == '}') {
-          if constexpr (c == '}') {
           return parse_tail<Args, arg_id_end_pos + 1, ID>(
               runtime_named_field<char_type>{arg_id_result.arg_id.val.name},
               format_str);
@@ -500,7 +391,6 @@ constexpr auto compile_format_string(S format_str) {
         }
       }
     }
-    }
   } else if constexpr (str[POS] == '}') {
     if constexpr (POS + 1 == str.size())
       FMT_THROW(format_error("unmatched '}' in format string"));
@@ -533,7 +423,7 @@ constexpr auto compile(S format_str) {
 #endif  // defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction)
 }  // namespace detail
 
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
 #if defined(__cpp_if_constexpr) && defined(__cpp_return_type_deduction)
 
@@ -573,10 +463,11 @@ FMT_INLINE std::basic_string<typename S::char_type> format(const S&,
   constexpr auto compiled = detail::compile<Args...>(S());
   if constexpr (std::is_same<remove_cvref_t<decltype(compiled)>,
                              detail::unknown_format>()) {
-    return format(static_cast<basic_string_view<typename S::char_type>>(S()),
+    return fmt::format(
+        static_cast<basic_string_view<typename S::char_type>>(S()),
         std::forward<Args>(args)...);
   } else {
-    return format(compiled, std::forward<Args>(args)...);
+    return fmt::format(compiled, std::forward<Args>(args)...);
   }
 }
 
@@ -586,35 +477,39 @@ FMT_CONSTEXPR OutputIt format_to(OutputIt out, const S&, Args&&... args) {
   constexpr auto compiled = detail::compile<Args...>(S());
   if constexpr (std::is_same<remove_cvref_t<decltype(compiled)>,
                              detail::unknown_format>()) {
-    return format_to(out,
+    return fmt::format_to(
-                     static_cast<basic_string_view<typename S::char_type>>(S()),
+        out, static_cast<basic_string_view<typename S::char_type>>(S()),
         std::forward<Args>(args)...);
   } else {
-    return format_to(out, compiled, std::forward<Args>(args)...);
+    return fmt::format_to(out, compiled, std::forward<Args>(args)...);
   }
 }
 #endif
 
 template <typename OutputIt, typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-format_to_n_result<OutputIt> format_to_n(OutputIt out, size_t n,
+auto format_to_n(OutputIt out, size_t n, const S& format_str, Args&&... args)
-                                         const S& format_str, Args&&... args) {
+    -> format_to_n_result<OutputIt> {
-  auto it = format_to(detail::truncating_iterator<OutputIt>(out, n), format_str,
+  using traits = detail::fixed_buffer_traits;
+  auto buf = detail::iterator_buffer<OutputIt, char, traits>(out, n);
+  fmt::format_to(std::back_inserter(buf), format_str,
                  std::forward<Args>(args)...);
-  return {it.base(), it.count()};
+  return {buf.out(), buf.count()};
 }
 
 template <typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
-size_t formatted_size(const S& format_str, const Args&... args) {
+FMT_CONSTEXPR20 auto formatted_size(const S& format_str, const Args&... args)
-  return format_to(detail::counting_iterator(), format_str, args...).count();
+    -> size_t {
+  return fmt::format_to(detail::counting_iterator(), format_str, args...)
+      .count();
 }
 
 template <typename S, typename... Args,
           FMT_ENABLE_IF(detail::is_compiled_string<S>::value)>
 void print(std::FILE* f, const S& format_str, const Args&... args) {
   memory_buffer buffer;
-  format_to(std::back_inserter(buffer), format_str, args...);
+  fmt::format_to(std::back_inserter(buffer), format_str, args...);
   detail::print(f, {buffer.data(), buffer.size()});
 }
 
@@ -624,19 +519,17 @@ void print(const S& format_str, const Args&... args) {
   print(stdout, format_str, args...);
 }
 
-#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS
+#if FMT_USE_NONTYPE_TEMPLATE_ARGS
 inline namespace literals {
-template <detail_exported::fixed_string Str>
+template <detail_exported::fixed_string Str> constexpr auto operator""_cf() {
-constexpr detail::udl_compiled_string<
+  using char_t = remove_cvref_t<decltype(Str.data[0])>;
-    remove_cvref_t<decltype(Str.data[0])>,
+  return detail::udl_compiled_string<char_t, sizeof(Str.data) / sizeof(char_t),
-    sizeof(Str.data) / sizeof(decltype(Str.data[0])), Str>
+                                     Str>();
-operator""_cf() {
-  return {};
 }
 }  // namespace literals
 #endif
 
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_COMPILE_H_

vendor/spdlog/fmt/bundled/os.h

@@ -9,18 +9,18 @@
 #define FMT_OS_H_
 
 #include <cerrno>
-#include <clocale>  // locale_t
 #include <cstddef>
 #include <cstdio>
-#include <cstdlib>       // strtod_l
 #include <system_error>  // std::system_error
 
-#if defined __APPLE__ || defined(__FreeBSD__)
-#  include <xlocale.h>  // for LC_NUMERIC_MASK on OS X
-#endif
-
 #include "format.h"
 
+#if defined __APPLE__ || defined(__FreeBSD__)
+#  if FMT_HAS_INCLUDE(<xlocale.h>)
+#    include <xlocale.h>  // for LC_NUMERIC_MASK on OS X
+#  endif
+#endif
+
 #ifndef FMT_USE_FCNTL
 // UWP doesn't provide _pipe.
 #  if FMT_HAS_INCLUDE("winapifamily.h")
@@ -48,6 +48,7 @@
 
 // Calls to system functions are wrapped in FMT_SYSTEM for testability.
 #ifdef FMT_SYSTEM
+#  define FMT_HAS_SYSTEM
 #  define FMT_POSIX_CALL(call) FMT_SYSTEM(call)
 #else
 #  define FMT_SYSTEM(call) ::call
@@ -73,7 +74,7 @@
 #define FMT_RETRY(result, expression) FMT_RETRY_VAL(result, expression, -1)
 
 FMT_BEGIN_NAMESPACE
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
 /**
   \rst
@@ -116,57 +117,19 @@ template <typename Char> class basic_cstring_view {
   basic_cstring_view(const std::basic_string<Char>& s) : data_(s.c_str()) {}
 
   /** Returns the pointer to a C string. */
-  const Char* c_str() const { return data_; }
+  auto c_str() const -> const Char* { return data_; }
 };
 
 using cstring_view = basic_cstring_view<char>;
 using wcstring_view = basic_cstring_view<wchar_t>;
 
-template <typename Char> struct formatter<std::error_code, Char> {
-  template <typename ParseContext>
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-    return ctx.begin();
-  }
-
-  template <typename FormatContext>
-  FMT_CONSTEXPR auto format(const std::error_code& ec, FormatContext& ctx) const
-      -> decltype(ctx.out()) {
-    auto out = ctx.out();
-    out = detail::write_bytes(out, ec.category().name(),
-                              basic_format_specs<Char>());
-    out = detail::write<Char>(out, Char(':'));
-    out = detail::write<Char>(out, ec.value());
-    return out;
-  }
-};
-
 #ifdef _WIN32
-FMT_API const std::error_category& system_category() FMT_NOEXCEPT;
+FMT_API const std::error_category& system_category() noexcept;
-
-FMT_BEGIN_DETAIL_NAMESPACE
-// A converter from UTF-16 to UTF-8.
-// It is only provided for Windows since other systems support UTF-8 natively.
-class utf16_to_utf8 {
- private:
-  memory_buffer buffer_;
-
- public:
-  utf16_to_utf8() {}
-  FMT_API explicit utf16_to_utf8(basic_string_view<wchar_t> s);
-  operator string_view() const { return string_view(&buffer_[0], size()); }
-  size_t size() const { return buffer_.size() - 1; }
-  const char* c_str() const { return &buffer_[0]; }
-  std::string str() const { return std::string(&buffer_[0], size()); }
-
-  // Performs conversion returning a system error code instead of
-  // throwing exception on conversion error. This method may still throw
-  // in case of memory allocation error.
-  FMT_API int convert(basic_string_view<wchar_t> s);
-};
 
+namespace detail {
 FMT_API void format_windows_error(buffer<char>& out, int error_code,
-                                  const char* message) FMT_NOEXCEPT;
+                                  const char* message) noexcept;
-FMT_END_DETAIL_NAMESPACE
+}
 
 FMT_API std::system_error vwindows_error(int error_code, string_view format_str,
                                          format_args args);
@@ -207,10 +170,9 @@ std::system_error windows_error(int error_code, string_view message,
 
 // Reports a Windows error without throwing an exception.
 // Can be used to report errors from destructors.
-FMT_API void report_windows_error(int error_code,
+FMT_API void report_windows_error(int error_code, const char* message) noexcept;
-                                  const char* message) FMT_NOEXCEPT;
 #else
-inline const std::error_category& system_category() FMT_NOEXCEPT {
+inline auto system_category() noexcept -> const std::error_category& {
   return std::system_category();
 }
 #endif  // _WIN32
@@ -237,17 +199,17 @@ class buffered_file {
   void operator=(const buffered_file&) = delete;
 
   // Constructs a buffered_file object which doesn't represent any file.
-  buffered_file() FMT_NOEXCEPT : file_(nullptr) {}
+  buffered_file() noexcept : file_(nullptr) {}
 
   // Destroys the object closing the file it represents if any.
-  FMT_API ~buffered_file() FMT_NOEXCEPT;
+  FMT_API ~buffered_file() noexcept;
 
  public:
-  buffered_file(buffered_file&& other) FMT_NOEXCEPT : file_(other.file_) {
+  buffered_file(buffered_file&& other) noexcept : file_(other.file_) {
     other.file_ = nullptr;
   }
 
-  buffered_file& operator=(buffered_file&& other) {
+  auto operator=(buffered_file&& other) -> buffered_file& {
     close();
     file_ = other.file_;
     other.file_ = nullptr;
@@ -261,11 +223,9 @@ class buffered_file {
   FMT_API void close();
 
   // Returns the pointer to a FILE object representing this file.
-  FILE* get() const FMT_NOEXCEPT { return file_; }
+  auto get() const noexcept -> FILE* { return file_; }
 
-  // We place parentheses around fileno to workaround a bug in some versions
+  FMT_API auto descriptor() const -> int;
-  // of MinGW that define fileno as a macro.
-  FMT_API int(fileno)() const;
 
   void vprint(string_view format_str, format_args args) {
     fmt::vprint(file_, format_str, args);
@@ -279,12 +239,12 @@ class buffered_file {
 
 #if FMT_USE_FCNTL
 // A file. Closed file is represented by a file object with descriptor -1.
-// Methods that are not declared with FMT_NOEXCEPT may throw
+// Methods that are not declared with noexcept may throw
 // fmt::system_error in case of failure. Note that some errors such as
 // closing the file multiple times will cause a crash on Windows rather
 // than an exception. You can get standard behavior by overriding the
 // invalid parameter handler with _set_invalid_parameter_handler.
-class file {
+class FMT_API file {
  private:
   int fd_;  // File descriptor.
 
@@ -303,19 +263,19 @@ class file {
   };
 
   // Constructs a file object which doesn't represent any file.
-  file() FMT_NOEXCEPT : fd_(-1) {}
+  file() noexcept : fd_(-1) {}
 
   // Opens a file and constructs a file object representing this file.
-  FMT_API file(cstring_view path, int oflag);
+  file(cstring_view path, int oflag);
 
  public:
   file(const file&) = delete;
   void operator=(const file&) = delete;
 
-  file(file&& other) FMT_NOEXCEPT : fd_(other.fd_) { other.fd_ = -1; }
+  file(file&& other) noexcept : fd_(other.fd_) { other.fd_ = -1; }
 
   // Move assignment is not noexcept because close may throw.
-  file& operator=(file&& other) {
+  auto operator=(file&& other) -> file& {
     close();
     fd_ = other.fd_;
     other.fd_ = -1;
@@ -323,54 +283,61 @@ class file {
   }
 
   // Destroys the object closing the file it represents if any.
-  FMT_API ~file() FMT_NOEXCEPT;
+  ~file() noexcept;
 
   // Returns the file descriptor.
-  int descriptor() const FMT_NOEXCEPT { return fd_; }
+  auto descriptor() const noexcept -> int { return fd_; }
 
   // Closes the file.
-  FMT_API void close();
+  void close();
 
   // Returns the file size. The size has signed type for consistency with
   // stat::st_size.
-  FMT_API long long size() const;
+  auto size() const -> long long;
 
   // Attempts to read count bytes from the file into the specified buffer.
-  FMT_API size_t read(void* buffer, size_t count);
+  auto read(void* buffer, size_t count) -> size_t;
 
   // Attempts to write count bytes from the specified buffer to the file.
-  FMT_API size_t write(const void* buffer, size_t count);
+  auto write(const void* buffer, size_t count) -> size_t;
 
   // Duplicates a file descriptor with the dup function and returns
   // the duplicate as a file object.
-  FMT_API static file dup(int fd);
+  static auto dup(int fd) -> file;
 
   // Makes fd be the copy of this file descriptor, closing fd first if
   // necessary.
-  FMT_API void dup2(int fd);
+  void dup2(int fd);
 
   // Makes fd be the copy of this file descriptor, closing fd first if
   // necessary.
-  FMT_API void dup2(int fd, std::error_code& ec) FMT_NOEXCEPT;
+  void dup2(int fd, std::error_code& ec) noexcept;
 
   // Creates a pipe setting up read_end and write_end file objects for reading
   // and writing respectively.
-  FMT_API static void pipe(file& read_end, file& write_end);
+  // DEPRECATED! Taking files as out parameters is deprecated.
+  static void pipe(file& read_end, file& write_end);
 
   // Creates a buffered_file object associated with this file and detaches
   // this file object from the file.
-  FMT_API buffered_file fdopen(const char* mode);
+  auto fdopen(const char* mode) -> buffered_file;
+
+#  if defined(_WIN32) && !defined(__MINGW32__)
+  // Opens a file and constructs a file object representing this file by
+  // wcstring_view filename. Windows only.
+  static file open_windows_file(wcstring_view path, int oflag);
+#  endif
 };
 
 // Returns the memory page size.
-long getpagesize();
+auto getpagesize() -> long;
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 struct buffer_size {
   buffer_size() = default;
   size_t value = 0;
-  buffer_size operator=(size_t val) const {
+  auto operator=(size_t val) const -> buffer_size {
     auto bs = buffer_size();
     bs.value = val;
     return bs;
@@ -402,56 +369,61 @@ struct ostream_params {
 #  endif
 };
 
-FMT_END_DETAIL_NAMESPACE
+class file_buffer final : public buffer<char> {
+  file file_;
+
+  FMT_API void grow(size_t) override;
+
+ public:
+  FMT_API file_buffer(cstring_view path, const ostream_params& params);
+  FMT_API file_buffer(file_buffer&& other);
+  FMT_API ~file_buffer();
+
+  void flush() {
+    if (size() == 0) return;
+    file_.write(data(), size() * sizeof(data()[0]));
+    clear();
+  }
+
+  void close() {
+    flush();
+    file_.close();
+  }
+};
+
+}  // namespace detail
 
 // Added {} below to work around default constructor error known to
 // occur in Xcode versions 7.2.1 and 8.2.1.
 constexpr detail::buffer_size buffer_size{};
 
 /** A fast output stream which is not thread-safe. */
-class FMT_API ostream final : private detail::buffer<char> {
+class FMT_API ostream {
  private:
-  file file_;
+  FMT_MSC_WARNING(suppress : 4251)
-
+  detail::file_buffer buffer_;
-  void grow(size_t) override;
 
   ostream(cstring_view path, const detail::ostream_params& params)
-      : file_(path, params.oflag) {
+      : buffer_(path, params) {}
-    set(new char[params.buffer_size], params.buffer_size);
-  }
 
  public:
-  ostream(ostream&& other)
+  ostream(ostream&& other) : buffer_(std::move(other.buffer_)) {}
-      : detail::buffer<char>(other.data(), other.size(), other.capacity()),
-        file_(std::move(other.file_)) {
-    other.clear();
-    other.set(nullptr, 0);
-  }
-  ~ostream() {
-    flush();
-    delete[] data();
-  }
 
-  void flush() {
+  ~ostream();
-    if (size() == 0) return;
+
-    file_.write(data(), size());
+  void flush() { buffer_.flush(); }
-    clear();
-  }
 
   template <typename... T>
-  friend ostream output_file(cstring_view path, T... params);
+  friend auto output_file(cstring_view path, T... params) -> ostream;
 
-  void close() {
+  void close() { buffer_.close(); }
-    flush();
-    file_.close();
-  }
 
   /**
     Formats ``args`` according to specifications in ``fmt`` and writes the
     output to the file.
    */
   template <typename... T> void print(format_string<T...> fmt, T&&... args) {
-    vformat_to(detail::buffer_appender<char>(*this), fmt,
+    vformat_to(std::back_inserter(buffer_), fmt,
                fmt::make_format_args(args...));
   }
 };
@@ -462,7 +434,7 @@ class FMT_API ostream final : private detail::buffer<char> {
 
   * ``<integer>``: Flags passed to `open
     <https://pubs.opengroup.org/onlinepubs/007904875/functions/open.html>`_
-    (``file::WRONLY | file::CREATE`` by default)
+    (``file::WRONLY | file::CREATE | file::TRUNC`` by default)
   * ``buffer_size=<integer>``: Output buffer size
 
   **Example**::
@@ -472,56 +444,12 @@ class FMT_API ostream final : private detail::buffer<char> {
   \endrst
  */
 template <typename... T>
-inline ostream output_file(cstring_view path, T... params) {
+inline auto output_file(cstring_view path, T... params) -> ostream {
   return {path, detail::ostream_params(params...)};
 }
 #endif  // FMT_USE_FCNTL
 
-#ifdef FMT_LOCALE
+FMT_END_EXPORT
-// A "C" numeric locale.
-class locale {
- private:
-#  ifdef _WIN32
-  using locale_t = _locale_t;
-
-  static void freelocale(locale_t loc) { _free_locale(loc); }
-
-  static double strtod_l(const char* nptr, char** endptr, _locale_t loc) {
-    return _strtod_l(nptr, endptr, loc);
-  }
-#  endif
-
-  locale_t locale_;
-
- public:
-  using type = locale_t;
-  locale(const locale&) = delete;
-  void operator=(const locale&) = delete;
-
-  locale() {
-#  ifndef _WIN32
-    locale_ = FMT_SYSTEM(newlocale(LC_NUMERIC_MASK, "C", nullptr));
-#  else
-    locale_ = _create_locale(LC_NUMERIC, "C");
-#  endif
-    if (!locale_) FMT_THROW(system_error(errno, "cannot create locale"));
-  }
-  ~locale() { freelocale(locale_); }
-
-  type get() const { return locale_; }
-
-  // Converts string to floating-point number and advances str past the end
-  // of the parsed input.
-  FMT_DEPRECATED double strtod(const char*& str) const {
-    char* end = nullptr;
-    double result = strtod_l(str, &end, locale_);
-    str = end;
-    return result;
-  }
-};
-using Locale FMT_DEPRECATED_ALIAS = locale;
-#endif  // FMT_LOCALE
-FMT_MODULE_EXPORT_END
 FMT_END_NAMESPACE
 
 #endif  // FMT_OS_H_

vendor/spdlog/fmt/bundled/ostream.h

@@ -8,47 +8,102 @@
 #ifndef FMT_OSTREAM_H_
 #define FMT_OSTREAM_H_
 
-#include <ostream>
+#include <fstream>  // std::filebuf
+
+#ifdef _WIN32
+#  ifdef __GLIBCXX__
+#    include <ext/stdio_filebuf.h>
+#    include <ext/stdio_sync_filebuf.h>
+#  endif
+#  include <io.h>
+#endif
 
 #include "format.h"
 
 FMT_BEGIN_NAMESPACE
-
-template <typename OutputIt, typename Char> class basic_printf_context;
-
 namespace detail {
 
-// Checks if T has a user-defined operator<<.
+template <typename Streambuf> class formatbuf : public Streambuf {
-template <typename T, typename Char, typename Enable = void>
-class is_streamable {
  private:
-  template <typename U>
+  using char_type = typename Streambuf::char_type;
-  static auto test(int)
+  using streamsize = decltype(std::declval<Streambuf>().sputn(nullptr, 0));
-      -> bool_constant<sizeof(std::declval<std::basic_ostream<Char>&>()
+  using int_type = typename Streambuf::int_type;
-                              << std::declval<U>()) != 0>;
+  using traits_type = typename Streambuf::traits_type;
 
-  template <typename> static auto test(...) -> std::false_type;
+  buffer<char_type>& buffer_;
-
-  using result = decltype(test<T>(0));
 
  public:
-  is_streamable() = default;
+  explicit formatbuf(buffer<char_type>& buf) : buffer_(buf) {}
 
-  static const bool value = result::value;
+ protected:
+  // The put area is always empty. This makes the implementation simpler and has
+  // the advantage that the streambuf and the buffer are always in sync and
+  // sputc never writes into uninitialized memory. A disadvantage is that each
+  // call to sputc always results in a (virtual) call to overflow. There is no
+  // disadvantage here for sputn since this always results in a call to xsputn.
+
+  auto overflow(int_type ch) -> int_type override {
+    if (!traits_type::eq_int_type(ch, traits_type::eof()))
+      buffer_.push_back(static_cast<char_type>(ch));
+    return ch;
+  }
+
+  auto xsputn(const char_type* s, streamsize count) -> streamsize override {
+    buffer_.append(s, s + count);
+    return count;
+  }
 };
 
-// Formatting of built-in types and arrays is intentionally disabled because
+// Generate a unique explicit instantion in every translation unit using a tag
-// it's handled by standard (non-ostream) formatters.
+// type in an anonymous namespace.
-template <typename T, typename Char>
+namespace {
-struct is_streamable<
+struct file_access_tag {};
-    T, Char,
+}  // namespace
-    enable_if_t<
+template <typename Tag, typename BufType, FILE* BufType::*FileMemberPtr>
-        std::is_arithmetic<T>::value || std::is_array<T>::value ||
+class file_access {
-        std::is_pointer<T>::value || std::is_same<T, char8_type>::value ||
+  friend auto get_file(BufType& obj) -> FILE* { return obj.*FileMemberPtr; }
-        std::is_same<T, std::basic_string<Char>>::value ||
+};
-        std::is_same<T, std_string_view<Char>>::value ||
+
-        (std::is_convertible<T, int>::value && !std::is_enum<T>::value)>>
+#if FMT_MSC_VERSION
-    : std::false_type {};
+template class file_access<file_access_tag, std::filebuf,
+                           &std::filebuf::_Myfile>;
+auto get_file(std::filebuf&) -> FILE*;
+#endif
+
+inline auto write_ostream_unicode(std::ostream& os, fmt::string_view data)
+    -> bool {
+  FILE* f = nullptr;
+#if FMT_MSC_VERSION
+  if (auto* buf = dynamic_cast<std::filebuf*>(os.rdbuf()))
+    f = get_file(*buf);
+  else
+    return false;
+#elif defined(_WIN32) && defined(__GLIBCXX__)
+  auto* rdbuf = os.rdbuf();
+  if (auto* sfbuf = dynamic_cast<__gnu_cxx::stdio_sync_filebuf<char>*>(rdbuf))
+    f = sfbuf->file();
+  else if (auto* fbuf = dynamic_cast<__gnu_cxx::stdio_filebuf<char>*>(rdbuf))
+    f = fbuf->file();
+  else
+    return false;
+#else
+  ignore_unused(os, data, f);
+#endif
+#ifdef _WIN32
+  if (f) {
+    int fd = _fileno(f);
+    if (_isatty(fd)) {
+      os.flush();
+      return write_console(fd, data);
+    }
+  }
+#endif
+  return false;
+}
+inline auto write_ostream_unicode(std::wostream&,
+                                  fmt::basic_string_view<wchar_t>) -> bool {
+  return false;
+}
 
 // Write the content of buf to os.
 // It is a separate function rather than a part of vprint to simplify testing.
@@ -67,50 +122,82 @@ void write_buffer(std::basic_ostream<Char>& os, buffer<Char>& buf) {
 }
 
 template <typename Char, typename T>
-void format_value(buffer<Char>& buf, const T& value,
+void format_value(buffer<Char>& buf, const T& value) {
-                  locale_ref loc = locale_ref()) {
   auto&& format_buf = formatbuf<std::basic_streambuf<Char>>(buf);
   auto&& output = std::basic_ostream<Char>(&format_buf);
 #if !defined(FMT_STATIC_THOUSANDS_SEPARATOR)
-  if (loc) output.imbue(loc.get<std::locale>());
+  output.imbue(std::locale::classic());  // The default is always unlocalized.
 #endif
   output << value;
   output.exceptions(std::ios_base::failbit | std::ios_base::badbit);
-  buf.try_resize(buf.size());
 }
 
-// Formats an object of type T that has an overloaded ostream operator<<.
+template <typename T> struct streamed_view {
-template <typename T, typename Char>
+  const T& value;
-struct fallback_formatter<T, Char, enable_if_t<is_streamable<T, Char>::value>>
+};
-    : private formatter<basic_string_view<Char>, Char> {
-  using formatter<basic_string_view<Char>, Char>::parse;
 
-  template <typename OutputIt>
+}  // namespace detail
-  auto format(const T& value, basic_format_context<OutputIt, Char>& ctx)
+
+// Formats an object of type T that has an overloaded ostream operator<<.
+template <typename Char>
+struct basic_ostream_formatter : formatter<basic_string_view<Char>, Char> {
+  void set_debug_format() = delete;
+
+  template <typename T, typename OutputIt>
+  auto format(const T& value, basic_format_context<OutputIt, Char>& ctx) const
       -> OutputIt {
     auto buffer = basic_memory_buffer<Char>();
-    format_value(buffer, value, ctx.locale());
+    detail::format_value(buffer, value);
     return formatter<basic_string_view<Char>, Char>::format(
         {buffer.data(), buffer.size()}, ctx);
   }
+};
 
-  // DEPRECATED!
+using ostream_formatter = basic_ostream_formatter<char>;
+
+template <typename T, typename Char>
+struct formatter<detail::streamed_view<T>, Char>
+    : basic_ostream_formatter<Char> {
   template <typename OutputIt>
-  auto format(const T& value, basic_printf_context<OutputIt, Char>& ctx)
+  auto format(detail::streamed_view<T> view,
-      -> OutputIt {
+              basic_format_context<OutputIt, Char>& ctx) const -> OutputIt {
-    auto buffer = basic_memory_buffer<Char>();
+    return basic_ostream_formatter<Char>::format(view.value, ctx);
-    format_value(buffer, value, ctx.locale());
-    return std::copy(buffer.begin(), buffer.end(), ctx.out());
   }
 };
+
+/**
+  \rst
+  Returns a view that formats `value` via an ostream ``operator<<``.
+
+  **Example**::
+
+    fmt::print("Current thread id: {}\n",
+               fmt::streamed(std::this_thread::get_id()));
+  \endrst
+ */
+template <typename T>
+constexpr auto streamed(const T& value) -> detail::streamed_view<T> {
+  return {value};
+}
+
+namespace detail {
+
+inline void vprint_directly(std::ostream& os, string_view format_str,
+                            format_args args) {
+  auto buffer = memory_buffer();
+  detail::vformat_to(buffer, format_str, args);
+  detail::write_buffer(os, buffer);
+}
+
 }  // namespace detail
 
-FMT_MODULE_EXPORT
+FMT_EXPORT template <typename Char>
-template <typename Char>
+void vprint(std::basic_ostream<Char>& os,
-void vprint(std::basic_ostream<Char>& os, basic_string_view<Char> format_str,
+            basic_string_view<type_identity_t<Char>> format_str,
             basic_format_args<buffer_context<type_identity_t<Char>>> args) {
   auto buffer = basic_memory_buffer<Char>();
   detail::vformat_to(buffer, format_str, args);
+  if (detail::write_ostream_unicode(os, {buffer.data(), buffer.size()})) return;
   detail::write_buffer(os, buffer);
 }
 
@@ -123,13 +210,36 @@ void vprint(std::basic_ostream<Char>& os, basic_string_view<Char> format_str,
     fmt::print(cerr, "Don't {}!", "panic");
   \endrst
  */
-FMT_MODULE_EXPORT
+FMT_EXPORT template <typename... T>
-template <typename S, typename... Args,
+void print(std::ostream& os, format_string<T...> fmt, T&&... args) {
-          typename Char = enable_if_t<detail::is_string<S>::value, char_t<S>>>
+  const auto& vargs = fmt::make_format_args(args...);
-void print(std::basic_ostream<Char>& os, const S& format_str, Args&&... args) {
+  if (detail::is_utf8())
-  vprint(os, to_string_view(format_str),
+    vprint(os, fmt, vargs);
-         fmt::make_args_checked<Args...>(format_str, args...));
+  else
+    detail::vprint_directly(os, fmt, vargs);
 }
+
+FMT_EXPORT
+template <typename... Args>
+void print(std::wostream& os,
+           basic_format_string<wchar_t, type_identity_t<Args>...> fmt,
+           Args&&... args) {
+  vprint(os, fmt, fmt::make_format_args<buffer_context<wchar_t>>(args...));
+}
+
+FMT_EXPORT template <typename... T>
+void println(std::ostream& os, format_string<T...> fmt, T&&... args) {
+  fmt::print(os, "{}\n", fmt::format(fmt, std::forward<T>(args)...));
+}
+
+FMT_EXPORT
+template <typename... Args>
+void println(std::wostream& os,
+             basic_format_string<wchar_t, type_identity_t<Args>...> fmt,
+             Args&&... args) {
+  print(os, L"{}\n", fmt::format(fmt, std::forward<Args>(args)...));
+}
+
 FMT_END_NAMESPACE
 
 #endif  // FMT_OSTREAM_H_

vendor/spdlog/fmt/bundled/printf.h

@@ -10,29 +10,28 @@
 
 #include <algorithm>  // std::max
 #include <limits>     // std::numeric_limits
-#include <ostream>
 
 #include "format.h"
 
 FMT_BEGIN_NAMESPACE
-FMT_MODULE_EXPORT_BEGIN
+FMT_BEGIN_EXPORT
 
-template <typename T> struct printf_formatter { printf_formatter() = delete; };
+template <typename T> struct printf_formatter {
-
+  printf_formatter() = delete;
-template <typename Char>
-class basic_printf_parse_context : public basic_format_parse_context<Char> {
-  using basic_format_parse_context<Char>::basic_format_parse_context;
 };
 
-template <typename OutputIt, typename Char> class basic_printf_context {
+template <typename Char> class basic_printf_context {
  private:
-  OutputIt out_;
+  detail::buffer_appender<Char> out_;
   basic_format_args<basic_printf_context> args_;
 
+  static_assert(std::is_same<Char, char>::value ||
+                    std::is_same<Char, wchar_t>::value,
+                "Unsupported code unit type.");
+
  public:
   using char_type = Char;
-  using format_arg = basic_format_arg<basic_printf_context>;
+  using parse_context_type = basic_format_parse_context<Char>;
-  using parse_context_type = basic_printf_parse_context<Char>;
   template <typename T> using formatter_type = printf_formatter<T>;
 
   /**
@@ -41,75 +40,77 @@ template <typename OutputIt, typename Char> class basic_printf_context {
     stored in the context object so make sure they have appropriate lifetimes.
     \endrst
    */
-  basic_printf_context(OutputIt out,
+  basic_printf_context(detail::buffer_appender<Char> out,
                        basic_format_args<basic_printf_context> args)
       : out_(out), args_(args) {}
 
-  OutputIt out() { return out_; }
+  auto out() -> detail::buffer_appender<Char> { return out_; }
-  void advance_to(OutputIt it) { out_ = it; }
+  void advance_to(detail::buffer_appender<Char>) {}
 
-  detail::locale_ref locale() { return {}; }
+  auto locale() -> detail::locale_ref { return {}; }
 
-  format_arg arg(int id) const { return args_.get(id); }
+  auto arg(int id) const -> basic_format_arg<basic_printf_context> {
+    return args_.get(id);
+  }
 
   FMT_CONSTEXPR void on_error(const char* message) {
     detail::error_handler().on_error(message);
   }
 };
 
-FMT_BEGIN_DETAIL_NAMESPACE
+namespace detail {
 
 // Checks if a value fits in int - used to avoid warnings about comparing
 // signed and unsigned integers.
 template <bool IsSigned> struct int_checker {
-  template <typename T> static bool fits_in_int(T value) {
+  template <typename T> static auto fits_in_int(T value) -> bool {
     unsigned max = max_value<int>();
     return value <= max;
   }
-  static bool fits_in_int(bool) { return true; }
+  static auto fits_in_int(bool) -> bool { return true; }
 };
 
 template <> struct int_checker<true> {
-  template <typename T> static bool fits_in_int(T value) {
+  template <typename T> static auto fits_in_int(T value) -> bool {
     return value >= (std::numeric_limits<int>::min)() &&
            value <= max_value<int>();
   }
-  static bool fits_in_int(int) { return true; }
+  static auto fits_in_int(int) -> bool { return true; }
 };
 
-class printf_precision_handler {
+struct printf_precision_handler {
- public:
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
-  int operator()(T value) {
+  auto operator()(T value) -> int {
     if (!int_checker<std::numeric_limits<T>::is_signed>::fits_in_int(value))
-      FMT_THROW(format_error("number is too big"));
+      throw_format_error("number is too big");
     return (std::max)(static_cast<int>(value), 0);
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
-  int operator()(T) {
+  auto operator()(T) -> int {
-    FMT_THROW(format_error("precision is not integer"));
+    throw_format_error("precision is not integer");
     return 0;
   }
 };
 
 // An argument visitor that returns true iff arg is a zero integer.
-class is_zero_int {
+struct is_zero_int {
- public:
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
-  bool operator()(T value) {
+  auto operator()(T value) -> bool {
     return value == 0;
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
-  bool operator()(T) {
+  auto operator()(T) -> bool {
     return false;
   }
 };
 
 template <typename T> struct make_unsigned_or_bool : std::make_unsigned<T> {};
 
-template <> struct make_unsigned_or_bool<bool> { using type = bool; };
+template <> struct make_unsigned_or_bool<bool> {
+  using type = bool;
+};
 
 template <typename T, typename Context> class arg_converter {
  private:
@@ -133,22 +134,23 @@ template <typename T, typename Context> class arg_converter {
     if (const_check(sizeof(target_type) <= sizeof(int))) {
       // Extra casts are used to silence warnings.
       if (is_signed) {
-        arg_ = detail::make_arg<Context>(
+        auto n = static_cast<int>(static_cast<target_type>(value));
-            static_cast<int>(static_cast<target_type>(value)));
+        arg_ = detail::make_arg<Context>(n);
       } else {
         using unsigned_type = typename make_unsigned_or_bool<target_type>::type;
-        arg_ = detail::make_arg<Context>(
+        auto n = static_cast<unsigned>(static_cast<unsigned_type>(value));
-            static_cast<unsigned>(static_cast<unsigned_type>(value)));
+        arg_ = detail::make_arg<Context>(n);
       }
     } else {
       if (is_signed) {
         // glibc's printf doesn't sign extend arguments of smaller types:
         //   std::printf("%lld", -42);  // prints "4294967254"
         // but we don't have to do the same because it's a UB.
-        arg_ = detail::make_arg<Context>(static_cast<long long>(value));
+        auto n = static_cast<long long>(value);
+        arg_ = detail::make_arg<Context>(n);
       } else {
-        arg_ = detail::make_arg<Context>(
+        auto n = static_cast<typename make_unsigned_or_bool<U>::type>(value);
-            static_cast<typename make_unsigned_or_bool<U>::type>(value));
+        arg_ = detail::make_arg<Context>(n);
       }
     }
   }
@@ -176,8 +178,8 @@ template <typename Context> class char_converter {
 
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
   void operator()(T value) {
-    arg_ = detail::make_arg<Context>(
+    auto c = static_cast<typename Context::char_type>(value);
-        static_cast<typename Context::char_type>(value));
+    arg_ = detail::make_arg<Context>(c);
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
@@ -187,68 +189,77 @@ template <typename Context> class char_converter {
 // An argument visitor that return a pointer to a C string if argument is a
 // string or null otherwise.
 template <typename Char> struct get_cstring {
-  template <typename T> const Char* operator()(T) { return nullptr; }
+  template <typename T> auto operator()(T) -> const Char* { return nullptr; }
-  const Char* operator()(const Char* s) { return s; }
+  auto operator()(const Char* s) -> const Char* { return s; }
 };
 
 // Checks if an argument is a valid printf width specifier and sets
 // left alignment if it is negative.
 template <typename Char> class printf_width_handler {
  private:
-  using format_specs = basic_format_specs<Char>;
+  format_specs<Char>& specs_;
-
-  format_specs& specs_;
 
  public:
-  explicit printf_width_handler(format_specs& specs) : specs_(specs) {}
+  explicit printf_width_handler(format_specs<Char>& specs) : specs_(specs) {}
 
   template <typename T, FMT_ENABLE_IF(std::is_integral<T>::value)>
-  unsigned operator()(T value) {
+  auto operator()(T value) -> unsigned {
     auto width = static_cast<uint32_or_64_or_128_t<T>>(value);
     if (detail::is_negative(value)) {
       specs_.align = align::left;
       width = 0 - width;
     }
     unsigned int_max = max_value<int>();
-    if (width > int_max) FMT_THROW(format_error("number is too big"));
+    if (width > int_max) throw_format_error("number is too big");
     return static_cast<unsigned>(width);
   }
 
   template <typename T, FMT_ENABLE_IF(!std::is_integral<T>::value)>
-  unsigned operator()(T) {
+  auto operator()(T) -> unsigned {
-    FMT_THROW(format_error("width is not integer"));
+    throw_format_error("width is not integer");
     return 0;
   }
 };
 
+// Workaround for a bug with the XL compiler when initializing
+// printf_arg_formatter's base class.
+template <typename Char>
+auto make_arg_formatter(buffer_appender<Char> iter, format_specs<Char>& s)
+    -> arg_formatter<Char> {
+  return {iter, s, locale_ref()};
+}
+
 // The ``printf`` argument formatter.
-template <typename OutputIt, typename Char>
+template <typename Char>
 class printf_arg_formatter : public arg_formatter<Char> {
  private:
   using base = arg_formatter<Char>;
-  using context_type = basic_printf_context<OutputIt, Char>;
+  using context_type = basic_printf_context<Char>;
-  using format_specs = basic_format_specs<Char>;
 
   context_type& context_;
 
-  OutputIt write_null_pointer(bool is_string = false) {
+  void write_null_pointer(bool is_string = false) {
     auto s = this->specs;
     s.type = presentation_type::none;
-    return write_bytes(this->out, is_string ? "(null)" : "(nil)", s);
+    write_bytes(this->out, is_string ? "(null)" : "(nil)", s);
   }
 
  public:
-  printf_arg_formatter(OutputIt iter, format_specs& s, context_type& ctx)
+  printf_arg_formatter(buffer_appender<Char> iter, format_specs<Char>& s,
-      : base{iter, s, locale_ref()}, context_(ctx) {}
+                       context_type& ctx)
+      : base(make_arg_formatter(iter, s)), context_(ctx) {}
 
-  OutputIt operator()(monostate value) { return base::operator()(value); }
+  void operator()(monostate value) { base::operator()(value); }
 
   template <typename T, FMT_ENABLE_IF(detail::is_integral<T>::value)>
-  OutputIt operator()(T value) {
+  void operator()(T value) {
     // MSVC2013 fails to compile separate overloads for bool and Char so use
     // std::is_same instead.
-    if (std::is_same<T, Char>::value) {
+    if (!std::is_same<T, Char>::value) {
-      format_specs fmt_specs = this->specs;
+      base::operator()(value);
+      return;
+    }
+    format_specs<Char> fmt_specs = this->specs;
     if (fmt_specs.type != presentation_type::none &&
         fmt_specs.type != presentation_type::chr) {
       return (*this)(static_cast<int>(value));
@@ -260,49 +271,49 @@ class printf_arg_formatter : public arg_formatter<Char> {
     // ignored for non-numeric types
     if (fmt_specs.align == align::none || fmt_specs.align == align::numeric)
       fmt_specs.align = align::right;
-      return write<Char>(this->out, static_cast<Char>(value), fmt_specs);
+    write<Char>(this->out, static_cast<Char>(value), fmt_specs);
-    }
-    return base::operator()(value);
   }
 
   template <typename T, FMT_ENABLE_IF(std::is_floating_point<T>::value)>
-  OutputIt operator()(T value) {
+  void operator()(T value) {
-    return base::operator()(value);
+    base::operator()(value);
   }
 
   /** Formats a null-terminated C string. */
-  OutputIt operator()(const char* value) {
+  void operator()(const char* value) {
-    if (value) return base::operator()(value);
+    if (value)
-    return write_null_pointer(this->specs.type != presentation_type::pointer);
+      base::operator()(value);
+    else
+      write_null_pointer(this->specs.type != presentation_type::pointer);
   }
 
   /** Formats a null-terminated wide C string. */
-  OutputIt operator()(const wchar_t* value) {
+  void operator()(const wchar_t* value) {
-    if (value) return base::operator()(value);
+    if (value)
-    return write_null_pointer(this->specs.type != presentation_type::pointer);
+      base::operator()(value);
+    else
+      write_null_pointer(this->specs.type != presentation_type::pointer);
   }
 
-  OutputIt operator()(basic_string_view<Char> value) {
+  void operator()(basic_string_view<Char> value) { base::operator()(value); }
-    return base::operator()(value);
-  }
 
   /** Formats a pointer. */
-  OutputIt operator()(const void* value) {
+  void operator()(const void* value) {
-    return value ? base::operator()(value) : write_null_pointer();
+    if (value)
+      base::operator()(value);
+    else
+      write_null_pointer();
   }
 
   /** Formats an argument of a custom (user-defined) type. */
-  OutputIt operator()(typename basic_format_arg<context_type>::handle handle) {
+  void operator()(typename basic_format_arg<context_type>::handle handle) {
-    auto parse_ctx =
+    auto parse_ctx = basic_format_parse_context<Char>({});
-        basic_printf_parse_context<Char>(basic_string_view<Char>());
     handle.format(parse_ctx, context_);
-    return this->out;
   }
 };
 
 template <typename Char>
-void parse_flags(basic_format_specs<Char>& specs, const Char*& it,
+void parse_flags(format_specs<Char>& specs, const Char*& it, const Char* end) {
-                 const Char* end) {
   for (; it != end; ++it) {
     switch (*it) {
     case '-':
@@ -315,9 +326,7 @@ void parse_flags(basic_format_specs<Char>& specs, const Char*& it,
       specs.fill[0] = '0';
       break;
     case ' ':
-      if (specs.sign != sign::plus) {
+      if (specs.sign != sign::plus) specs.sign = sign::space;
-        specs.sign = sign::space;
-      }
       break;
     case '#':
       specs.alt = true;
@@ -329,8 +338,8 @@ void parse_flags(basic_format_specs<Char>& specs, const Char*& it,
 }
 
 template <typename Char, typename GetArg>
-int parse_header(const Char*& it, const Char* end,
+auto parse_header(const Char*& it, const Char* end, format_specs<Char>& specs,
-                 basic_format_specs<Char>& specs, GetArg get_arg) {
+                  GetArg get_arg) -> int {
   int arg_index = -1;
   Char c = *it;
   if (c >= '0' && c <= '9') {
@@ -345,7 +354,7 @@ int parse_header(const Char*& it, const Char* end,
       if (value != 0) {
         // Nonzero value means that we parsed width and don't need to
         // parse it or flags again, so return now.
-        if (value == -1) FMT_THROW(format_error("number is too big"));
+        if (value == -1) throw_format_error("number is too big");
         specs.width = value;
         return arg_index;
       }
@@ -356,7 +365,7 @@ int parse_header(const Char*& it, const Char* end,
   if (it != end) {
     if (*it >= '0' && *it <= '9') {
       specs.width = parse_nonnegative_int(it, end, -1);
-      if (specs.width == -1) FMT_THROW(format_error("number is too big"));
+      if (specs.width == -1) throw_format_error("number is too big");
     } else if (*it == '*') {
       ++it;
       specs.width = static_cast<int>(visit_format_arg(
@@ -366,13 +375,53 @@ int parse_header(const Char*& it, const Char* end,
   return arg_index;
 }
 
+inline auto parse_printf_presentation_type(char c, type t)
+    -> presentation_type {
+  using pt = presentation_type;
+  constexpr auto integral_set = sint_set | uint_set | bool_set | char_set;
+  switch (c) {
+  case 'd':
+    return in(t, integral_set) ? pt::dec : pt::none;
+  case 'o':
+    return in(t, integral_set) ? pt::oct : pt::none;
+  case 'x':
+    return in(t, integral_set) ? pt::hex_lower : pt::none;
+  case 'X':
+    return in(t, integral_set) ? pt::hex_upper : pt::none;
+  case 'a':
+    return in(t, float_set) ? pt::hexfloat_lower : pt::none;
+  case 'A':
+    return in(t, float_set) ? pt::hexfloat_upper : pt::none;
+  case 'e':
+    return in(t, float_set) ? pt::exp_lower : pt::none;
+  case 'E':
+    return in(t, float_set) ? pt::exp_upper : pt::none;
+  case 'f':
+    return in(t, float_set) ? pt::fixed_lower : pt::none;
+  case 'F':
+    return in(t, float_set) ? pt::fixed_upper : pt::none;
+  case 'g':
+    return in(t, float_set) ? pt::general_lower : pt::none;
+  case 'G':
+    return in(t, float_set) ? pt::general_upper : pt::none;
+  case 'c':
+    return in(t, integral_set) ? pt::chr : pt::none;
+  case 's':
+    return in(t, string_set | cstring_set) ? pt::string : pt::none;
+  case 'p':
+    return in(t, pointer_set | cstring_set) ? pt::pointer : pt::none;
+  default:
+    return pt::none;
+  }
+}
+
 template <typename Char, typename Context>
 void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
              basic_format_args<Context> args) {
-  using OutputIt = buffer_appender<Char>;
+  using iterator = buffer_appender<Char>;
-  auto out = OutputIt(buf);
+  auto out = iterator(buf);
-  auto context = basic_printf_context<OutputIt, Char>(out, args);
+  auto context = basic_printf_context<Char>(out, args);
-  auto parse_ctx = basic_printf_parse_context<Char>(format);
+  auto parse_ctx = basic_format_parse_context<Char>(format);
 
   // Returns the argument with specified index or, if arg_index is -1, the next
   // argument.
@@ -388,26 +437,24 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
   const Char* end = parse_ctx.end();
   auto it = start;
   while (it != end) {
-    if (!detail::find<false, Char>(it, end, '%', it)) {
+    if (!find<false, Char>(it, end, '%', it)) {
-      it = end;  // detail::find leaves it == nullptr if it doesn't find '%'
+      it = end;  // find leaves it == nullptr if it doesn't find '%'.
       break;
     }
     Char c = *it++;
     if (it != end && *it == c) {
-      out = detail::write(
+      write(out, basic_string_view<Char>(start, to_unsigned(it - start)));
-          out, basic_string_view<Char>(start, detail::to_unsigned(it - start)));
       start = ++it;
       continue;
     }
-    out = detail::write(out, basic_string_view<Char>(
+    write(out, basic_string_view<Char>(start, to_unsigned(it - 1 - start)));
-                                 start, detail::to_unsigned(it - 1 - start)));
 
-    basic_format_specs<Char> specs;
+    auto specs = format_specs<Char>();
     specs.align = align::right;
 
     // Parse argument index, flags and width.
     int arg_index = parse_header(it, end, specs, get_arg);
-    if (arg_index == 0) parse_ctx.on_error("argument not found");
+    if (arg_index == 0) throw_format_error("argument not found");
 
     // Parse precision.
     if (it != end && *it == '.') {
@@ -418,7 +465,7 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
       } else if (c == '*') {
         ++it;
         specs.precision = static_cast<int>(
-            visit_format_arg(detail::printf_precision_handler(), get_arg(-1)));
+            visit_format_arg(printf_precision_handler(), get_arg(-1)));
       } else {
         specs.precision = 0;
       }
@@ -427,20 +474,19 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     auto arg = get_arg(arg_index);
     // For d, i, o, u, x, and X conversion specifiers, if a precision is
     // specified, the '0' flag is ignored
-    if (specs.precision >= 0 && arg.is_integral())
+    if (specs.precision >= 0 && arg.is_integral()) {
-      specs.fill[0] =
+      // Ignore '0' for non-numeric types or if '-' present.
-          ' ';  // Ignore '0' flag for non-numeric types or if '-' present.
+      specs.fill[0] = ' ';
-    if (specs.precision >= 0 && arg.type() == detail::type::cstring_type) {
+    }
-      auto str = visit_format_arg(detail::get_cstring<Char>(), arg);
+    if (specs.precision >= 0 && arg.type() == type::cstring_type) {
+      auto str = visit_format_arg(get_cstring<Char>(), arg);
       auto str_end = str + specs.precision;
       auto nul = std::find(str, str_end, Char());
-      arg = detail::make_arg<basic_printf_context<OutputIt, Char>>(
+      auto sv = basic_string_view<Char>(
-          basic_string_view<Char>(
+          str, to_unsigned(nul != str_end ? nul - str : specs.precision));
-              str, detail::to_unsigned(nul != str_end ? nul - str
+      arg = make_arg<basic_printf_context<Char>>(sv);
-                                                      : specs.precision)));
     }
-    if (specs.alt && visit_format_arg(detail::is_zero_int(), arg))
+    if (specs.alt && visit_format_arg(is_zero_int(), arg)) specs.alt = false;
-      specs.alt = false;
     if (specs.fill[0] == '0') {
       if (arg.is_arithmetic() && specs.align != align::left)
         specs.align = align::numeric;
@@ -452,7 +498,6 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     // Parse length and convert the argument to the required type.
     c = it != end ? *it++ : 0;
     Char t = it != end ? *it : 0;
-    using detail::convert_arg;
     switch (c) {
     case 'h':
       if (t == 'h') {
@@ -491,7 +536,7 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
     }
 
     // Parse type.
-    if (it == end) FMT_THROW(format_error("invalid format string"));
+    if (it == end) throw_format_error("invalid format string");
     char type = static_cast<char>(*it++);
     if (arg.is_integral()) {
       // Normalize type.
@@ -501,32 +546,25 @@ void vprintf(buffer<Char>& buf, basic_string_view<Char> format,
         type = 'd';
         break;
       case 'c':
-        visit_format_arg(
+        visit_format_arg(char_converter<basic_printf_context<Char>>(arg), arg);
-            detail::char_converter<basic_printf_context<OutputIt, Char>>(arg),
-            arg);
         break;
       }
     }
-    specs.type = parse_presentation_type(type);
+    specs.type = parse_printf_presentation_type(type, arg.type());
     if (specs.type == presentation_type::none)
-      parse_ctx.on_error("invalid type specifier");
+      throw_format_error("invalid format specifier");
 
     start = it;
 
     // Format argument.
-    out = visit_format_arg(
+    visit_format_arg(printf_arg_formatter<Char>(out, specs, context), arg);
-        detail::printf_arg_formatter<OutputIt, Char>(out, specs, context), arg);
   }
-  detail::write(out, basic_string_view<Char>(start, to_unsigned(it - start)));
+  write(out, basic_string_view<Char>(start, to_unsigned(it - start)));
 }
-FMT_END_DETAIL_NAMESPACE
+}  // namespace detail
 
-template <typename Char>
+using printf_context = basic_printf_context<char>;
-using basic_printf_context_t =
+using wprintf_context = basic_printf_context<wchar_t>;
-    basic_printf_context<detail::buffer_appender<Char>, Char>;
-
-using printf_context = basic_printf_context_t<char>;
-using wprintf_context = basic_printf_context_t<wchar_t>;
 
 using printf_args = basic_format_args<printf_context>;
 using wprintf_args = basic_format_args<wprintf_context>;
@@ -543,26 +581,21 @@ inline auto make_printf_args(const T&... args)
   return {args...};
 }
 
-/**
+// DEPRECATED!
-  \rst
-  Constructs an `~fmt::format_arg_store` object that contains references to
-  arguments and can be implicitly converted to `~fmt::wprintf_args`.
-  \endrst
- */
 template <typename... T>
 inline auto make_wprintf_args(const T&... args)
     -> format_arg_store<wprintf_context, T...> {
   return {args...};
 }
 
-template <typename S, typename Char = char_t<S>>
+template <typename Char>
 inline auto vsprintf(
-    const S& fmt,
+    basic_string_view<Char> fmt,
-    basic_format_args<basic_printf_context_t<type_identity_t<Char>>> args)
+    basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
     -> std::basic_string<Char> {
-  basic_memory_buffer<Char> buffer;
+  auto buf = basic_memory_buffer<Char>();
-  vprintf(buffer, to_string_view(fmt), args);
+  detail::vprintf(buf, fmt, args);
-  return to_string(buffer);
+  return to_string(buf);
 }
 
 /**
@@ -577,19 +610,19 @@ inline auto vsprintf(
 template <typename S, typename... T,
           typename Char = enable_if_t<detail::is_string<S>::value, char_t<S>>>
 inline auto sprintf(const S& fmt, const T&... args) -> std::basic_string<Char> {
-  using context = basic_printf_context_t<Char>;
+  return vsprintf(detail::to_string_view(fmt),
-  return vsprintf(to_string_view(fmt), fmt::make_format_args<context>(args...));
+                  fmt::make_format_args<basic_printf_context<Char>>(args...));
 }
 
-template <typename S, typename Char = char_t<S>>
+template <typename Char>
 inline auto vfprintf(
-    std::FILE* f, const S& fmt,
+    std::FILE* f, basic_string_view<Char> fmt,
-    basic_format_args<basic_printf_context_t<type_identity_t<Char>>> args)
+    basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
     -> int {
-  basic_memory_buffer<Char> buffer;
+  auto buf = basic_memory_buffer<Char>();
-  vprintf(buffer, to_string_view(fmt), args);
+  detail::vprintf(buf, fmt, args);
-  size_t size = buffer.size();
+  size_t size = buf.size();
-  return std::fwrite(buffer.data(), sizeof(Char), size, f) < size
+  return std::fwrite(buf.data(), sizeof(Char), size, f) < size
              ? -1
              : static_cast<int>(size);
 }
@@ -605,17 +638,16 @@ inline auto vfprintf(
  */
 template <typename S, typename... T, typename Char = char_t<S>>
 inline auto fprintf(std::FILE* f, const S& fmt, const T&... args) -> int {
-  using context = basic_printf_context_t<Char>;
+  return vfprintf(f, detail::to_string_view(fmt),
-  return vfprintf(f, to_string_view(fmt),
+                  fmt::make_format_args<basic_printf_context<Char>>(args...));
-                  fmt::make_format_args<context>(args...));
 }
 
-template <typename S, typename Char = char_t<S>>
+template <typename Char>
-inline auto vprintf(
+FMT_DEPRECATED inline auto vprintf(
-    const S& fmt,
+    basic_string_view<Char> fmt,
-    basic_format_args<basic_printf_context_t<type_identity_t<Char>>> args)
+    basic_format_args<basic_printf_context<type_identity_t<Char>>> args)
     -> int {
-  return vfprintf(stdout, to_string_view(fmt), args);
+  return vfprintf(stdout, fmt, args);
 }
 
 /**
@@ -627,31 +659,17 @@ inline auto vprintf(
     fmt::printf("Elapsed time: %.2f seconds", 1.23);
   \endrst
  */
-template <typename S, typename... T, FMT_ENABLE_IF(detail::is_string<S>::value)>
+template <typename... T>
-inline auto printf(const S& fmt, const T&... args) -> int {
+inline auto printf(string_view fmt, const T&... args) -> int {
-  return vprintf(
+  return vfprintf(stdout, fmt, make_printf_args(args...));
-      to_string_view(fmt),
-      fmt::make_format_args<basic_printf_context_t<char_t<S>>>(args...));
 }
-
+template <typename... T>
-template <typename S, typename Char = char_t<S>>
+FMT_DEPRECATED inline auto printf(basic_string_view<wchar_t> fmt,
-FMT_DEPRECATED auto vfprintf(
-    std::basic_ostream<Char>& os, const S& fmt,
-    basic_format_args<basic_printf_context_t<type_identity_t<Char>>> args)
-    -> int {
-  basic_memory_buffer<Char> buffer;
-  vprintf(buffer, to_string_view(fmt), args);
-  os.write(buffer.data(), static_cast<std::streamsize>(buffer.size()));
-  return static_cast<int>(buffer.size());
-}
-template <typename S, typename... T, typename Char = char_t<S>>
-FMT_DEPRECATED auto fprintf(std::basic_ostream<Char>& os, const S& fmt,
                                   const T&... args) -> int {
-  return vfprintf(os, to_string_view(fmt),
+  return vfprintf(stdout, fmt, make_wprintf_args(args...));
-                  fmt::make_format_args<basic_printf_context_t<Char>>(args...));
 }
 
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_PRINTF_H_

vendor/spdlog/fmt/bundled/ranges.h

@@ -1,13 +1,9 @@
-// Formatting library for C++ - experimental range support
+// Formatting library for C++ - range and tuple support
 //
-// Copyright (c) 2012 - present, Victor Zverovich
+// Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors
 // All rights reserved.
 //
 // For the license information refer to format.h.
-//
-// Copyright (c) 2018 - present, Remotion (Igor Schulz)
-// All Rights Reserved
-// {fmt} support for ranges, containers and types tuple interface.
 
 #ifndef FMT_RANGES_H_
 #define FMT_RANGES_H_
@@ -22,27 +18,25 @@ FMT_BEGIN_NAMESPACE
 
 namespace detail {
 
-template <typename RangeT, typename OutputIterator>
+template <typename Range, typename OutputIt>
-OutputIterator copy(const RangeT& range, OutputIterator out) {
+auto copy(const Range& range, OutputIt out) -> OutputIt {
   for (auto it = range.begin(), end = range.end(); it != end; ++it)
     *out++ = *it;
   return out;
 }
 
-template <typename OutputIterator>
+template <typename OutputIt>
-OutputIterator copy(const char* str, OutputIterator out) {
+auto copy(const char* str, OutputIt out) -> OutputIt {
   while (*str) *out++ = *str++;
   return out;
 }
 
-template <typename OutputIterator>
+template <typename OutputIt> auto copy(char ch, OutputIt out) -> OutputIt {
-OutputIterator copy(char ch, OutputIterator out) {
   *out++ = ch;
   return out;
 }
 
-template <typename OutputIterator>
+template <typename OutputIt> auto copy(wchar_t ch, OutputIt out) -> OutputIt {
-OutputIterator copy(wchar_t ch, OutputIterator out) {
   *out++ = ch;
   return out;
 }
@@ -55,7 +49,7 @@ template <typename T> class is_std_string_like {
   template <typename> static void check(...);
 
  public:
-  static FMT_CONSTEXPR_DECL const bool value =
+  static constexpr const bool value =
       is_string<T>::value ||
       std::is_convertible<T, std_string_view<char>>::value ||
       !std::is_void<decltype(check<T>(nullptr))>::value;
@@ -69,10 +63,10 @@ template <typename T> class is_map {
   template <typename> static void check(...);
 
  public:
-#ifdef FMT_FORMAT_MAP_AS_LIST
+#ifdef FMT_FORMAT_MAP_AS_LIST  // DEPRECATED!
-  static FMT_CONSTEXPR_DECL const bool value = false;
+  static constexpr const bool value = false;
 #else
-  static FMT_CONSTEXPR_DECL const bool value =
+  static constexpr const bool value =
       !std::is_void<decltype(check<T>(nullptr))>::value;
 #endif
 };
@@ -82,10 +76,10 @@ template <typename T> class is_set {
   template <typename> static void check(...);
 
  public:
-#ifdef FMT_FORMAT_SET_AS_LIST
+#ifdef FMT_FORMAT_SET_AS_LIST  // DEPRECATED!
-  static FMT_CONSTEXPR_DECL const bool value = false;
+  static constexpr const bool value = false;
 #else
-  static FMT_CONSTEXPR_DECL const bool value =
+  static constexpr const bool value =
       !std::is_void<decltype(check<T>(nullptr))>::value && !is_map<T>::value;
 #endif
 };
@@ -94,7 +88,7 @@ template <typename... Ts> struct conditional_helper {};
 
 template <typename T, typename _ = void> struct is_range_ : std::false_type {};
 
-#if !FMT_MSC_VER || FMT_MSC_VER > 1800
+#if !FMT_MSC_VERSION || FMT_MSC_VERSION > 1800
 
 #  define FMT_DECLTYPE_RETURN(val)  \
     ->decltype(val) { return val; } \
@@ -157,8 +151,9 @@ template <typename T>
 struct has_mutable_begin_end<
     T, void_t<decltype(detail::range_begin(std::declval<T>())),
               decltype(detail::range_end(std::declval<T>())),
-              enable_if_t<std::is_copy_constructible<T>::value>>>
+              // the extra int here is because older versions of MSVC don't
-    : std::true_type {};
+              // SFINAE properly unless there are distinct types
+              int>> : std::true_type {};
 
 template <typename T>
 struct is_range_<T, void>
@@ -174,12 +169,12 @@ template <typename T> class is_tuple_like_ {
   template <typename> static void check(...);
 
  public:
-  static FMT_CONSTEXPR_DECL const bool value =
+  static constexpr const bool value =
       !std::is_void<decltype(check<T>(nullptr))>::value;
 };
 
 // Check for integer_sequence
-#if defined(__cpp_lib_integer_sequence) || FMT_MSC_VER >= 1900
+#if defined(__cpp_lib_integer_sequence) || FMT_MSC_VERSION >= 1900
 template <typename T, T... N>
 using integer_sequence = std::integer_sequence<T, N...>;
 template <size_t... N> using index_sequence = std::index_sequence<N...>;
@@ -188,7 +183,7 @@ template <size_t N> using make_index_sequence = std::make_index_sequence<N>;
 template <typename T, T... N> struct integer_sequence {
   using value_type = T;
 
-  static FMT_CONSTEXPR size_t size() { return sizeof...(N); }
+  static FMT_CONSTEXPR auto size() -> size_t { return sizeof...(N); }
 };
 
 template <size_t... N> using index_sequence = integer_sequence<size_t, N...>;
@@ -202,466 +197,381 @@ template <size_t N>
 using make_index_sequence = make_integer_sequence<size_t, N>;
 #endif
 
-template <class Tuple, class F, size_t... Is>
+template <typename T>
-void for_each(index_sequence<Is...>, Tuple&& tup, F&& f) FMT_NOEXCEPT {
+using tuple_index_sequence = make_index_sequence<std::tuple_size<T>::value>;
+
+template <typename T, typename C, bool = is_tuple_like_<T>::value>
+class is_tuple_formattable_ {
+ public:
+  static constexpr const bool value = false;
+};
+template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
+  template <std::size_t... Is>
+  static auto check2(index_sequence<Is...>,
+                     integer_sequence<bool, (Is == Is)...>) -> std::true_type;
+  static auto check2(...) -> std::false_type;
+  template <std::size_t... Is>
+  static auto check(index_sequence<Is...>) -> decltype(check2(
+      index_sequence<Is...>{},
+      integer_sequence<bool,
+                       (is_formattable<typename std::tuple_element<Is, T>::type,
+                                       C>::value)...>{}));
+
+ public:
+  static constexpr const bool value =
+      decltype(check(tuple_index_sequence<T>{}))::value;
+};
+
+template <typename Tuple, typename F, size_t... Is>
+FMT_CONSTEXPR void for_each(index_sequence<Is...>, Tuple&& t, F&& f) {
   using std::get;
-  // using free function get<I>(T) now.
+  // Using a free function get<Is>(Tuple) now.
-  const int _[] = {0, ((void)f(get<Is>(tup)), 0)...};
+  const int unused[] = {0, ((void)f(get<Is>(t)), 0)...};
-  (void)_;  // blocks warnings
+  ignore_unused(unused);
 }
 
-template <class T>
+template <typename Tuple, typename F>
-FMT_CONSTEXPR make_index_sequence<std::tuple_size<T>::value> get_indexes(
+FMT_CONSTEXPR void for_each(Tuple&& t, F&& f) {
-    T const&) {
+  for_each(tuple_index_sequence<remove_cvref_t<Tuple>>(),
-  return {};
+           std::forward<Tuple>(t), std::forward<F>(f));
 }
 
-template <class Tuple, class F> void for_each(Tuple&& tup, F&& f) {
+template <typename Tuple1, typename Tuple2, typename F, size_t... Is>
-  const auto indexes = get_indexes(tup);
+void for_each2(index_sequence<Is...>, Tuple1&& t1, Tuple2&& t2, F&& f) {
-  for_each(indexes, std::forward<Tuple>(tup), std::forward<F>(f));
+  using std::get;
+  const int unused[] = {0, ((void)f(get<Is>(t1), get<Is>(t2)), 0)...};
+  ignore_unused(unused);
 }
 
+template <typename Tuple1, typename Tuple2, typename F>
+void for_each2(Tuple1&& t1, Tuple2&& t2, F&& f) {
+  for_each2(tuple_index_sequence<remove_cvref_t<Tuple1>>(),
+            std::forward<Tuple1>(t1), std::forward<Tuple2>(t2),
+            std::forward<F>(f));
+}
+
+namespace tuple {
+// Workaround a bug in MSVC 2019 (v140).
+template <typename Char, typename... T>
+using result_t = std::tuple<formatter<remove_cvref_t<T>, Char>...>;
+
+using std::get;
+template <typename Tuple, typename Char, std::size_t... Is>
+auto get_formatters(index_sequence<Is...>)
+    -> result_t<Char, decltype(get<Is>(std::declval<Tuple>()))...>;
+}  // namespace tuple
+
+#if FMT_MSC_VERSION && FMT_MSC_VERSION < 1920
+// Older MSVC doesn't get the reference type correctly for arrays.
+template <typename R> struct range_reference_type_impl {
+  using type = decltype(*detail::range_begin(std::declval<R&>()));
+};
+
+template <typename T, std::size_t N> struct range_reference_type_impl<T[N]> {
+  using type = T&;
+};
+
+template <typename T>
+using range_reference_type = typename range_reference_type_impl<T>::type;
+#else
 template <typename Range>
-using value_type =
+using range_reference_type =
-    remove_cvref_t<decltype(*detail::range_begin(std::declval<Range>()))>;
+    decltype(*detail::range_begin(std::declval<Range&>()));
+#endif
 
-template <typename OutputIt> OutputIt write_delimiter(OutputIt out) {
+// We don't use the Range's value_type for anything, but we do need the Range's
-  *out++ = ',';
+// reference type, with cv-ref stripped.
-  *out++ = ' ';
+template <typename Range>
-  return out;
+using uncvref_type = remove_cvref_t<range_reference_type<Range>>;
+
+template <typename Formatter>
+FMT_CONSTEXPR auto maybe_set_debug_format(Formatter& f, bool set)
+    -> decltype(f.set_debug_format(set)) {
+  f.set_debug_format(set);
 }
+template <typename Formatter>
+FMT_CONSTEXPR void maybe_set_debug_format(Formatter&, ...) {}
 
-struct singleton {
+// These are not generic lambdas for compatibility with C++11.
-  unsigned char upper;
+template <typename ParseContext> struct parse_empty_specs {
-  unsigned char lower_count;
+  template <typename Formatter> FMT_CONSTEXPR void operator()(Formatter& f) {
+    f.parse(ctx);
+    detail::maybe_set_debug_format(f, true);
+  }
+  ParseContext& ctx;
 };
+template <typename FormatContext> struct format_tuple_element {
+  using char_type = typename FormatContext::char_type;
 
-inline auto is_printable(uint16_t x, const singleton* singletons,
+  template <typename T>
-                         size_t singletons_size,
+  void operator()(const formatter<T, char_type>& f, const T& v) {
-                         const unsigned char* singleton_lowers,
+    if (i > 0)
-                         const unsigned char* normal, size_t normal_size)
+      ctx.advance_to(detail::copy_str<char_type>(separator, ctx.out()));
-    -> bool {
+    ctx.advance_to(f.format(v, ctx));
-  auto upper = x >> 8;
+    ++i;
-  auto lower_start = 0;
-  for (size_t i = 0; i < singletons_size; ++i) {
-    auto s = singletons[i];
-    auto lower_end = lower_start + s.lower_count;
-    if (upper < s.upper) break;
-    if (upper == s.upper) {
-      for (auto j = lower_start; j < lower_end; ++j) {
-        if (singleton_lowers[j] == (x & 0xff)) return false;
-      }
-    }
-    lower_start = lower_end;
   }
 
-  auto xsigned = static_cast<int>(x);
+  int i;
-  auto current = true;
+  FormatContext& ctx;
-  for (size_t i = 0; i < normal_size; ++i) {
+  basic_string_view<char_type> separator;
-    auto v = static_cast<int>(normal[i]);
-    auto len = (v & 0x80) != 0 ? (v & 0x7f) << 8 | normal[++i] : v;
-    xsigned -= len;
-    if (xsigned < 0) break;
-    current = !current;
-  }
-  return current;
-}
-
-// Returns true iff the code point cp is printable.
-// This code is generated by support/printable.py.
-inline auto is_printable(uint32_t cp) -> bool {
-  static constexpr singleton singletons0[] = {
-      {0x00, 1},  {0x03, 5},  {0x05, 6},  {0x06, 3},  {0x07, 6},  {0x08, 8},
-      {0x09, 17}, {0x0a, 28}, {0x0b, 25}, {0x0c, 20}, {0x0d, 16}, {0x0e, 13},
-      {0x0f, 4},  {0x10, 3},  {0x12, 18}, {0x13, 9},  {0x16, 1},  {0x17, 5},
-      {0x18, 2},  {0x19, 3},  {0x1a, 7},  {0x1c, 2},  {0x1d, 1},  {0x1f, 22},
-      {0x20, 3},  {0x2b, 3},  {0x2c, 2},  {0x2d, 11}, {0x2e, 1},  {0x30, 3},
-      {0x31, 2},  {0x32, 1},  {0xa7, 2},  {0xa9, 2},  {0xaa, 4},  {0xab, 8},
-      {0xfa, 2},  {0xfb, 5},  {0xfd, 4},  {0xfe, 3},  {0xff, 9},
-  };
-  static constexpr unsigned char singletons0_lower[] = {
-      0xad, 0x78, 0x79, 0x8b, 0x8d, 0xa2, 0x30, 0x57, 0x58, 0x8b, 0x8c, 0x90,
-      0x1c, 0x1d, 0xdd, 0x0e, 0x0f, 0x4b, 0x4c, 0xfb, 0xfc, 0x2e, 0x2f, 0x3f,
-      0x5c, 0x5d, 0x5f, 0xb5, 0xe2, 0x84, 0x8d, 0x8e, 0x91, 0x92, 0xa9, 0xb1,
-      0xba, 0xbb, 0xc5, 0xc6, 0xc9, 0xca, 0xde, 0xe4, 0xe5, 0xff, 0x00, 0x04,
-      0x11, 0x12, 0x29, 0x31, 0x34, 0x37, 0x3a, 0x3b, 0x3d, 0x49, 0x4a, 0x5d,
-      0x84, 0x8e, 0x92, 0xa9, 0xb1, 0xb4, 0xba, 0xbb, 0xc6, 0xca, 0xce, 0xcf,
-      0xe4, 0xe5, 0x00, 0x04, 0x0d, 0x0e, 0x11, 0x12, 0x29, 0x31, 0x34, 0x3a,
-      0x3b, 0x45, 0x46, 0x49, 0x4a, 0x5e, 0x64, 0x65, 0x84, 0x91, 0x9b, 0x9d,
-      0xc9, 0xce, 0xcf, 0x0d, 0x11, 0x29, 0x45, 0x49, 0x57, 0x64, 0x65, 0x8d,
-      0x91, 0xa9, 0xb4, 0xba, 0xbb, 0xc5, 0xc9, 0xdf, 0xe4, 0xe5, 0xf0, 0x0d,
-      0x11, 0x45, 0x49, 0x64, 0x65, 0x80, 0x84, 0xb2, 0xbc, 0xbe, 0xbf, 0xd5,
-      0xd7, 0xf0, 0xf1, 0x83, 0x85, 0x8b, 0xa4, 0xa6, 0xbe, 0xbf, 0xc5, 0xc7,
-      0xce, 0xcf, 0xda, 0xdb, 0x48, 0x98, 0xbd, 0xcd, 0xc6, 0xce, 0xcf, 0x49,
-      0x4e, 0x4f, 0x57, 0x59, 0x5e, 0x5f, 0x89, 0x8e, 0x8f, 0xb1, 0xb6, 0xb7,
-      0xbf, 0xc1, 0xc6, 0xc7, 0xd7, 0x11, 0x16, 0x17, 0x5b, 0x5c, 0xf6, 0xf7,
-      0xfe, 0xff, 0x80, 0x0d, 0x6d, 0x71, 0xde, 0xdf, 0x0e, 0x0f, 0x1f, 0x6e,
-      0x6f, 0x1c, 0x1d, 0x5f, 0x7d, 0x7e, 0xae, 0xaf, 0xbb, 0xbc, 0xfa, 0x16,
-      0x17, 0x1e, 0x1f, 0x46, 0x47, 0x4e, 0x4f, 0x58, 0x5a, 0x5c, 0x5e, 0x7e,
-      0x7f, 0xb5, 0xc5, 0xd4, 0xd5, 0xdc, 0xf0, 0xf1, 0xf5, 0x72, 0x73, 0x8f,
-      0x74, 0x75, 0x96, 0x2f, 0x5f, 0x26, 0x2e, 0x2f, 0xa7, 0xaf, 0xb7, 0xbf,
-      0xc7, 0xcf, 0xd7, 0xdf, 0x9a, 0x40, 0x97, 0x98, 0x30, 0x8f, 0x1f, 0xc0,
-      0xc1, 0xce, 0xff, 0x4e, 0x4f, 0x5a, 0x5b, 0x07, 0x08, 0x0f, 0x10, 0x27,
-      0x2f, 0xee, 0xef, 0x6e, 0x6f, 0x37, 0x3d, 0x3f, 0x42, 0x45, 0x90, 0x91,
-      0xfe, 0xff, 0x53, 0x67, 0x75, 0xc8, 0xc9, 0xd0, 0xd1, 0xd8, 0xd9, 0xe7,
-      0xfe, 0xff,
-  };
-  static constexpr singleton singletons1[] = {
-      {0x00, 6},  {0x01, 1}, {0x03, 1},  {0x04, 2}, {0x08, 8},  {0x09, 2},
-      {0x0a, 5},  {0x0b, 2}, {0x0e, 4},  {0x10, 1}, {0x11, 2},  {0x12, 5},
-      {0x13, 17}, {0x14, 1}, {0x15, 2},  {0x17, 2}, {0x19, 13}, {0x1c, 5},
-      {0x1d, 8},  {0x24, 1}, {0x6a, 3},  {0x6b, 2}, {0xbc, 2},  {0xd1, 2},
-      {0xd4, 12}, {0xd5, 9}, {0xd6, 2},  {0xd7, 2}, {0xda, 1},  {0xe0, 5},
-      {0xe1, 2},  {0xe8, 2}, {0xee, 32}, {0xf0, 4}, {0xf8, 2},  {0xf9, 2},
-      {0xfa, 2},  {0xfb, 1},
-  };
-  static constexpr unsigned char singletons1_lower[] = {
-      0x0c, 0x27, 0x3b, 0x3e, 0x4e, 0x4f, 0x8f, 0x9e, 0x9e, 0x9f, 0x06, 0x07,
-      0x09, 0x36, 0x3d, 0x3e, 0x56, 0xf3, 0xd0, 0xd1, 0x04, 0x14, 0x18, 0x36,
-      0x37, 0x56, 0x57, 0x7f, 0xaa, 0xae, 0xaf, 0xbd, 0x35, 0xe0, 0x12, 0x87,
-      0x89, 0x8e, 0x9e, 0x04, 0x0d, 0x0e, 0x11, 0x12, 0x29, 0x31, 0x34, 0x3a,
-      0x45, 0x46, 0x49, 0x4a, 0x4e, 0x4f, 0x64, 0x65, 0x5c, 0xb6, 0xb7, 0x1b,
-      0x1c, 0x07, 0x08, 0x0a, 0x0b, 0x14, 0x17, 0x36, 0x39, 0x3a, 0xa8, 0xa9,
-      0xd8, 0xd9, 0x09, 0x37, 0x90, 0x91, 0xa8, 0x07, 0x0a, 0x3b, 0x3e, 0x66,
-      0x69, 0x8f, 0x92, 0x6f, 0x5f, 0xee, 0xef, 0x5a, 0x62, 0x9a, 0x9b, 0x27,
-      0x28, 0x55, 0x9d, 0xa0, 0xa1, 0xa3, 0xa4, 0xa7, 0xa8, 0xad, 0xba, 0xbc,
-      0xc4, 0x06, 0x0b, 0x0c, 0x15, 0x1d, 0x3a, 0x3f, 0x45, 0x51, 0xa6, 0xa7,
-      0xcc, 0xcd, 0xa0, 0x07, 0x19, 0x1a, 0x22, 0x25, 0x3e, 0x3f, 0xc5, 0xc6,
-      0x04, 0x20, 0x23, 0x25, 0x26, 0x28, 0x33, 0x38, 0x3a, 0x48, 0x4a, 0x4c,
-      0x50, 0x53, 0x55, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x63, 0x65, 0x66,
-      0x6b, 0x73, 0x78, 0x7d, 0x7f, 0x8a, 0xa4, 0xaa, 0xaf, 0xb0, 0xc0, 0xd0,
-      0xae, 0xaf, 0x79, 0xcc, 0x6e, 0x6f, 0x93,
-  };
-  static constexpr unsigned char normal0[] = {
-      0x00, 0x20, 0x5f, 0x22, 0x82, 0xdf, 0x04, 0x82, 0x44, 0x08, 0x1b, 0x04,
-      0x06, 0x11, 0x81, 0xac, 0x0e, 0x80, 0xab, 0x35, 0x28, 0x0b, 0x80, 0xe0,
-      0x03, 0x19, 0x08, 0x01, 0x04, 0x2f, 0x04, 0x34, 0x04, 0x07, 0x03, 0x01,
-      0x07, 0x06, 0x07, 0x11, 0x0a, 0x50, 0x0f, 0x12, 0x07, 0x55, 0x07, 0x03,
-      0x04, 0x1c, 0x0a, 0x09, 0x03, 0x08, 0x03, 0x07, 0x03, 0x02, 0x03, 0x03,
-      0x03, 0x0c, 0x04, 0x05, 0x03, 0x0b, 0x06, 0x01, 0x0e, 0x15, 0x05, 0x3a,
-      0x03, 0x11, 0x07, 0x06, 0x05, 0x10, 0x07, 0x57, 0x07, 0x02, 0x07, 0x15,
-      0x0d, 0x50, 0x04, 0x43, 0x03, 0x2d, 0x03, 0x01, 0x04, 0x11, 0x06, 0x0f,
-      0x0c, 0x3a, 0x04, 0x1d, 0x25, 0x5f, 0x20, 0x6d, 0x04, 0x6a, 0x25, 0x80,
-      0xc8, 0x05, 0x82, 0xb0, 0x03, 0x1a, 0x06, 0x82, 0xfd, 0x03, 0x59, 0x07,
-      0x15, 0x0b, 0x17, 0x09, 0x14, 0x0c, 0x14, 0x0c, 0x6a, 0x06, 0x0a, 0x06,
-      0x1a, 0x06, 0x59, 0x07, 0x2b, 0x05, 0x46, 0x0a, 0x2c, 0x04, 0x0c, 0x04,
-      0x01, 0x03, 0x31, 0x0b, 0x2c, 0x04, 0x1a, 0x06, 0x0b, 0x03, 0x80, 0xac,
-      0x06, 0x0a, 0x06, 0x21, 0x3f, 0x4c, 0x04, 0x2d, 0x03, 0x74, 0x08, 0x3c,
-      0x03, 0x0f, 0x03, 0x3c, 0x07, 0x38, 0x08, 0x2b, 0x05, 0x82, 0xff, 0x11,
-      0x18, 0x08, 0x2f, 0x11, 0x2d, 0x03, 0x20, 0x10, 0x21, 0x0f, 0x80, 0x8c,
-      0x04, 0x82, 0x97, 0x19, 0x0b, 0x15, 0x88, 0x94, 0x05, 0x2f, 0x05, 0x3b,
-      0x07, 0x02, 0x0e, 0x18, 0x09, 0x80, 0xb3, 0x2d, 0x74, 0x0c, 0x80, 0xd6,
-      0x1a, 0x0c, 0x05, 0x80, 0xff, 0x05, 0x80, 0xdf, 0x0c, 0xee, 0x0d, 0x03,
-      0x84, 0x8d, 0x03, 0x37, 0x09, 0x81, 0x5c, 0x14, 0x80, 0xb8, 0x08, 0x80,
-      0xcb, 0x2a, 0x38, 0x03, 0x0a, 0x06, 0x38, 0x08, 0x46, 0x08, 0x0c, 0x06,
-      0x74, 0x0b, 0x1e, 0x03, 0x5a, 0x04, 0x59, 0x09, 0x80, 0x83, 0x18, 0x1c,
-      0x0a, 0x16, 0x09, 0x4c, 0x04, 0x80, 0x8a, 0x06, 0xab, 0xa4, 0x0c, 0x17,
-      0x04, 0x31, 0xa1, 0x04, 0x81, 0xda, 0x26, 0x07, 0x0c, 0x05, 0x05, 0x80,
-      0xa5, 0x11, 0x81, 0x6d, 0x10, 0x78, 0x28, 0x2a, 0x06, 0x4c, 0x04, 0x80,
-      0x8d, 0x04, 0x80, 0xbe, 0x03, 0x1b, 0x03, 0x0f, 0x0d,
-  };
-  static constexpr unsigned char normal1[] = {
-      0x5e, 0x22, 0x7b, 0x05, 0x03, 0x04, 0x2d, 0x03, 0x66, 0x03, 0x01, 0x2f,
-      0x2e, 0x80, 0x82, 0x1d, 0x03, 0x31, 0x0f, 0x1c, 0x04, 0x24, 0x09, 0x1e,
-      0x05, 0x2b, 0x05, 0x44, 0x04, 0x0e, 0x2a, 0x80, 0xaa, 0x06, 0x24, 0x04,
-      0x24, 0x04, 0x28, 0x08, 0x34, 0x0b, 0x01, 0x80, 0x90, 0x81, 0x37, 0x09,
-      0x16, 0x0a, 0x08, 0x80, 0x98, 0x39, 0x03, 0x63, 0x08, 0x09, 0x30, 0x16,
-      0x05, 0x21, 0x03, 0x1b, 0x05, 0x01, 0x40, 0x38, 0x04, 0x4b, 0x05, 0x2f,
-      0x04, 0x0a, 0x07, 0x09, 0x07, 0x40, 0x20, 0x27, 0x04, 0x0c, 0x09, 0x36,
-      0x03, 0x3a, 0x05, 0x1a, 0x07, 0x04, 0x0c, 0x07, 0x50, 0x49, 0x37, 0x33,
-      0x0d, 0x33, 0x07, 0x2e, 0x08, 0x0a, 0x81, 0x26, 0x52, 0x4e, 0x28, 0x08,
-      0x2a, 0x56, 0x1c, 0x14, 0x17, 0x09, 0x4e, 0x04, 0x1e, 0x0f, 0x43, 0x0e,
-      0x19, 0x07, 0x0a, 0x06, 0x48, 0x08, 0x27, 0x09, 0x75, 0x0b, 0x3f, 0x41,
-      0x2a, 0x06, 0x3b, 0x05, 0x0a, 0x06, 0x51, 0x06, 0x01, 0x05, 0x10, 0x03,
-      0x05, 0x80, 0x8b, 0x62, 0x1e, 0x48, 0x08, 0x0a, 0x80, 0xa6, 0x5e, 0x22,
-      0x45, 0x0b, 0x0a, 0x06, 0x0d, 0x13, 0x39, 0x07, 0x0a, 0x36, 0x2c, 0x04,
-      0x10, 0x80, 0xc0, 0x3c, 0x64, 0x53, 0x0c, 0x48, 0x09, 0x0a, 0x46, 0x45,
-      0x1b, 0x48, 0x08, 0x53, 0x1d, 0x39, 0x81, 0x07, 0x46, 0x0a, 0x1d, 0x03,
-      0x47, 0x49, 0x37, 0x03, 0x0e, 0x08, 0x0a, 0x06, 0x39, 0x07, 0x0a, 0x81,
-      0x36, 0x19, 0x80, 0xb7, 0x01, 0x0f, 0x32, 0x0d, 0x83, 0x9b, 0x66, 0x75,
-      0x0b, 0x80, 0xc4, 0x8a, 0xbc, 0x84, 0x2f, 0x8f, 0xd1, 0x82, 0x47, 0xa1,
-      0xb9, 0x82, 0x39, 0x07, 0x2a, 0x04, 0x02, 0x60, 0x26, 0x0a, 0x46, 0x0a,
-      0x28, 0x05, 0x13, 0x82, 0xb0, 0x5b, 0x65, 0x4b, 0x04, 0x39, 0x07, 0x11,
-      0x40, 0x05, 0x0b, 0x02, 0x0e, 0x97, 0xf8, 0x08, 0x84, 0xd6, 0x2a, 0x09,
-      0xa2, 0xf7, 0x81, 0x1f, 0x31, 0x03, 0x11, 0x04, 0x08, 0x81, 0x8c, 0x89,
-      0x04, 0x6b, 0x05, 0x0d, 0x03, 0x09, 0x07, 0x10, 0x93, 0x60, 0x80, 0xf6,
-      0x0a, 0x73, 0x08, 0x6e, 0x17, 0x46, 0x80, 0x9a, 0x14, 0x0c, 0x57, 0x09,
-      0x19, 0x80, 0x87, 0x81, 0x47, 0x03, 0x85, 0x42, 0x0f, 0x15, 0x85, 0x50,
-      0x2b, 0x80, 0xd5, 0x2d, 0x03, 0x1a, 0x04, 0x02, 0x81, 0x70, 0x3a, 0x05,
-      0x01, 0x85, 0x00, 0x80, 0xd7, 0x29, 0x4c, 0x04, 0x0a, 0x04, 0x02, 0x83,
-      0x11, 0x44, 0x4c, 0x3d, 0x80, 0xc2, 0x3c, 0x06, 0x01, 0x04, 0x55, 0x05,
-      0x1b, 0x34, 0x02, 0x81, 0x0e, 0x2c, 0x04, 0x64, 0x0c, 0x56, 0x0a, 0x80,
-      0xae, 0x38, 0x1d, 0x0d, 0x2c, 0x04, 0x09, 0x07, 0x02, 0x0e, 0x06, 0x80,
-      0x9a, 0x83, 0xd8, 0x08, 0x0d, 0x03, 0x0d, 0x03, 0x74, 0x0c, 0x59, 0x07,
-      0x0c, 0x14, 0x0c, 0x04, 0x38, 0x08, 0x0a, 0x06, 0x28, 0x08, 0x22, 0x4e,
-      0x81, 0x54, 0x0c, 0x15, 0x03, 0x03, 0x05, 0x07, 0x09, 0x19, 0x07, 0x07,
-      0x09, 0x03, 0x0d, 0x07, 0x29, 0x80, 0xcb, 0x25, 0x0a, 0x84, 0x06,
-  };
-  auto lower = static_cast<uint16_t>(cp);
-  if (cp < 0x10000) {
-    return is_printable(lower, singletons0,
-                        sizeof(singletons0) / sizeof(*singletons0),
-                        singletons0_lower, normal0, sizeof(normal0));
-  }
-  if (cp < 0x20000) {
-    return is_printable(lower, singletons1,
-                        sizeof(singletons1) / sizeof(*singletons1),
-                        singletons1_lower, normal1, sizeof(normal1));
-  }
-  if (0x2a6de <= cp && cp < 0x2a700) return false;
-  if (0x2b735 <= cp && cp < 0x2b740) return false;
-  if (0x2b81e <= cp && cp < 0x2b820) return false;
-  if (0x2cea2 <= cp && cp < 0x2ceb0) return false;
-  if (0x2ebe1 <= cp && cp < 0x2f800) return false;
-  if (0x2fa1e <= cp && cp < 0x30000) return false;
-  if (0x3134b <= cp && cp < 0xe0100) return false;
-  if (0xe01f0 <= cp && cp < 0x110000) return false;
-  return cp < 0x110000;
-}
-
-inline auto needs_escape(uint32_t cp) -> bool {
-  return cp < 0x20 || cp == 0x7f || cp == '"' || cp == '\\' ||
-         !is_printable(cp);
-}
-
-template <typename Char> struct find_escape_result {
-  const Char* begin;
-  const Char* end;
-  uint32_t cp;
 };
 
-template <typename Char>
-auto find_escape(const Char* begin, const Char* end)
-    -> find_escape_result<Char> {
-  for (; begin != end; ++begin) {
-    auto cp = static_cast<typename std::make_unsigned<Char>::type>(*begin);
-    if (sizeof(Char) == 1 && cp >= 0x80) continue;
-    if (needs_escape(cp)) return {begin, begin + 1, cp};
-  }
-  return {begin, nullptr, 0};
-}
-
-inline auto find_escape(const char* begin, const char* end)
-    -> find_escape_result<char> {
-  if (!is_utf8()) return find_escape<char>(begin, end);
-  auto result = find_escape_result<char>{end, nullptr, 0};
-  for_each_codepoint(string_view(begin, to_unsigned(end - begin)),
-                     [&](uint32_t cp, string_view sv) {
-                       if (needs_escape(cp)) {
-                         result = {sv.begin(), sv.end(), cp};
-                         return false;
-                       }
-                       return true;
-                     });
-  return result;
-}
-
-template <typename Char, typename OutputIt>
-auto write_range_entry(OutputIt out, basic_string_view<Char> str) -> OutputIt {
-  *out++ = '"';
-  auto begin = str.begin(), end = str.end();
-  do {
-    auto escape = find_escape(begin, end);
-    out = copy_str<Char>(begin, escape.begin, out);
-    begin = escape.end;
-    if (!begin) break;
-    auto c = static_cast<Char>(escape.cp);
-    switch (escape.cp) {
-    case '\n':
-      *out++ = '\\';
-      c = 'n';
-      break;
-    case '\r':
-      *out++ = '\\';
-      c = 'r';
-      break;
-    case '\t':
-      *out++ = '\\';
-      c = 't';
-      break;
-    case '"':
-      FMT_FALLTHROUGH;
-    case '\\':
-      *out++ = '\\';
-      break;
-    default:
-      if (is_utf8()) {
-        if (escape.cp < 0x100) {
-          out = format_to(out, "\\x{:02x}", escape.cp);
-          continue;
-        }
-        if (escape.cp < 0x10000) {
-          out = format_to(out, "\\u{:04x}", escape.cp);
-          continue;
-        }
-        if (escape.cp < 0x110000) {
-          out = format_to(out, "\\U{:08x}", escape.cp);
-          continue;
-        }
-      }
-      for (Char escape_char : basic_string_view<Char>(
-               escape.begin, to_unsigned(escape.end - escape.begin))) {
-        out = format_to(
-            out, "\\x{:02x}",
-            static_cast<typename std::make_unsigned<Char>::type>(escape_char));
-      }
-      continue;
-    }
-    *out++ = c;
-  } while (begin != end);
-  *out++ = '"';
-  return out;
-}
-
-template <typename Char, typename OutputIt, typename T,
-          FMT_ENABLE_IF(std::is_convertible<T, std_string_view<char>>::value)>
-inline auto write_range_entry(OutputIt out, const T& str) -> OutputIt {
-  auto sv = std_string_view<Char>(str);
-  return write_range_entry<Char>(out, basic_string_view<Char>(sv));
-}
-
-template <typename Char, typename OutputIt, typename Arg,
-          FMT_ENABLE_IF(std::is_same<Arg, Char>::value)>
-OutputIt write_range_entry(OutputIt out, const Arg v) {
-  *out++ = '\'';
-  *out++ = v;
-  *out++ = '\'';
-  return out;
-}
-
-template <
-    typename Char, typename OutputIt, typename Arg,
-    FMT_ENABLE_IF(!is_std_string_like<typename std::decay<Arg>::type>::value &&
-                  !std::is_same<Arg, Char>::value)>
-OutputIt write_range_entry(OutputIt out, const Arg& v) {
-  return write<Char>(out, v);
-}
-
 }  // namespace detail
 
 template <typename T> struct is_tuple_like {
-  static FMT_CONSTEXPR_DECL const bool value =
+  static constexpr const bool value =
       detail::is_tuple_like_<T>::value && !detail::is_range_<T>::value;
 };
 
-template <typename TupleT, typename Char>
+template <typename T, typename C> struct is_tuple_formattable {
-struct formatter<TupleT, Char, enable_if_t<fmt::is_tuple_like<TupleT>::value>> {
+  static constexpr const bool value =
+      detail::is_tuple_formattable_<T, C>::value;
+};
+
+template <typename Tuple, typename Char>
+struct formatter<Tuple, Char,
+                 enable_if_t<fmt::is_tuple_like<Tuple>::value &&
+                             fmt::is_tuple_formattable<Tuple, Char>::value>> {
  private:
-  // C++11 generic lambda for format().
+  decltype(detail::tuple::get_formatters<Tuple, Char>(
-  template <typename FormatContext> struct format_each {
+      detail::tuple_index_sequence<Tuple>())) formatters_;
-    template <typename T> void operator()(const T& v) {
+
-      if (i > 0) out = detail::write_delimiter(out);
+  basic_string_view<Char> separator_ = detail::string_literal<Char, ',', ' '>{};
-      out = detail::write_range_entry<Char>(out, v);
+  basic_string_view<Char> opening_bracket_ =
-      ++i;
+      detail::string_literal<Char, '('>{};
-    }
+  basic_string_view<Char> closing_bracket_ =
-    int i;
+      detail::string_literal<Char, ')'>{};
-    typename FormatContext::iterator& out;
-  };
 
  public:
-  template <typename ParseContext>
+  FMT_CONSTEXPR formatter() {}
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+
-    return ctx.begin();
+  FMT_CONSTEXPR void set_separator(basic_string_view<Char> sep) {
+    separator_ = sep;
   }
 
-  template <typename FormatContext = format_context>
+  FMT_CONSTEXPR void set_brackets(basic_string_view<Char> open,
-  auto format(const TupleT& values, FormatContext& ctx) -> decltype(ctx.out()) {
+                                  basic_string_view<Char> close) {
-    auto out = ctx.out();
+    opening_bracket_ = open;
-    *out++ = '(';
+    closing_bracket_ = close;
-    detail::for_each(values, format_each<FormatContext>{0, out});
+  }
-    *out++ = ')';
+
-    return out;
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    auto it = ctx.begin();
+    if (it != ctx.end() && *it != '}')
+      FMT_THROW(format_error("invalid format specifier"));
+    detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx});
+    return it;
+  }
+
+  template <typename FormatContext>
+  auto format(const Tuple& value, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    ctx.advance_to(detail::copy_str<Char>(opening_bracket_, ctx.out()));
+    detail::for_each2(
+        formatters_, value,
+        detail::format_tuple_element<FormatContext>{0, ctx, separator_});
+    return detail::copy_str<Char>(closing_bracket_, ctx.out());
   }
 };
 
 template <typename T, typename Char> struct is_range {
-  static FMT_CONSTEXPR_DECL const bool value =
+  static constexpr const bool value =
       detail::is_range_<T>::value && !detail::is_std_string_like<T>::value &&
-      !detail::is_map<T>::value &&
       !std::is_convertible<T, std::basic_string<Char>>::value &&
-      !std::is_constructible<detail::std_string_view<Char>, T>::value;
+      !std::is_convertible<T, detail::std_string_view<Char>>::value;
 };
 
-template <typename T, typename Char>
+namespace detail {
-struct formatter<
+template <typename Context> struct range_mapper {
-    T, Char,
+  using mapper = arg_mapper<Context>;
-    enable_if_t<
+
-        fmt::is_range<T, Char>::value
+  template <typename T,
-// Workaround a bug in MSVC 2019 and earlier.
+            FMT_ENABLE_IF(has_formatter<remove_cvref_t<T>, Context>::value)>
-#if !FMT_MSC_VER
+  static auto map(T&& value) -> T&& {
-        && (is_formattable<detail::value_type<T>, Char>::value ||
+    return static_cast<T&&>(value);
-            detail::has_fallback_formatter<detail::value_type<T>, Char>::value)
+  }
+  template <typename T,
+            FMT_ENABLE_IF(!has_formatter<remove_cvref_t<T>, Context>::value)>
+  static auto map(T&& value)
+      -> decltype(mapper().map(static_cast<T&&>(value))) {
+    return mapper().map(static_cast<T&&>(value));
+  }
+};
+
+template <typename Char, typename Element>
+using range_formatter_type =
+    formatter<remove_cvref_t<decltype(range_mapper<buffer_context<Char>>{}.map(
+                  std::declval<Element>()))>,
+              Char>;
+
+template <typename R>
+using maybe_const_range =
+    conditional_t<has_const_begin_end<R>::value, const R, R>;
+
+// Workaround a bug in MSVC 2015 and earlier.
+#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910
+template <typename R, typename Char>
+struct is_formattable_delayed
+    : is_formattable<uncvref_type<maybe_const_range<R>>, Char> {};
 #endif
-        >> {
+}  // namespace detail
-  template <typename ParseContext>
+
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+template <typename...> struct conjunction : std::true_type {};
-    return ctx.begin();
+template <typename P> struct conjunction<P> : P {};
+template <typename P1, typename... Pn>
+struct conjunction<P1, Pn...>
+    : conditional_t<bool(P1::value), conjunction<Pn...>, P1> {};
+
+template <typename T, typename Char, typename Enable = void>
+struct range_formatter;
+
+template <typename T, typename Char>
+struct range_formatter<
+    T, Char,
+    enable_if_t<conjunction<std::is_same<T, remove_cvref_t<T>>,
+                            is_formattable<T, Char>>::value>> {
+ private:
+  detail::range_formatter_type<Char, T> underlying_;
+  basic_string_view<Char> separator_ = detail::string_literal<Char, ',', ' '>{};
+  basic_string_view<Char> opening_bracket_ =
+      detail::string_literal<Char, '['>{};
+  basic_string_view<Char> closing_bracket_ =
+      detail::string_literal<Char, ']'>{};
+
+ public:
+  FMT_CONSTEXPR range_formatter() {}
+
+  FMT_CONSTEXPR auto underlying() -> detail::range_formatter_type<Char, T>& {
+    return underlying_;
   }
 
-  template <
+  FMT_CONSTEXPR void set_separator(basic_string_view<Char> sep) {
-      typename FormatContext, typename U,
+    separator_ = sep;
-      FMT_ENABLE_IF(
+  }
-          std::is_same<U, conditional_t<detail::has_const_begin_end<T>::value,
+
-                                        const T, T>>::value)>
+  FMT_CONSTEXPR void set_brackets(basic_string_view<Char> open,
-  auto format(U& range, FormatContext& ctx) -> decltype(ctx.out()) {
+                                  basic_string_view<Char> close) {
-#ifdef FMT_DEPRECATED_BRACED_RANGES
+    opening_bracket_ = open;
-    Char prefix = '{';
+    closing_bracket_ = close;
-    Char postfix = '}';
+  }
-#else
+
-    Char prefix = detail::is_set<T>::value ? '{' : '[';
+  template <typename ParseContext>
-    Char postfix = detail::is_set<T>::value ? '}' : ']';
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
-#endif
+    auto it = ctx.begin();
+    auto end = ctx.end();
+
+    if (it != end && *it == 'n') {
+      set_brackets({}, {});
+      ++it;
+    }
+
+    if (it != end && *it != '}') {
+      if (*it != ':') FMT_THROW(format_error("invalid format specifier"));
+      ++it;
+    } else {
+      detail::maybe_set_debug_format(underlying_, true);
+    }
+
+    ctx.advance_to(it);
+    return underlying_.parse(ctx);
+  }
+
+  template <typename R, typename FormatContext>
+  auto format(R&& range, FormatContext& ctx) const -> decltype(ctx.out()) {
+    detail::range_mapper<buffer_context<Char>> mapper;
     auto out = ctx.out();
-    *out++ = prefix;
+    out = detail::copy_str<Char>(opening_bracket_, out);
     int i = 0;
-    auto it = std::begin(range);
+    auto it = detail::range_begin(range);
-    auto end = std::end(range);
+    auto end = detail::range_end(range);
     for (; it != end; ++it) {
-      if (i > 0) out = detail::write_delimiter(out);
+      if (i > 0) out = detail::copy_str<Char>(separator_, out);
-      out = detail::write_range_entry<Char>(out, *it);
+      ctx.advance_to(out);
+      auto&& item = *it;
+      out = underlying_.format(mapper.map(item), ctx);
       ++i;
     }
-    *out++ = postfix;
+    out = detail::copy_str<Char>(closing_bracket_, out);
     return out;
   }
 };
 
-template <typename T, typename Char>
+enum class range_format { disabled, map, set, sequence, string, debug_string };
-struct formatter<
+
-    T, Char,
+namespace detail {
-    enable_if_t<
+template <typename T>
-        detail::is_map<T>::value
+struct range_format_kind_
-// Workaround a bug in MSVC 2019 and earlier.
+    : std::integral_constant<range_format,
-#if !FMT_MSC_VER
+                             std::is_same<uncvref_type<T>, T>::value
-        && (is_formattable<detail::value_type<T>, Char>::value ||
+                                 ? range_format::disabled
-            detail::has_fallback_formatter<detail::value_type<T>, Char>::value)
+                             : is_map<T>::value ? range_format::map
-#endif
+                             : is_set<T>::value ? range_format::set
-        >> {
+                                                : range_format::sequence> {};
-  template <typename ParseContext>
+
-  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+template <range_format K, typename R, typename Char, typename Enable = void>
-    return ctx.begin();
+struct range_default_formatter;
+
+template <range_format K>
+using range_format_constant = std::integral_constant<range_format, K>;
+
+template <range_format K, typename R, typename Char>
+struct range_default_formatter<
+    K, R, Char,
+    enable_if_t<(K == range_format::sequence || K == range_format::map ||
+                 K == range_format::set)>> {
+  using range_type = detail::maybe_const_range<R>;
+  range_formatter<detail::uncvref_type<range_type>, Char> underlying_;
+
+  FMT_CONSTEXPR range_default_formatter() { init(range_format_constant<K>()); }
+
+  FMT_CONSTEXPR void init(range_format_constant<range_format::set>) {
+    underlying_.set_brackets(detail::string_literal<Char, '{'>{},
+                             detail::string_literal<Char, '}'>{});
   }
 
-  template <
+  FMT_CONSTEXPR void init(range_format_constant<range_format::map>) {
-      typename FormatContext, typename U,
+    underlying_.set_brackets(detail::string_literal<Char, '{'>{},
-      FMT_ENABLE_IF(
+                             detail::string_literal<Char, '}'>{});
-          std::is_same<U, conditional_t<detail::has_const_begin_end<T>::value,
+    underlying_.underlying().set_brackets({}, {});
-                                        const T, T>>::value)>
+    underlying_.underlying().set_separator(
-  auto format(U& map, FormatContext& ctx) -> decltype(ctx.out()) {
+        detail::string_literal<Char, ':', ' '>{});
-    auto out = ctx.out();
-    *out++ = '{';
-    int i = 0;
-    for (const auto& item : map) {
-      if (i > 0) out = detail::write_delimiter(out);
-      out = detail::write_range_entry<Char>(out, item.first);
-      *out++ = ':';
-      *out++ = ' ';
-      out = detail::write_range_entry<Char>(out, item.second);
-      ++i;
   }
-    *out++ = '}';
+
-    return out;
+  FMT_CONSTEXPR void init(range_format_constant<range_format::sequence>) {}
+
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    return underlying_.parse(ctx);
   }
+
+  template <typename FormatContext>
+  auto format(range_type& range, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return underlying_.format(range, ctx);
+  }
+};
+}  // namespace detail
+
+template <typename T, typename Char, typename Enable = void>
+struct range_format_kind
+    : conditional_t<
+          is_range<T, Char>::value, detail::range_format_kind_<T>,
+          std::integral_constant<range_format, range_format::disabled>> {};
+
+template <typename R, typename Char>
+struct formatter<
+    R, Char,
+    enable_if_t<conjunction<bool_constant<range_format_kind<R, Char>::value !=
+                                          range_format::disabled>
+// Workaround a bug in MSVC 2015 and earlier.
+#if !FMT_MSC_VERSION || FMT_MSC_VERSION >= 1910
+                            ,
+                            detail::is_formattable_delayed<R, Char>
+#endif
+                            >::value>>
+    : detail::range_default_formatter<range_format_kind<R, Char>::value, R,
+                                      Char> {
 };
 
 template <typename Char, typename... T> struct tuple_join_view : detail::view {
@@ -672,9 +582,6 @@ template <typename Char, typename... T> struct tuple_join_view : detail::view {
       : tuple(t), sep{s} {}
 };
 
-template <typename Char, typename... T>
-using tuple_arg_join = tuple_join_view<Char, T...>;
-
 // Define FMT_TUPLE_JOIN_SPECIFIERS to enable experimental format specifiers
 // support in tuple_join. It is disabled by default because of issues with
 // the dynamic width and precision.
@@ -744,7 +651,45 @@ struct formatter<tuple_join_view<Char, T...>, Char> {
   }
 };
 
-FMT_MODULE_EXPORT_BEGIN
+namespace detail {
+// Check if T has an interface like a container adaptor (e.g. std::stack,
+// std::queue, std::priority_queue).
+template <typename T> class is_container_adaptor_like {
+  template <typename U> static auto check(U* p) -> typename U::container_type;
+  template <typename> static void check(...);
+
+ public:
+  static constexpr const bool value =
+      !std::is_void<decltype(check<T>(nullptr))>::value;
+};
+
+template <typename Container> struct all {
+  const Container& c;
+  auto begin() const -> typename Container::const_iterator { return c.begin(); }
+  auto end() const -> typename Container::const_iterator { return c.end(); }
+};
+}  // namespace detail
+
+template <typename T, typename Char>
+struct formatter<
+    T, Char,
+    enable_if_t<conjunction<detail::is_container_adaptor_like<T>,
+                            bool_constant<range_format_kind<T, Char>::value ==
+                                          range_format::disabled>>::value>>
+    : formatter<detail::all<typename T::container_type>, Char> {
+  using all = detail::all<typename T::container_type>;
+  template <typename FormatContext>
+  auto format(const T& t, FormatContext& ctx) const -> decltype(ctx.out()) {
+    struct getter : T {
+      static auto get(const T& t) -> all {
+        return {t.*(&getter::c)};  // Access c through the derived class.
+      }
+    };
+    return formatter<all>::format(getter::get(t), ctx);
+  }
+};
+
+FMT_BEGIN_EXPORT
 
 /**
   \rst
@@ -787,7 +732,7 @@ auto join(std::initializer_list<T> list, string_view sep)
   return join(std::begin(list), std::end(list), sep);
 }
 
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_RANGES_H_

vendor/spdlog/fmt/bundled/std.h

@@ -0,0 +1,537 @@
+// Formatting library for C++ - formatters for standard library types
+//
+// Copyright (c) 2012 - present, Victor Zverovich
+// All rights reserved.
+//
+// For the license information refer to format.h.
+
+#ifndef FMT_STD_H_
+#define FMT_STD_H_
+
+#include <atomic>
+#include <bitset>
+#include <cstdlib>
+#include <exception>
+#include <memory>
+#include <thread>
+#include <type_traits>
+#include <typeinfo>
+#include <utility>
+#include <vector>
+
+#include "format.h"
+#include "ostream.h"
+
+#if FMT_HAS_INCLUDE(<version>)
+#  include <version>
+#endif
+// Checking FMT_CPLUSPLUS for warning suppression in MSVC.
+#if FMT_CPLUSPLUS >= 201703L
+#  if FMT_HAS_INCLUDE(<filesystem>)
+#    include <filesystem>
+#  endif
+#  if FMT_HAS_INCLUDE(<variant>)
+#    include <variant>
+#  endif
+#  if FMT_HAS_INCLUDE(<optional>)
+#    include <optional>
+#  endif
+#endif
+
+#if FMT_CPLUSPLUS > 201703L && FMT_HAS_INCLUDE(<source_location>)
+#  include <source_location>
+#endif
+
+// GCC 4 does not support FMT_HAS_INCLUDE.
+#if FMT_HAS_INCLUDE(<cxxabi.h>) || defined(__GLIBCXX__)
+#  include <cxxabi.h>
+// Android NDK with gabi++ library on some architectures does not implement
+// abi::__cxa_demangle().
+#  ifndef __GABIXX_CXXABI_H__
+#    define FMT_HAS_ABI_CXA_DEMANGLE
+#  endif
+#endif
+
+// Check if typeid is available.
+#ifndef FMT_USE_TYPEID
+// __RTTI is for EDG compilers. In MSVC typeid is available without RTTI.
+#  if defined(__GXX_RTTI) || FMT_HAS_FEATURE(cxx_rtti) || FMT_MSC_VERSION || \
+      defined(__INTEL_RTTI__) || defined(__RTTI)
+#    define FMT_USE_TYPEID 1
+#  else
+#    define FMT_USE_TYPEID 0
+#  endif
+#endif
+
+// For older Xcode versions, __cpp_lib_xxx flags are inaccurately defined.
+#ifndef FMT_CPP_LIB_FILESYSTEM
+#  ifdef __cpp_lib_filesystem
+#    define FMT_CPP_LIB_FILESYSTEM __cpp_lib_filesystem
+#  else
+#    define FMT_CPP_LIB_FILESYSTEM 0
+#  endif
+#endif
+
+#ifndef FMT_CPP_LIB_VARIANT
+#  ifdef __cpp_lib_variant
+#    define FMT_CPP_LIB_VARIANT __cpp_lib_variant
+#  else
+#    define FMT_CPP_LIB_VARIANT 0
+#  endif
+#endif
+
+#if FMT_CPP_LIB_FILESYSTEM
+FMT_BEGIN_NAMESPACE
+
+namespace detail {
+
+template <typename Char, typename PathChar>
+auto get_path_string(const std::filesystem::path& p,
+                     const std::basic_string<PathChar>& native) {
+  if constexpr (std::is_same_v<Char, char> && std::is_same_v<PathChar, wchar_t>)
+    return to_utf8<wchar_t>(native, to_utf8_error_policy::replace);
+  else
+    return p.string<Char>();
+}
+
+template <typename Char, typename PathChar>
+void write_escaped_path(basic_memory_buffer<Char>& quoted,
+                        const std::filesystem::path& p,
+                        const std::basic_string<PathChar>& native) {
+  if constexpr (std::is_same_v<Char, char> &&
+                std::is_same_v<PathChar, wchar_t>) {
+    auto buf = basic_memory_buffer<wchar_t>();
+    write_escaped_string<wchar_t>(std::back_inserter(buf), native);
+    bool valid = to_utf8<wchar_t>::convert(quoted, {buf.data(), buf.size()});
+    FMT_ASSERT(valid, "invalid utf16");
+  } else if constexpr (std::is_same_v<Char, PathChar>) {
+    write_escaped_string<std::filesystem::path::value_type>(
+        std::back_inserter(quoted), native);
+  } else {
+    write_escaped_string<Char>(std::back_inserter(quoted), p.string<Char>());
+  }
+}
+
+}  // namespace detail
+
+FMT_EXPORT
+template <typename Char> struct formatter<std::filesystem::path, Char> {
+ private:
+  format_specs<Char> specs_;
+  detail::arg_ref<Char> width_ref_;
+  bool debug_ = false;
+  char path_type_ = 0;
+
+ public:
+  FMT_CONSTEXPR void set_debug_format(bool set = true) { debug_ = set; }
+
+  template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
+    auto it = ctx.begin(), end = ctx.end();
+    if (it == end) return it;
+
+    it = detail::parse_align(it, end, specs_);
+    if (it == end) return it;
+
+    it = detail::parse_dynamic_spec(it, end, specs_.width, width_ref_, ctx);
+    if (it != end && *it == '?') {
+      debug_ = true;
+      ++it;
+    }
+    if (it != end && (*it == 'g')) path_type_ = *it++;
+    return it;
+  }
+
+  template <typename FormatContext>
+  auto format(const std::filesystem::path& p, FormatContext& ctx) const {
+    auto specs = specs_;
+#  ifdef _WIN32
+    auto path_string = !path_type_ ? p.native() : p.generic_wstring();
+#  else
+    auto path_string = !path_type_ ? p.native() : p.generic_string();
+#  endif
+
+    detail::handle_dynamic_spec<detail::width_checker>(specs.width, width_ref_,
+                                                       ctx);
+    if (!debug_) {
+      auto s = detail::get_path_string<Char>(p, path_string);
+      return detail::write(ctx.out(), basic_string_view<Char>(s), specs);
+    }
+    auto quoted = basic_memory_buffer<Char>();
+    detail::write_escaped_path(quoted, p, path_string);
+    return detail::write(ctx.out(),
+                         basic_string_view<Char>(quoted.data(), quoted.size()),
+                         specs);
+  }
+};
+FMT_END_NAMESPACE
+#endif  // FMT_CPP_LIB_FILESYSTEM
+
+FMT_BEGIN_NAMESPACE
+FMT_EXPORT
+template <std::size_t N, typename Char>
+struct formatter<std::bitset<N>, Char> : nested_formatter<string_view> {
+ private:
+  // Functor because C++11 doesn't support generic lambdas.
+  struct writer {
+    const std::bitset<N>& bs;
+
+    template <typename OutputIt>
+    FMT_CONSTEXPR auto operator()(OutputIt out) -> OutputIt {
+      for (auto pos = N; pos > 0; --pos) {
+        out = detail::write<Char>(out, bs[pos - 1] ? Char('1') : Char('0'));
+      }
+
+      return out;
+    }
+  };
+
+ public:
+  template <typename FormatContext>
+  auto format(const std::bitset<N>& bs, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return write_padded(ctx, writer{bs});
+  }
+};
+
+FMT_EXPORT
+template <typename Char>
+struct formatter<std::thread::id, Char> : basic_ostream_formatter<Char> {};
+FMT_END_NAMESPACE
+
+#ifdef __cpp_lib_optional
+FMT_BEGIN_NAMESPACE
+FMT_EXPORT
+template <typename T, typename Char>
+struct formatter<std::optional<T>, Char,
+                 std::enable_if_t<is_formattable<T, Char>::value>> {
+ private:
+  formatter<T, Char> underlying_;
+  static constexpr basic_string_view<Char> optional =
+      detail::string_literal<Char, 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l',
+                             '('>{};
+  static constexpr basic_string_view<Char> none =
+      detail::string_literal<Char, 'n', 'o', 'n', 'e'>{};
+
+  template <class U>
+  FMT_CONSTEXPR static auto maybe_set_debug_format(U& u, bool set)
+      -> decltype(u.set_debug_format(set)) {
+    u.set_debug_format(set);
+  }
+
+  template <class U>
+  FMT_CONSTEXPR static void maybe_set_debug_format(U&, ...) {}
+
+ public:
+  template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
+    maybe_set_debug_format(underlying_, true);
+    return underlying_.parse(ctx);
+  }
+
+  template <typename FormatContext>
+  auto format(const std::optional<T>& opt, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    if (!opt) return detail::write<Char>(ctx.out(), none);
+
+    auto out = ctx.out();
+    out = detail::write<Char>(out, optional);
+    ctx.advance_to(out);
+    out = underlying_.format(*opt, ctx);
+    return detail::write(out, ')');
+  }
+};
+FMT_END_NAMESPACE
+#endif  // __cpp_lib_optional
+
+#ifdef __cpp_lib_source_location
+FMT_BEGIN_NAMESPACE
+FMT_EXPORT
+template <> struct formatter<std::source_location> {
+  template <typename ParseContext> FMT_CONSTEXPR auto parse(ParseContext& ctx) {
+    return ctx.begin();
+  }
+
+  template <typename FormatContext>
+  auto format(const std::source_location& loc, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    auto out = ctx.out();
+    out = detail::write(out, loc.file_name());
+    out = detail::write(out, ':');
+    out = detail::write<char>(out, loc.line());
+    out = detail::write(out, ':');
+    out = detail::write<char>(out, loc.column());
+    out = detail::write(out, ": ");
+    out = detail::write(out, loc.function_name());
+    return out;
+  }
+};
+FMT_END_NAMESPACE
+#endif
+
+#if FMT_CPP_LIB_VARIANT
+FMT_BEGIN_NAMESPACE
+namespace detail {
+
+template <typename T>
+using variant_index_sequence =
+    std::make_index_sequence<std::variant_size<T>::value>;
+
+template <typename> struct is_variant_like_ : std::false_type {};
+template <typename... Types>
+struct is_variant_like_<std::variant<Types...>> : std::true_type {};
+
+// formattable element check.
+template <typename T, typename C> class is_variant_formattable_ {
+  template <std::size_t... Is>
+  static std::conjunction<
+      is_formattable<std::variant_alternative_t<Is, T>, C>...>
+      check(std::index_sequence<Is...>);
+
+ public:
+  static constexpr const bool value =
+      decltype(check(variant_index_sequence<T>{}))::value;
+};
+
+template <typename Char, typename OutputIt, typename T>
+auto write_variant_alternative(OutputIt out, const T& v) -> OutputIt {
+  if constexpr (is_string<T>::value)
+    return write_escaped_string<Char>(out, detail::to_string_view(v));
+  else if constexpr (std::is_same_v<T, Char>)
+    return write_escaped_char(out, v);
+  else
+    return write<Char>(out, v);
+}
+
+}  // namespace detail
+
+template <typename T> struct is_variant_like {
+  static constexpr const bool value = detail::is_variant_like_<T>::value;
+};
+
+template <typename T, typename C> struct is_variant_formattable {
+  static constexpr const bool value =
+      detail::is_variant_formattable_<T, C>::value;
+};
+
+FMT_EXPORT
+template <typename Char> struct formatter<std::monostate, Char> {
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    return ctx.begin();
+  }
+
+  template <typename FormatContext>
+  auto format(const std::monostate&, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return detail::write<Char>(ctx.out(), "monostate");
+  }
+};
+
+FMT_EXPORT
+template <typename Variant, typename Char>
+struct formatter<
+    Variant, Char,
+    std::enable_if_t<std::conjunction_v<
+        is_variant_like<Variant>, is_variant_formattable<Variant, Char>>>> {
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    return ctx.begin();
+  }
+
+  template <typename FormatContext>
+  auto format(const Variant& value, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    auto out = ctx.out();
+
+    out = detail::write<Char>(out, "variant(");
+    FMT_TRY {
+      std::visit(
+          [&](const auto& v) {
+            out = detail::write_variant_alternative<Char>(out, v);
+          },
+          value);
+    }
+    FMT_CATCH(const std::bad_variant_access&) {
+      detail::write<Char>(out, "valueless by exception");
+    }
+    *out++ = ')';
+    return out;
+  }
+};
+FMT_END_NAMESPACE
+#endif  // FMT_CPP_LIB_VARIANT
+
+FMT_BEGIN_NAMESPACE
+FMT_EXPORT
+template <typename Char> struct formatter<std::error_code, Char> {
+  template <typename ParseContext>
+  FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
+    return ctx.begin();
+  }
+
+  template <typename FormatContext>
+  FMT_CONSTEXPR auto format(const std::error_code& ec, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    auto out = ctx.out();
+    out = detail::write_bytes(out, ec.category().name(), format_specs<Char>());
+    out = detail::write<Char>(out, Char(':'));
+    out = detail::write<Char>(out, ec.value());
+    return out;
+  }
+};
+
+FMT_EXPORT
+template <typename T, typename Char>
+struct formatter<
+    T, Char,  // DEPRECATED! Mixing code unit types.
+    typename std::enable_if<std::is_base_of<std::exception, T>::value>::type> {
+ private:
+  bool with_typename_ = false;
+
+ public:
+  FMT_CONSTEXPR auto parse(basic_format_parse_context<Char>& ctx)
+      -> decltype(ctx.begin()) {
+    auto it = ctx.begin();
+    auto end = ctx.end();
+    if (it == end || *it == '}') return it;
+    if (*it == 't') {
+      ++it;
+      with_typename_ = FMT_USE_TYPEID != 0;
+    }
+    return it;
+  }
+
+  template <typename OutputIt>
+  auto format(const std::exception& ex,
+              basic_format_context<OutputIt, Char>& ctx) const -> OutputIt {
+    format_specs<Char> spec;
+    auto out = ctx.out();
+    if (!with_typename_)
+      return detail::write_bytes(out, string_view(ex.what()), spec);
+
+#if FMT_USE_TYPEID
+    const std::type_info& ti = typeid(ex);
+#  ifdef FMT_HAS_ABI_CXA_DEMANGLE
+    int status = 0;
+    std::size_t size = 0;
+    std::unique_ptr<char, void (*)(void*)> demangled_name_ptr(
+        abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free);
+
+    string_view demangled_name_view;
+    if (demangled_name_ptr) {
+      demangled_name_view = demangled_name_ptr.get();
+
+      // Normalization of stdlib inline namespace names.
+      // libc++ inline namespaces.
+      //  std::__1::*       -> std::*
+      //  std::__1::__fs::* -> std::*
+      // libstdc++ inline namespaces.
+      //  std::__cxx11::*             -> std::*
+      //  std::filesystem::__cxx11::* -> std::filesystem::*
+      if (demangled_name_view.starts_with("std::")) {
+        char* begin = demangled_name_ptr.get();
+        char* to = begin + 5;  // std::
+        for (char *from = to, *end = begin + demangled_name_view.size();
+             from < end;) {
+          // This is safe, because demangled_name is NUL-terminated.
+          if (from[0] == '_' && from[1] == '_') {
+            char* next = from + 1;
+            while (next < end && *next != ':') next++;
+            if (next[0] == ':' && next[1] == ':') {
+              from = next + 2;
+              continue;
+            }
+          }
+          *to++ = *from++;
+        }
+        demangled_name_view = {begin, detail::to_unsigned(to - begin)};
+      }
+    } else {
+      demangled_name_view = string_view(ti.name());
+    }
+    out = detail::write_bytes(out, demangled_name_view, spec);
+#  elif FMT_MSC_VERSION
+    string_view demangled_name_view(ti.name());
+    if (demangled_name_view.starts_with("class "))
+      demangled_name_view.remove_prefix(6);
+    else if (demangled_name_view.starts_with("struct "))
+      demangled_name_view.remove_prefix(7);
+    out = detail::write_bytes(out, demangled_name_view, spec);
+#  else
+    out = detail::write_bytes(out, string_view(ti.name()), spec);
+#  endif
+    *out++ = ':';
+    *out++ = ' ';
+    return detail::write_bytes(out, string_view(ex.what()), spec);
+#endif
+  }
+};
+
+namespace detail {
+
+template <typename T, typename Enable = void>
+struct has_flip : std::false_type {};
+
+template <typename T>
+struct has_flip<T, void_t<decltype(std::declval<T>().flip())>>
+    : std::true_type {};
+
+template <typename T> struct is_bit_reference_like {
+  static constexpr const bool value =
+      std::is_convertible<T, bool>::value &&
+      std::is_nothrow_assignable<T, bool>::value && has_flip<T>::value;
+};
+
+#ifdef _LIBCPP_VERSION
+
+// Workaround for libc++ incompatibility with C++ standard.
+// According to the Standard, `bitset::operator[] const` returns bool.
+template <typename C>
+struct is_bit_reference_like<std::__bit_const_reference<C>> {
+  static constexpr const bool value = true;
+};
+
+#endif
+
+}  // namespace detail
+
+// We can't use std::vector<bool, Allocator>::reference and
+// std::bitset<N>::reference because the compiler can't deduce Allocator and N
+// in partial specialization.
+FMT_EXPORT
+template <typename BitRef, typename Char>
+struct formatter<BitRef, Char,
+                 enable_if_t<detail::is_bit_reference_like<BitRef>::value>>
+    : formatter<bool, Char> {
+  template <typename FormatContext>
+  FMT_CONSTEXPR auto format(const BitRef& v, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return formatter<bool, Char>::format(v, ctx);
+  }
+};
+
+FMT_EXPORT
+template <typename T, typename Char>
+struct formatter<std::atomic<T>, Char,
+                 enable_if_t<is_formattable<T, Char>::value>>
+    : formatter<T, Char> {
+  template <typename FormatContext>
+  auto format(const std::atomic<T>& v, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return formatter<T, Char>::format(v.load(), ctx);
+  }
+};
+
+#ifdef __cpp_lib_atomic_flag_test
+FMT_EXPORT
+template <typename Char>
+struct formatter<std::atomic_flag, Char> : formatter<bool, Char> {
+  template <typename FormatContext>
+  auto format(const std::atomic_flag& v, FormatContext& ctx) const
+      -> decltype(ctx.out()) {
+    return formatter<bool, Char>::format(v.test(), ctx);
+  }
+};
+#endif  // __cpp_lib_atomic_flag_test
+
+FMT_END_NAMESPACE
+#endif  // FMT_STD_H_

vendor/spdlog/fmt/bundled/xchar.h

@@ -9,17 +9,35 @@
 #define FMT_XCHAR_H_
 
 #include <cwchar>
-#include <tuple>
 
 #include "format.h"
 
+#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
+#  include <locale>
+#endif
+
 FMT_BEGIN_NAMESPACE
 namespace detail {
+
 template <typename T>
 using is_exotic_char = bool_constant<!std::is_same<T, char>::value>;
-}
 
-FMT_MODULE_EXPORT_BEGIN
+inline auto write_loc(std::back_insert_iterator<detail::buffer<wchar_t>> out,
+                      loc_value value, const format_specs<wchar_t>& specs,
+                      locale_ref loc) -> bool {
+#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
+  auto& numpunct =
+      std::use_facet<std::numpunct<wchar_t>>(loc.get<std::locale>());
+  auto separator = std::wstring();
+  auto grouping = numpunct.grouping();
+  if (!grouping.empty()) separator = std::wstring(1, numpunct.thousands_sep());
+  return value.visit(loc_writer<wchar_t>{out, specs, separator, grouping, {}});
+#endif
+  return false;
+}
+}  // namespace detail
+
+FMT_BEGIN_EXPORT
 
 using wstring_view = basic_string_view<wchar_t>;
 using wformat_parse_context = basic_format_parse_context<wchar_t>;
@@ -30,9 +48,13 @@ using wmemory_buffer = basic_memory_buffer<wchar_t>;
 #if FMT_GCC_VERSION && FMT_GCC_VERSION < 409
 // Workaround broken conversion on older gcc.
 template <typename... Args> using wformat_string = wstring_view;
+inline auto runtime(wstring_view s) -> wstring_view { return s; }
 #else
 template <typename... Args>
 using wformat_string = basic_format_string<wchar_t, type_identity_t<Args>...>;
+inline auto runtime(wstring_view s) -> runtime_format_string<wchar_t> {
+  return {{s}};
+}
 #endif
 
 template <> struct is_char<wchar_t> : std::true_type {};
@@ -40,20 +62,16 @@ template <> struct is_char<detail::char8_type> : std::true_type {};
 template <> struct is_char<char16_t> : std::true_type {};
 template <> struct is_char<char32_t> : std::true_type {};
 
-template <typename... Args>
+template <typename... T>
-constexpr format_arg_store<wformat_context, Args...> make_wformat_args(
+constexpr auto make_wformat_args(const T&... args)
-    const Args&... args) {
+    -> format_arg_store<wformat_context, T...> {
   return {args...};
 }
 
 inline namespace literals {
-constexpr auto operator"" _format(const wchar_t* s, size_t n)
+#if FMT_USE_USER_DEFINED_LITERALS && !FMT_USE_NONTYPE_TEMPLATE_ARGS
-    -> detail::udl_formatter<wchar_t> {
+constexpr auto operator""_a(const wchar_t* s, size_t)
-  return {{s, n}};
+    -> detail::udl_arg<wchar_t> {
-}
-
-#if FMT_USE_USER_DEFINED_LITERALS && !FMT_USE_NONTYPE_TEMPLATE_PARAMETERS
-constexpr detail::udl_arg<wchar_t> operator"" _a(const wchar_t* s, size_t) {
   return {s};
 }
 #endif
@@ -82,18 +100,24 @@ template <typename Char, FMT_ENABLE_IF(!std::is_same<Char, char>::value)>
 auto vformat(basic_string_view<Char> format_str,
              basic_format_args<buffer_context<type_identity_t<Char>>> args)
     -> std::basic_string<Char> {
-  basic_memory_buffer<Char> buffer;
+  auto buf = basic_memory_buffer<Char>();
-  detail::vformat_to(buffer, format_str, args);
+  detail::vformat_to(buf, format_str, args);
-  return to_string(buffer);
+  return to_string(buf);
+}
+
+template <typename... T>
+auto format(wformat_string<T...> fmt, T&&... args) -> std::wstring {
+  return vformat(fmt::wstring_view(fmt), fmt::make_wformat_args(args...));
 }
 
 // Pass char_t as a default template parameter instead of using
 // std::basic_string<char_t<S>> to reduce the symbol size.
-template <typename S, typename... Args, typename Char = char_t<S>,
+template <typename S, typename... T, typename Char = char_t<S>,
-          FMT_ENABLE_IF(!std::is_same<Char, char>::value)>
+          FMT_ENABLE_IF(!std::is_same<Char, char>::value &&
-auto format(const S& format_str, Args&&... args) -> std::basic_string<Char> {
+                        !std::is_same<Char, wchar_t>::value)>
-  const auto& vargs = fmt::make_args_checked<Args...>(format_str, args...);
+auto format(const S& format_str, T&&... args) -> std::basic_string<Char> {
-  return vformat(to_string_view(format_str), vargs);
+  return vformat(detail::to_string_view(format_str),
+                 fmt::make_format_args<buffer_context<Char>>(args...));
 }
 
 template <typename Locale, typename S, typename Char = char_t<S>,
@@ -103,17 +127,16 @@ inline auto vformat(
     const Locale& loc, const S& format_str,
     basic_format_args<buffer_context<type_identity_t<Char>>> args)
     -> std::basic_string<Char> {
-  return detail::vformat(loc, to_string_view(format_str), args);
+  return detail::vformat(loc, detail::to_string_view(format_str), args);
 }
 
-template <typename Locale, typename S, typename... Args,
+template <typename Locale, typename S, typename... T, typename Char = char_t<S>,
-          typename Char = char_t<S>,
           FMT_ENABLE_IF(detail::is_locale<Locale>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto format(const Locale& loc, const S& format_str, Args&&... args)
+inline auto format(const Locale& loc, const S& format_str, T&&... args)
     -> std::basic_string<Char> {
-  return detail::vformat(loc, to_string_view(format_str),
+  return detail::vformat(loc, detail::to_string_view(format_str),
-                         fmt::make_args_checked<Args...>(format_str, args...));
+                         fmt::make_format_args<buffer_context<Char>>(args...));
 }
 
 template <typename OutputIt, typename S, typename Char = char_t<S>,
@@ -123,27 +146,17 @@ auto vformat_to(OutputIt out, const S& format_str,
                 basic_format_args<buffer_context<type_identity_t<Char>>> args)
     -> OutputIt {
   auto&& buf = detail::get_buffer<Char>(out);
-  detail::vformat_to(buf, to_string_view(format_str), args);
+  detail::vformat_to(buf, detail::to_string_view(format_str), args);
-  return detail::get_iterator(buf);
+  return detail::get_iterator(buf, out);
 }
 
-template <typename OutputIt, typename S, typename... Args,
+template <typename OutputIt, typename S, typename... T,
           typename Char = char_t<S>,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto format_to(OutputIt out, const S& fmt, Args&&... args) -> OutputIt {
+inline auto format_to(OutputIt out, const S& fmt, T&&... args) -> OutputIt {
-  const auto& vargs = fmt::make_args_checked<Args...>(fmt, args...);
+  return vformat_to(out, detail::to_string_view(fmt),
-  return vformat_to(out, to_string_view(fmt), vargs);
+                    fmt::make_format_args<buffer_context<Char>>(args...));
-}
-
-template <typename S, typename... Args, typename Char, size_t SIZE,
-          typename Allocator, FMT_ENABLE_IF(detail::is_string<S>::value)>
-FMT_DEPRECATED auto format_to(basic_memory_buffer<Char, SIZE, Allocator>& buf,
-                              const S& format_str, Args&&... args) ->
-    typename buffer_context<Char>::iterator {
-  const auto& vargs = fmt::make_args_checked<Args...>(format_str, args...);
-  detail::vformat_to(buf, to_string_view(format_str), vargs, {});
-  return detail::buffer_appender<Char>(buf);
 }
 
 template <typename Locale, typename S, typename OutputIt, typename... Args,
@@ -155,20 +168,21 @@ inline auto vformat_to(
     OutputIt out, const Locale& loc, const S& format_str,
     basic_format_args<buffer_context<type_identity_t<Char>>> args) -> OutputIt {
   auto&& buf = detail::get_buffer<Char>(out);
-  vformat_to(buf, to_string_view(format_str), args, detail::locale_ref(loc));
+  vformat_to(buf, detail::to_string_view(format_str), args,
-  return detail::get_iterator(buf);
+             detail::locale_ref(loc));
+  return detail::get_iterator(buf, out);
 }
 
-template <
+template <typename OutputIt, typename Locale, typename S, typename... T,
-    typename OutputIt, typename Locale, typename S, typename... Args,
           typename Char = char_t<S>,
-    bool enable = detail::is_output_iterator<OutputIt, Char>::value&&
+          bool enable = detail::is_output_iterator<OutputIt, Char>::value &&
-        detail::is_locale<Locale>::value&& detail::is_exotic_char<Char>::value>
+                        detail::is_locale<Locale>::value &&
+                        detail::is_exotic_char<Char>::value>
 inline auto format_to(OutputIt out, const Locale& loc, const S& format_str,
-                      Args&&... args) ->
+                      T&&... args) ->
     typename std::enable_if<enable, OutputIt>::type {
-  const auto& vargs = fmt::make_args_checked<Args...>(format_str, args...);
+  return vformat_to(out, loc, detail::to_string_view(format_str),
-  return vformat_to(out, loc, to_string_view(format_str), vargs);
+                    fmt::make_format_args<buffer_context<Char>>(args...));
 }
 
 template <typename OutputIt, typename Char, typename... Args,
@@ -178,36 +192,36 @@ inline auto vformat_to_n(
     OutputIt out, size_t n, basic_string_view<Char> format_str,
     basic_format_args<buffer_context<type_identity_t<Char>>> args)
     -> format_to_n_result<OutputIt> {
-  detail::iterator_buffer<OutputIt, Char, detail::fixed_buffer_traits> buf(out,
+  using traits = detail::fixed_buffer_traits;
-                                                                           n);
+  auto buf = detail::iterator_buffer<OutputIt, Char, traits>(out, n);
   detail::vformat_to(buf, format_str, args);
   return {buf.out(), buf.count()};
 }
 
-template <typename OutputIt, typename S, typename... Args,
+template <typename OutputIt, typename S, typename... T,
           typename Char = char_t<S>,
           FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
                             detail::is_exotic_char<Char>::value)>
-inline auto format_to_n(OutputIt out, size_t n, const S& fmt,
+inline auto format_to_n(OutputIt out, size_t n, const S& fmt, T&&... args)
-                        const Args&... args) -> format_to_n_result<OutputIt> {
+    -> format_to_n_result<OutputIt> {
-  const auto& vargs = fmt::make_args_checked<Args...>(fmt, args...);
+  return vformat_to_n(out, n, detail::to_string_view(fmt),
-  return vformat_to_n(out, n, to_string_view(fmt), vargs);
+                      fmt::make_format_args<buffer_context<Char>>(args...));
 }
 
-template <typename S, typename... Args, typename Char = char_t<S>,
+template <typename S, typename... T, typename Char = char_t<S>,
           FMT_ENABLE_IF(detail::is_exotic_char<Char>::value)>
-inline auto formatted_size(const S& fmt, Args&&... args) -> size_t {
+inline auto formatted_size(const S& fmt, T&&... args) -> size_t {
-  detail::counting_buffer<Char> buf;
+  auto buf = detail::counting_buffer<Char>();
-  const auto& vargs = fmt::make_args_checked<Args...>(fmt, args...);
+  detail::vformat_to(buf, detail::to_string_view(fmt),
-  detail::vformat_to(buf, to_string_view(fmt), vargs);
+                     fmt::make_format_args<buffer_context<Char>>(args...));
   return buf.count();
 }
 
 inline void vprint(std::FILE* f, wstring_view fmt, wformat_args args) {
-  wmemory_buffer buffer;
+  auto buf = wmemory_buffer();
-  detail::vformat_to(buffer, fmt, args);
+  detail::vformat_to(buf, fmt, args);
-  buffer.push_back(L'\0');
+  buf.push_back(L'\0');
-  if (std::fputws(buffer.data(), f) == -1)
+  if (std::fputws(buf.data(), f) == -1)
     FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
 }
 
@@ -224,13 +238,22 @@ template <typename... T> void print(wformat_string<T...> fmt, T&&... args) {
   return vprint(wstring_view(fmt), fmt::make_wformat_args(args...));
 }
 
+template <typename... T>
+void println(std::FILE* f, wformat_string<T...> fmt, T&&... args) {
+  return print(f, L"{}\n", fmt::format(fmt, std::forward<T>(args)...));
+}
+
+template <typename... T> void println(wformat_string<T...> fmt, T&&... args) {
+  return print(L"{}\n", fmt::format(fmt, std::forward<T>(args)...));
+}
+
 /**
   Converts *value* to ``std::wstring`` using the default format for type *T*.
  */
 template <typename T> inline auto to_wstring(const T& value) -> std::wstring {
   return format(FMT_STRING(L"{}"), value);
 }
-FMT_MODULE_EXPORT_END
+FMT_END_EXPORT
 FMT_END_NAMESPACE
 
 #endif  // FMT_XCHAR_H_

vendor/spdlog/fmt/chrono.h

@@ -7,16 +7,17 @@
 //
 // include bundled or external copy of fmtlib's chrono support
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/chrono.h>
+        #include <spdlog/fmt/bundled/chrono.h>
-#    else
+    #else
-#        include <fmt/chrono.h>
+        #include <fmt/chrono.h>
-#    endif
+    #endif
 #endif

vendor/spdlog/fmt/compile.h

@@ -7,16 +7,17 @@
 //
 // include bundled or external copy of fmtlib's compile-time support
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/compile.h>
+        #include <spdlog/fmt/bundled/compile.h>
-#    else
+    #else
-#        include <fmt/compile.h>
+        #include <fmt/compile.h>
-#    endif
+    #endif
 #endif

vendor/spdlog/fmt/fmt.h

@@ -9,21 +9,22 @@
 // Include a bundled header-only copy of fmtlib or an external one.
 // By default spdlog include its own copy.
 //
+#include <spdlog/tweakme.h>
 
 #if defined(SPDLOG_USE_STD_FORMAT)  // SPDLOG_USE_STD_FORMAT is defined - use std::format
-#    include <format>
+    #include <format>
 #elif !defined(SPDLOG_FMT_EXTERNAL)
-#    if !defined(SPDLOG_COMPILED_LIB) && !defined(FMT_HEADER_ONLY)
+    #if !defined(SPDLOG_COMPILED_LIB) && !defined(FMT_HEADER_ONLY)
-#        define FMT_HEADER_ONLY
+        #define FMT_HEADER_ONLY
-#    endif
+    #endif
-#    ifndef FMT_USE_WINDOWS_H
+    #ifndef FMT_USE_WINDOWS_H
-#        define FMT_USE_WINDOWS_H 0
+        #define FMT_USE_WINDOWS_H 0
-#    endif
+    #endif
-// enable the 'n' flag in for backward compatibility with fmt 6.x
+
-#    define FMT_DEPRECATED_N_SPECIFIER
+    #include <spdlog/fmt/bundled/core.h>
-#    include <spdlog/fmt/bundled/core.h>
+    #include <spdlog/fmt/bundled/format.h>
-#    include <spdlog/fmt/bundled/format.h>
+
 #else  // SPDLOG_FMT_EXTERNAL is defined - use external fmtlib
-#    include <fmt/core.h>
+    #include <fmt/core.h>
-#    include <fmt/format.h>
+    #include <fmt/format.h>
 #endif

vendor/spdlog/fmt/ostr.h

@@ -7,16 +7,17 @@
 //
 // include bundled or external copy of fmtlib's ostream support
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/ostream.h>
+        #include <spdlog/fmt/bundled/ostream.h>
-#    else
+    #else
-#        include <fmt/ostream.h>
+        #include <fmt/ostream.h>
-#    endif
+    #endif
 #endif

vendor/spdlog/fmt/ranges.h

@@ -7,16 +7,17 @@
 //
 // include bundled or external copy of fmtlib's ranges support
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/ranges.h>
+        #include <spdlog/fmt/bundled/ranges.h>
-#    else
+    #else
-#        include <fmt/ranges.h>
+        #include <fmt/ranges.h>
-#    endif
+    #endif
 #endif

vendor/spdlog/fmt/std.h

@@ -0,0 +1,24 @@
+//
+// Copyright(c) 2016 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#pragma once
+//
+// include bundled or external copy of fmtlib's std support (for formatting e.g.
+// std::filesystem::path, std::thread::id, std::monostate, std::variant, ...)
+//
+#include <spdlog/tweakme.h>
+
+#if !defined(SPDLOG_USE_STD_FORMAT)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
+        #ifdef SPDLOG_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
+            #endif
+        #endif
+        #include <spdlog/fmt/bundled/std.h>
+    #else
+        #include <fmt/std.h>
+    #endif
+#endif

vendor/spdlog/fmt/xchar.h

@@ -7,16 +7,17 @@
 //
 // include bundled or external copy of fmtlib's xchar support
 //
+#include <spdlog/tweakme.h>
 
 #if !defined(SPDLOG_USE_STD_FORMAT)
-#    if !defined(SPDLOG_FMT_EXTERNAL)
+    #if !defined(SPDLOG_FMT_EXTERNAL)
-#        ifdef SPDLOG_HEADER_ONLY
+        #ifdef SPDLOG_HEADER_ONLY
-#            ifndef FMT_HEADER_ONLY
+            #ifndef FMT_HEADER_ONLY
-#                define FMT_HEADER_ONLY
+                #define FMT_HEADER_ONLY
-#            endif
+            #endif
-#        endif
+        #endif
-#        include <spdlog/fmt/bundled/xchar.h>
+        #include <spdlog/fmt/bundled/xchar.h>
-#    else
+    #else
-#        include <fmt/xchar.h>
+        #include <fmt/xchar.h>
-#    endif
+    #endif
 #endif

vendor/spdlog/formatter.h

@@ -3,13 +3,12 @@
 
 #pragma once
 
-#include <spdlog/fmt/fmt.h>
 #include <spdlog/details/log_msg.h>
+#include <spdlog/fmt/fmt.h>
 
 namespace spdlog {
 
-class formatter
+class formatter {
-{
 public:
     virtual ~formatter() = default;
     virtual void format(const details::log_msg &msg, memory_buf_t &dest) = 0;

vendor/spdlog/logger-inl.h

@@ -4,12 +4,12 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/logger.h>
+    #include <spdlog/logger.h>
 #endif
 
-#include <spdlog/sinks/sink.h>
 #include <spdlog/details/backtracer.h>
 #include <spdlog/pattern_formatter.h>
+#include <spdlog/sinks/sink.h>
 
 #include <cstdio>
 
@@ -17,15 +17,15 @@ namespace spdlog {
 
 // public methods
 SPDLOG_INLINE logger::logger(const logger &other)
-    : name_(other.name_)
+    : name_(other.name_),
-    , sinks_(other.sinks_)
+      sinks_(other.sinks_),
-    , level_(other.level_.load(std::memory_order_relaxed))
+      level_(other.level_.load(std::memory_order_relaxed)),
-    , flush_level_(other.flush_level_.load(std::memory_order_relaxed))
+      flush_level_(other.flush_level_.load(std::memory_order_relaxed)),
-    , custom_err_handler_(other.custom_err_handler_)
+      custom_err_handler_(other.custom_err_handler_),
-    , tracer_(other.tracer_)
+      tracer_(other.tracer_) {}
-{}
 
-SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)),
+SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT
+    : name_(std::move(other.name_)),
       sinks_(std::move(other.sinks_)),
       level_(other.level_.load(std::memory_order_relaxed)),
       flush_level_(other.flush_level_.load(std::memory_order_relaxed)),
@@ -34,14 +34,12 @@ SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(o
 
 {}
 
-SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT
+SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT {
-{
     this->swap(other);
     return *this;
 }
 
-SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT
+SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT {
-{
     name_.swap(other.name_);
     sinks_.swap(other.sinks_);
 
@@ -59,179 +57,121 @@ SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT
     std::swap(tracer_, other.tracer_);
 }
 
-SPDLOG_INLINE void swap(logger &a, logger &b)
+SPDLOG_INLINE void swap(logger &a, logger &b) { a.swap(b); }
-{
-    a.swap(b);
-}
 
-SPDLOG_INLINE void logger::set_level(level::level_enum log_level)
+SPDLOG_INLINE void logger::set_level(level::level_enum log_level) { level_.store(log_level); }
-{
-    level_.store(log_level);
-}
 
-SPDLOG_INLINE level::level_enum logger::level() const
+SPDLOG_INLINE level::level_enum logger::level() const {
-{
     return static_cast<level::level_enum>(level_.load(std::memory_order_relaxed));
 }
 
-SPDLOG_INLINE const std::string &logger::name() const
+SPDLOG_INLINE const std::string &logger::name() const { return name_; }
-{
-    return name_;
-}
 
 // set formatting for the sinks in this logger.
 // each sink will get a separate instance of the formatter object.
-SPDLOG_INLINE void logger::set_formatter(std::unique_ptr<formatter> f)
+SPDLOG_INLINE void logger::set_formatter(std::unique_ptr<formatter> f) {
-{
+    for (auto it = sinks_.begin(); it != sinks_.end(); ++it) {
-    for (auto it = sinks_.begin(); it != sinks_.end(); ++it)
+        if (std::next(it) == sinks_.end()) {
-    {
-        if (std::next(it) == sinks_.end())
-        {
             // last element - we can be move it.
             (*it)->set_formatter(std::move(f));
             break;  // to prevent clang-tidy warning
-        }
+        } else {
-        else
-        {
             (*it)->set_formatter(f->clone());
         }
     }
 }
 
-SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type)
+SPDLOG_INLINE void logger::set_pattern(std::string pattern, pattern_time_type time_type) {
-{
     auto new_formatter = details::make_unique<pattern_formatter>(std::move(pattern), time_type);
     set_formatter(std::move(new_formatter));
 }
 
 // create new backtrace sink and move to it all our child sinks
-SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages)
+SPDLOG_INLINE void logger::enable_backtrace(size_t n_messages) { tracer_.enable(n_messages); }
-{
-    tracer_.enable(n_messages);
-}
 
 // restore orig sinks and level and delete the backtrace sink
-SPDLOG_INLINE void logger::disable_backtrace()
+SPDLOG_INLINE void logger::disable_backtrace() { tracer_.disable(); }
-{
-    tracer_.disable();
-}
 
-SPDLOG_INLINE void logger::dump_backtrace()
+SPDLOG_INLINE void logger::dump_backtrace() { dump_backtrace_(); }
-{
-    dump_backtrace_();
-}
 
 // flush functions
-SPDLOG_INLINE void logger::flush()
+SPDLOG_INLINE void logger::flush() { flush_(); }
-{
-    flush_();
-}
 
-SPDLOG_INLINE void logger::flush_on(level::level_enum log_level)
+SPDLOG_INLINE void logger::flush_on(level::level_enum log_level) { flush_level_.store(log_level); }
-{
-    flush_level_.store(log_level);
-}
 
-SPDLOG_INLINE level::level_enum logger::flush_level() const
+SPDLOG_INLINE level::level_enum logger::flush_level() const {
-{
     return static_cast<level::level_enum>(flush_level_.load(std::memory_order_relaxed));
 }
 
 // sinks
-SPDLOG_INLINE const std::vector<sink_ptr> &logger::sinks() const
+SPDLOG_INLINE const std::vector<sink_ptr> &logger::sinks() const { return sinks_; }
-{
-    return sinks_;
-}
 
-SPDLOG_INLINE std::vector<sink_ptr> &logger::sinks()
+SPDLOG_INLINE std::vector<sink_ptr> &logger::sinks() { return sinks_; }
-{
-    return sinks_;
-}
 
 // error handler
-SPDLOG_INLINE void logger::set_error_handler(err_handler handler)
+SPDLOG_INLINE void logger::set_error_handler(err_handler handler) {
-{
     custom_err_handler_ = std::move(handler);
 }
 
 // create new logger with same sinks and configuration.
-SPDLOG_INLINE std::shared_ptr<logger> logger::clone(std::string logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> logger::clone(std::string logger_name) {
-{
     auto cloned = std::make_shared<logger>(*this);
     cloned->name_ = std::move(logger_name);
     return cloned;
 }
 
 // protected methods
-SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg, bool log_enabled, bool traceback_enabled)
+SPDLOG_INLINE void logger::log_it_(const spdlog::details::log_msg &log_msg,
-{
+                                   bool log_enabled,
-    if (log_enabled)
+                                   bool traceback_enabled) {
-    {
+    if (log_enabled) {
         sink_it_(log_msg);
     }
-    if (traceback_enabled)
+    if (traceback_enabled) {
-    {
         tracer_.push_back(log_msg);
     }
 }
 
-SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg)
+SPDLOG_INLINE void logger::sink_it_(const details::log_msg &msg) {
-{
+    for (auto &sink : sinks_) {
-    for (auto &sink : sinks_)
+        if (sink->should_log(msg.level)) {
-    {
+            SPDLOG_TRY { sink->log(msg); }
-        if (sink->should_log(msg.level))
-        {
-            SPDLOG_TRY
-            {
-                sink->log(msg);
-            }
             SPDLOG_LOGGER_CATCH(msg.source)
         }
     }
 
-    if (should_flush_(msg))
+    if (should_flush_(msg)) {
-    {
         flush_();
     }
 }
 
-SPDLOG_INLINE void logger::flush_()
+SPDLOG_INLINE void logger::flush_() {
-{
+    for (auto &sink : sinks_) {
-    for (auto &sink : sinks_)
+        SPDLOG_TRY { sink->flush(); }
-    {
-        SPDLOG_TRY
-        {
-            sink->flush();
-        }
         SPDLOG_LOGGER_CATCH(source_loc())
     }
 }
 
-SPDLOG_INLINE void logger::dump_backtrace_()
+SPDLOG_INLINE void logger::dump_backtrace_() {
-{
     using details::log_msg;
-    if (tracer_.enabled())
+    if (tracer_.enabled() && !tracer_.empty()) {
-    {
+        sink_it_(
-        sink_it_(log_msg{name(), level::info, "****************** Backtrace Start ******************"});
+            log_msg{name(), level::info, "****************** Backtrace Start ******************"});
         tracer_.foreach_pop([this](const log_msg &msg) { this->sink_it_(msg); });
-        sink_it_(log_msg{name(), level::info, "****************** Backtrace End ********************"});
+        sink_it_(
+            log_msg{name(), level::info, "****************** Backtrace End ********************"});
     }
 }
 
-SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg)
+SPDLOG_INLINE bool logger::should_flush_(const details::log_msg &msg) {
-{
     auto flush_level = flush_level_.load(std::memory_order_relaxed);
     return (msg.level >= flush_level) && (msg.level != level::off);
 }
 
-SPDLOG_INLINE void logger::err_handler_(const std::string &msg)
+SPDLOG_INLINE void logger::err_handler_(const std::string &msg) {
-{
+    if (custom_err_handler_) {
-    if (custom_err_handler_)
-    {
         custom_err_handler_(msg);
-    }
+    } else {
-    else
-    {
         using std::chrono::system_clock;
         static std::mutex mutex;
         static std::chrono::system_clock::time_point last_report_time;
@@ -239,8 +179,7 @@ SPDLOG_INLINE void logger::err_handler_(const std::string &msg)
         std::lock_guard<std::mutex> lk{mutex};
         auto now = system_clock::now();
         err_counter++;
-        if (now - last_report_time < std::chrono::seconds(1))
+        if (now - last_report_time < std::chrono::seconds(1)) {
-        {
             return;
         }
         last_report_time = now;
@@ -248,9 +187,11 @@ SPDLOG_INLINE void logger::err_handler_(const std::string &msg)
         char date_buf[64];
         std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time);
 #if defined(USING_R) && defined(R_R_H)  // if in R environment
-        REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str());
+        REprintf("[*** LOG ERROR #%04zu ***] [%s] [%s] %s\n", err_counter, date_buf, name().c_str(),
+                 msg.c_str());
 #else
-        std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] {%s}\n", err_counter, date_buf, name().c_str(), msg.c_str());
+        std::fprintf(stderr, "[*** LOG ERROR #%04zu ***] [%s] [%s] %s\n", err_counter, date_buf,
+                     name().c_str(), msg.c_str());
 #endif
     }
 }

vendor/spdlog/logger.h

@@ -15,67 +15,58 @@
 // formatted data, and support for different format per sink.
 
 #include <spdlog/common.h>
-#include <spdlog/details/log_msg.h>
 #include <spdlog/details/backtracer.h>
+#include <spdlog/details/log_msg.h>
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-#    ifndef _WIN32
+    #ifndef _WIN32
-#        error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
+        #error SPDLOG_WCHAR_TO_UTF8_SUPPORT only supported on windows
-#    endif
+    #endif
-#    include <spdlog/details/os.h>
+    #include <spdlog/details/os.h>
 #endif
 
 #include <vector>
 
 #ifndef SPDLOG_NO_EXCEPTIONS
-#    define SPDLOG_LOGGER_CATCH(location)                                                                                                  \
+    #define SPDLOG_LOGGER_CATCH(location)                                                 \
-        catch (const std::exception &ex)                                                                                                   \
+        catch (const std::exception &ex) {                                                \
-        {                                                                                                                                  \
+            if (location.filename) {                                                      \
-            if (location.filename)                                                                                                         \
+                err_handler_(fmt_lib::format(SPDLOG_FMT_STRING("{} [{}({})]"), ex.what(), \
-            {                                                                                                                              \
+                                             location.filename, location.line));          \
-                err_handler_(fmt_lib::format("{} [{}({})]", ex.what(), location.filename, location.line));                                 \
+            } else {                                                                      \
-            }                                                                                                                              \
-            else                                                                                                                           \
-            {                                                                                                                              \
                 err_handler_(ex.what());                                                  \
             }                                                                             \
         }                                                                                 \
-        catch (...)                                                                                                                        \
+        catch (...) {                                                                     \
-        {                                                                                                                                  \
             err_handler_("Rethrowing unknown exception in logger");                       \
             throw;                                                                        \
         }
 #else
-#    define SPDLOG_LOGGER_CATCH(location)
+    #define SPDLOG_LOGGER_CATCH(location)
 #endif
 
 namespace spdlog {
 
-class SPDLOG_API logger
+class SPDLOG_API logger {
-{
 public:
     // Empty logger
     explicit logger(std::string name)
-        : name_(std::move(name))
+        : name_(std::move(name)),
-        , sinks_()
+          sinks_() {}
-    {}
 
     // Logger with range on sinks
-    template<typename It>
+    template <typename It>
     logger(std::string name, It begin, It end)
-        : name_(std::move(name))
+        : name_(std::move(name)),
-        , sinks_(begin, end)
+          sinks_(begin, end) {}
-    {}
 
     // Logger with single sink
     logger(std::string name, sink_ptr single_sink)
-        : logger(std::move(name), {std::move(single_sink)})
+        : logger(std::move(name), {std::move(single_sink)}) {}
-    {}
 
     // Logger with sinks init list
     logger(std::string name, sinks_init_list sinks)
-        : logger(std::move(name), sinks.begin(), sinks.end())
+        : logger(std::move(name), sinks.begin(), sinks.end()) {}
-    {}
 
     virtual ~logger() = default;
 
@@ -84,37 +75,36 @@ public:
     logger &operator=(logger other) SPDLOG_NOEXCEPT;
     void swap(spdlog::logger &other) SPDLOG_NOEXCEPT;
 
-    template<typename... Args>
+    template <typename... Args>
-    void log(source_loc loc, level::level_enum lvl, format_string_t<Args...> fmt, Args &&... args)
+    void log(source_loc loc, level::level_enum lvl, format_string_t<Args...> fmt, Args &&...args) {
-    {
+        log_(loc, lvl, details::to_string_view(fmt), std::forward<Args>(args)...);
-        log_(loc, lvl, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void log(level::level_enum lvl, format_string_t<Args...> fmt, Args &&... args)
+    void log(level::level_enum lvl, format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(source_loc{}, lvl, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename T>
+    template <typename T>
-    void log(level::level_enum lvl, const T &msg)
+    void log(level::level_enum lvl, const T &msg) {
-    {
         log(source_loc{}, lvl, msg);
     }
 
     // T cannot be statically converted to format string (including string_view/wstring_view)
-    template<class T, typename std::enable_if<!is_convertible_to_any_format_string<const T &>::value, int>::type = 0>
+    template <class T,
-    void log(source_loc loc, level::level_enum lvl, const T &msg)
+              typename std::enable_if<!is_convertible_to_any_format_string<const T &>::value,
-    {
+                                      int>::type = 0>
+    void log(source_loc loc, level::level_enum lvl, const T &msg) {
         log(loc, lvl, "{}", msg);
     }
 
-    void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg)
+    void log(log_clock::time_point log_time,
-    {
+             source_loc loc,
+             level::level_enum lvl,
+             string_view_t msg) {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
 
@@ -122,12 +112,10 @@ public:
         log_it_(log_msg, log_enabled, traceback_enabled);
     }
 
-    void log(source_loc loc, level::level_enum lvl, string_view_t msg)
+    void log(source_loc loc, level::level_enum lvl, string_view_t msg) {
-    {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
 
@@ -135,66 +123,56 @@ public:
         log_it_(log_msg, log_enabled, traceback_enabled);
     }
 
-    void log(level::level_enum lvl, string_view_t msg)
+    void log(level::level_enum lvl, string_view_t msg) { log(source_loc{}, lvl, msg); }
-    {
-        log(source_loc{}, lvl, msg);
-    }
 
-    template<typename... Args>
+    template <typename... Args>
-    void trace(format_string_t<Args...> fmt, Args &&... args)
+    void trace(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::trace, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void debug(format_string_t<Args...> fmt, Args &&... args)
+    void debug(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::debug, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void info(format_string_t<Args...> fmt, Args &&... args)
+    void info(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::info, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void warn(format_string_t<Args...> fmt, Args &&... args)
+    void warn(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::warn, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void error(format_string_t<Args...> fmt, Args &&... args)
+    void error(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::err, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void critical(format_string_t<Args...> fmt, Args &&... args)
+    void critical(format_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::critical, fmt, std::forward<Args>(args)...);
     }
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-    template<typename... Args>
+    template <typename... Args>
-    void log(source_loc loc, level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&... args)
+    void log(source_loc loc, level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&...args) {
-    {
+        log_(loc, lvl, details::to_string_view(fmt), std::forward<Args>(args)...);
-        log_(loc, lvl, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void log(level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&... args)
+    void log(level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(source_loc{}, lvl, fmt, std::forward<Args>(args)...);
     }
 
-    void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, wstring_view_t msg)
+    void log(log_clock::time_point log_time,
-    {
+             source_loc loc,
+             level::level_enum lvl,
+             wstring_view_t msg) {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
 
@@ -204,12 +182,10 @@ public:
         log_it_(log_msg, log_enabled, traceback_enabled);
     }
 
-    void log(source_loc loc, level::level_enum lvl, wstring_view_t msg)
+    void log(source_loc loc, level::level_enum lvl, wstring_view_t msg) {
-    {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
 
@@ -219,95 +195,76 @@ public:
         log_it_(log_msg, log_enabled, traceback_enabled);
     }
 
-    void log(level::level_enum lvl, wstring_view_t msg)
+    void log(level::level_enum lvl, wstring_view_t msg) { log(source_loc{}, lvl, msg); }
-    {
-        log(source_loc{}, lvl, msg);
-    }
 
-    template<typename... Args>
+    template <typename... Args>
-    void trace(wformat_string_t<Args...> fmt, Args &&... args)
+    void trace(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::trace, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void debug(wformat_string_t<Args...> fmt, Args &&... args)
+    void debug(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::debug, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void info(wformat_string_t<Args...> fmt, Args &&... args)
+    void info(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::info, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void warn(wformat_string_t<Args...> fmt, Args &&... args)
+    void warn(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::warn, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void error(wformat_string_t<Args...> fmt, Args &&... args)
+    void error(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::err, fmt, std::forward<Args>(args)...);
     }
 
-    template<typename... Args>
+    template <typename... Args>
-    void critical(wformat_string_t<Args...> fmt, Args &&... args)
+    void critical(wformat_string_t<Args...> fmt, Args &&...args) {
-    {
         log(level::critical, fmt, std::forward<Args>(args)...);
     }
 #endif
 
-    template<typename T>
+    template <typename T>
-    void trace(const T &msg)
+    void trace(const T &msg) {
-    {
         log(level::trace, msg);
     }
 
-    template<typename T>
+    template <typename T>
-    void debug(const T &msg)
+    void debug(const T &msg) {
-    {
         log(level::debug, msg);
     }
 
-    template<typename T>
+    template <typename T>
-    void info(const T &msg)
+    void info(const T &msg) {
-    {
         log(level::info, msg);
     }
 
-    template<typename T>
+    template <typename T>
-    void warn(const T &msg)
+    void warn(const T &msg) {
-    {
         log(level::warn, msg);
     }
 
-    template<typename T>
+    template <typename T>
-    void error(const T &msg)
+    void error(const T &msg) {
-    {
         log(level::err, msg);
     }
 
-    template<typename T>
+    template <typename T>
-    void critical(const T &msg)
+    void critical(const T &msg) {
-    {
         log(level::critical, msg);
     }
 
     // return true logging is enabled for the given level.
-    bool should_log(level::level_enum msg_level) const
+    bool should_log(level::level_enum msg_level) const {
-    {
         return msg_level >= level_.load(std::memory_order_relaxed);
     }
 
     // return true if backtrace logging is enabled.
-    bool should_backtrace() const
+    bool should_backtrace() const { return tracer_.enabled(); }
-    {
-        return tracer_.enabled();
-    }
 
     void set_level(level::level_enum log_level);
 
@@ -319,6 +276,10 @@ public:
     // each sink will get a separate instance of the formatter object.
     void set_formatter(std::unique_ptr<formatter> f);
 
+    // set formatting for the sinks in this logger.
+    // equivalent to
+    //     set_formatter(make_unique<pattern_formatter>(pattern, time_type))
+    // Note: each sink will get a new instance of a formatter object, replacing the old one.
     void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local);
 
     // backtrace support.
@@ -352,23 +313,19 @@ protected:
     details::backtracer tracer_;
 
     // common implementation for after templated public api has been resolved
-    template<typename... Args>
+    template <typename... Args>
-    void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&... args)
+    void log_(source_loc loc, level::level_enum lvl, string_view_t fmt, Args &&...args) {
-    {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
-        SPDLOG_TRY
+        SPDLOG_TRY {
-        {
             memory_buf_t buf;
 #ifdef SPDLOG_USE_STD_FORMAT
-            fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(std::forward<Args>(args)...));
+            fmt_lib::vformat_to(std::back_inserter(buf), fmt, fmt_lib::make_format_args(args...));
 #else
-            // seems that fmt::detail::vformat_to(buf, ...) is ~20ns faster than fmt::vformat_to(std::back_inserter(buf),..)
+            fmt::vformat_to(fmt::appender(buf), fmt, fmt::make_format_args(args...));
-            fmt::detail::vformat_to(buf, fmt, fmt::make_format_args(std::forward<Args>(args)...));
 #endif
 
             details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size()));
@@ -378,25 +335,18 @@ protected:
     }
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-    template<typename... Args>
+    template <typename... Args>
-    void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&... args)
+    void log_(source_loc loc, level::level_enum lvl, wstring_view_t fmt, Args &&...args) {
-    {
         bool log_enabled = should_log(lvl);
         bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
+        if (!log_enabled && !traceback_enabled) {
-        {
             return;
         }
-        SPDLOG_TRY
+        SPDLOG_TRY {
-        {
             // format to wmemory_buffer and convert to utf8
             wmemory_buf_t wbuf;
-#    ifdef SPDLOG_USE_STD_FORMAT
+            fmt_lib::vformat_to(std::back_inserter(wbuf), fmt,
-            fmt_lib::vformat_to(
+                                fmt_lib::make_format_args<fmt_lib::wformat_context>(args...));
-                std::back_inserter(wbuf), fmt, fmt_lib::make_format_args<fmt_lib::wformat_context>(std::forward<Args>(args)...));
-#    else
-            fmt::detail::vformat_to(wbuf, fmt, fmt::make_format_args<fmt::wformat_context>(std::forward<Args>(args)...));
-#    endif
 
             memory_buf_t buf;
             details::os::wstr_to_utf8buf(wstring_view_t(wbuf.data(), wbuf.size()), buf);
@@ -405,27 +355,6 @@ protected:
         }
         SPDLOG_LOGGER_CATCH(loc)
     }
-
-    // T can be statically converted to wstring_view, and no formatting needed.
-    template<class T, typename std::enable_if<std::is_convertible<const T &, spdlog::wstring_view_t>::value, int>::type = 0>
-    void log_(source_loc loc, level::level_enum lvl, const T &msg)
-    {
-        bool log_enabled = should_log(lvl);
-        bool traceback_enabled = tracer_.enabled();
-        if (!log_enabled && !traceback_enabled)
-        {
-            return;
-        }
-        SPDLOG_TRY
-        {
-            memory_buf_t buf;
-            details::os::wstr_to_utf8buf(msg, buf);
-            details::log_msg log_msg(loc, name_, lvl, string_view_t(buf.data(), buf.size()));
-            log_it_(log_msg, log_enabled, traceback_enabled);
-        }
-        SPDLOG_LOGGER_CATCH(loc)
-    }
-
 #endif  // SPDLOG_WCHAR_TO_UTF8_SUPPORT
 
     // log the given message (if the given log level is high enough),
@@ -446,5 +375,5 @@ void swap(logger &a, logger &b);
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "logger-inl.h"
+    #include "logger-inl.h"
 #endif

vendor/spdlog/mdc.h

@@ -0,0 +1,46 @@
+// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+
+#pragma once
+
+#include <map>
+#include <string>
+
+#include <spdlog/common.h>
+
+// MDC is a simple map of key->string values stored in thread local storage whose content will be printed by the loggers.
+// Note: Not supported in async mode (thread local storage - so the async thread pool have different copy).
+//
+// Usage example:
+// spdlog::mdc::put("mdc_key_1", "mdc_value_1");
+// spdlog::info("Hello, {}", "World!");  // => [2024-04-26 02:08:05.040] [info] [mdc_key_1:mdc_value_1] Hello, World!
+
+namespace spdlog {
+class SPDLOG_API mdc {
+public:
+    using mdc_map_t = std::map<std::string, std::string>;
+
+    static void put(const std::string &key, const std::string &value) {
+        get_context()[key] = value;
+    }
+
+    static std::string get(const std::string &key) {
+        auto &context = get_context();
+        auto it = context.find(key);
+        if (it != context.end()) {
+            return it->second;
+        }
+        return "";
+    }
+
+    static void remove(const std::string &key) { get_context().erase(key); }
+
+    static void clear() { get_context().clear(); }
+
+    static mdc_map_t &get_context() {
+        static thread_local mdc_map_t context;
+        return context;
+    }
+};
+
+}  // namespace spdlog

vendor/spdlog/pattern_formatter.h

@@ -13,49 +13,39 @@
 #include <memory>
 
 #include <string>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace spdlog {
 namespace details {
 
 // padding information.
-struct padding_info
+struct padding_info {
-{
+    enum class pad_side { left, right, center };
-    enum class pad_side
-    {
-        left,
-        right,
-        center
-    };
 
     padding_info() = default;
     padding_info(size_t width, padding_info::pad_side side, bool truncate)
-        : width_(width)
+        : width_(width),
-        , side_(side)
+          side_(side),
-        , truncate_(truncate)
+          truncate_(truncate),
-        , enabled_(true)
+          enabled_(true) {}
-    {}
 
-    bool enabled() const
+    bool enabled() const { return enabled_; }
-    {
-        return enabled_;
-    }
     size_t width_ = 0;
     pad_side side_ = pad_side::left;
     bool truncate_ = false;
     bool enabled_ = false;
 };
 
-class SPDLOG_API flag_formatter
+class SPDLOG_API flag_formatter {
-{
 public:
     explicit flag_formatter(padding_info padinfo)
-        : padinfo_(padinfo)
+        : padinfo_(padinfo) {}
-    {}
     flag_formatter() = default;
     virtual ~flag_formatter() = default;
-    virtual void format(const details::log_msg &msg, const std::tm &tm_time, memory_buf_t &dest) = 0;
+    virtual void format(const details::log_msg &msg,
+                        const std::tm &tm_time,
+                        memory_buf_t &dest) = 0;
 
 protected:
     padding_info padinfo_;
@@ -63,27 +53,27 @@ protected:
 
 }  // namespace details
 
-class SPDLOG_API custom_flag_formatter : public details::flag_formatter
+class SPDLOG_API custom_flag_formatter : public details::flag_formatter {
-{
 public:
     virtual std::unique_ptr<custom_flag_formatter> clone() const = 0;
 
-    void set_padding_info(const details::padding_info &padding)
+    void set_padding_info(const details::padding_info &padding) {
-    {
         flag_formatter::padinfo_ = padding;
     }
 };
 
-class SPDLOG_API pattern_formatter final : public formatter
+class SPDLOG_API pattern_formatter final : public formatter {
-{
 public:
     using custom_flags = std::unordered_map<char, std::unique_ptr<custom_flag_formatter>>;
 
-    explicit pattern_formatter(std::string pattern, pattern_time_type time_type = pattern_time_type::local,
+    explicit pattern_formatter(std::string pattern,
-        std::string eol = spdlog::details::os::default_eol, custom_flags custom_user_flags = custom_flags());
+                               pattern_time_type time_type = pattern_time_type::local,
+                               std::string eol = spdlog::details::os::default_eol,
+                               custom_flags custom_user_flags = custom_flags());
 
     // use default pattern is not given
-    explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol);
+    explicit pattern_formatter(pattern_time_type time_type = pattern_time_type::local,
+                               std::string eol = spdlog::details::os::default_eol);
 
     pattern_formatter(const pattern_formatter &other) = delete;
     pattern_formatter &operator=(const pattern_formatter &other) = delete;
@@ -91,9 +81,8 @@ public:
     std::unique_ptr<formatter> clone() const override;
     void format(const details::log_msg &msg, memory_buf_t &dest) override;
 
-    template<typename T, typename... Args>
+    template <typename T, typename... Args>
-    pattern_formatter &add_flag(char flag, Args &&... args)
+    pattern_formatter &add_flag(char flag, Args &&...args) {
-    {
         custom_handlers_[flag] = details::make_unique<T>(std::forward<Args>(args)...);
         return *this;
     }
@@ -111,18 +100,19 @@ private:
     custom_flags custom_handlers_;
 
     std::tm get_time_(const details::log_msg &msg);
-    template<typename Padder>
+    template <typename Padder>
     void handle_flag_(char flag, details::padding_info padding);
 
     // Extract given pad spec (e.g. %8X)
     // Advance the given it pass the end of the padding spec found (if any)
     // Return padding.
-    static details::padding_info handle_padspec_(std::string::const_iterator &it, std::string::const_iterator end);
+    static details::padding_info handle_padspec_(std::string::const_iterator &it,
+                                                 std::string::const_iterator end);
 
     void compile_pattern_(const std::string &pattern);
 };
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "pattern_formatter-inl.h"
+    #include "pattern_formatter-inl.h"
 #endif

vendor/spdlog/sinks/android_sink.h

@@ -5,50 +5,45 @@
 
 #ifdef __ANDROID__
 
-#    include <spdlog/details/fmt_helper.h>
+    #include <spdlog/details/fmt_helper.h>
-#    include <spdlog/details/null_mutex.h>
+    #include <spdlog/details/null_mutex.h>
-#    include <spdlog/details/os.h>
+    #include <spdlog/details/os.h>
-#    include <spdlog/sinks/base_sink.h>
+    #include <spdlog/details/synchronous_factory.h>
-#    include <spdlog/details/synchronous_factory.h>
+    #include <spdlog/sinks/base_sink.h>
 
-#    include <android/log.h>
+    #include <android/log.h>
-#    include <chrono>
+    #include <chrono>
-#    include <mutex>
+    #include <mutex>
-#    include <string>
+    #include <string>
-#    include <thread>
+    #include <thread>
-#    include <type_traits>
+    #include <type_traits>
 
-#    if !defined(SPDLOG_ANDROID_RETRIES)
+    #if !defined(SPDLOG_ANDROID_RETRIES)
-#        define SPDLOG_ANDROID_RETRIES 2
+        #define SPDLOG_ANDROID_RETRIES 2
-#    endif
+    #endif
 
 namespace spdlog {
 namespace sinks {
 
 /*
  * Android sink
- * (logging using __android_log_write or __android_log_buf_write depending on the specified BufferID)
+ * (logging using __android_log_write or __android_log_buf_write depending on the specified
+ * BufferID)
  */
-template<typename Mutex, int BufferID = log_id::LOG_ID_MAIN>
+template <typename Mutex, int BufferID = log_id::LOG_ID_MAIN>
-class android_sink final : public base_sink<Mutex>
+class android_sink final : public base_sink<Mutex> {
-{
 public:
     explicit android_sink(std::string tag = "spdlog", bool use_raw_msg = false)
-        : tag_(std::move(tag))
+        : tag_(std::move(tag)),
-        , use_raw_msg_(use_raw_msg)
+          use_raw_msg_(use_raw_msg) {}
-    {}
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         const android_LogPriority priority = convert_to_android_(msg.level);
         memory_buf_t formatted;
-        if (use_raw_msg_)
+        if (use_raw_msg_) {
-        {
             details::fmt_helper::append_string_view(msg.payload, formatted);
-        }
+        } else {
-        else
-        {
             base_sink<Mutex>::formatter_->format(msg, formatted);
         }
         formatted.push_back('\0');
@@ -56,16 +51,17 @@ protected:
 
         // See system/core/liblog/logger_write.c for explanation of return value
         int ret = android_log(priority, tag_.c_str(), msg_output);
+        if (ret == -EPERM) {
+            return;  // !__android_log_is_loggable
+        }
         int retry_count = 0;
-        while ((ret == -11 /*EAGAIN*/) && (retry_count < SPDLOG_ANDROID_RETRIES))
+        while ((ret == -11 /*EAGAIN*/) && (retry_count < SPDLOG_ANDROID_RETRIES)) {
-        {
             details::os::sleep_for_millis(5);
             ret = android_log(priority, tag_.c_str(), msg_output);
             retry_count++;
         }
 
-        if (ret < 0)
+        if (ret < 0) {
-        {
             throw_spdlog_ex("logging to Android failed", ret);
         }
     }
@@ -73,25 +69,24 @@ protected:
     void flush_() override {}
 
 private:
-    // There might be liblog versions used, that do not support __android_log_buf_write. So we only compile and link against
+    // There might be liblog versions used, that do not support __android_log_buf_write. So we only
-    // __android_log_buf_write, if user explicitely provides a non-default log buffer. Otherwise, when using the default log buffer, always
+    // compile and link against
-    // log via __android_log_write.
+    // __android_log_buf_write, if user explicitly provides a non-default log buffer. Otherwise,
-    template<int ID = BufferID>
+    // when using the default log buffer, always log via __android_log_write.
-    typename std::enable_if<ID == static_cast<int>(log_id::LOG_ID_MAIN), int>::type android_log(int prio, const char *tag, const char *text)
+    template <int ID = BufferID>
-    {
+    typename std::enable_if<ID == static_cast<int>(log_id::LOG_ID_MAIN), int>::type android_log(
+        int prio, const char *tag, const char *text) {
         return __android_log_write(prio, tag, text);
     }
 
-    template<int ID = BufferID>
+    template <int ID = BufferID>
-    typename std::enable_if<ID != static_cast<int>(log_id::LOG_ID_MAIN), int>::type android_log(int prio, const char *tag, const char *text)
+    typename std::enable_if<ID != static_cast<int>(log_id::LOG_ID_MAIN), int>::type android_log(
-    {
+        int prio, const char *tag, const char *text) {
         return __android_log_buf_write(ID, prio, tag, text);
     }
 
-    static android_LogPriority convert_to_android_(spdlog::level::level_enum level)
+    static android_LogPriority convert_to_android_(spdlog::level::level_enum level) {
-    {
+        switch (level) {
-        switch (level)
-        {
             case spdlog::level::trace:
                 return ANDROID_LOG_VERBOSE;
             case spdlog::level::debug:
@@ -116,24 +111,24 @@ private:
 using android_sink_mt = android_sink<std::mutex>;
 using android_sink_st = android_sink<details::null_mutex>;
 
-template<int BufferId = log_id::LOG_ID_MAIN>
+template <int BufferId = log_id::LOG_ID_MAIN>
 using android_sink_buf_mt = android_sink<std::mutex, BufferId>;
-template<int BufferId = log_id::LOG_ID_MAIN>
+template <int BufferId = log_id::LOG_ID_MAIN>
 using android_sink_buf_st = android_sink<details::null_mutex, BufferId>;
 
 }  // namespace sinks
 
 // Create and register android syslog logger
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> android_logger_mt(const std::string &logger_name, const std::string &tag = "spdlog")
+inline std::shared_ptr<logger> android_logger_mt(const std::string &logger_name,
-{
+                                                 const std::string &tag = "spdlog") {
     return Factory::template create<sinks::android_sink_mt>(logger_name, tag);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> android_logger_st(const std::string &logger_name, const std::string &tag = "spdlog")
+inline std::shared_ptr<logger> android_logger_st(const std::string &logger_name,
-{
+                                                 const std::string &tag = "spdlog") {
     return Factory::template create<sinks::android_sink_st>(logger_name, tag);
 }
 

vendor/spdlog/sinks/ansicolor_sink-inl.h

@@ -4,42 +4,41 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/ansicolor_sink.h>
+    #include <spdlog/sinks/ansicolor_sink.h>
 #endif
 
-#include <spdlog/pattern_formatter.h>
 #include <spdlog/details/os.h>
+#include <spdlog/pattern_formatter.h>
 
 namespace spdlog {
 namespace sinks {
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE ansicolor_sink<ConsoleMutex>::ansicolor_sink(FILE *target_file, color_mode mode)
-    : target_file_(target_file)
+    : target_file_(target_file),
-    , mutex_(ConsoleMutex::mutex())
+      mutex_(ConsoleMutex::mutex()),
-    , formatter_(details::make_unique<spdlog::pattern_formatter>())
+      formatter_(details::make_unique<spdlog::pattern_formatter>())
 
 {
     set_color_mode(mode);
-    colors_[level::trace] = to_string_(white);
+    colors_.at(level::trace) = to_string_(white);
-    colors_[level::debug] = to_string_(cyan);
+    colors_.at(level::debug) = to_string_(cyan);
-    colors_[level::info] = to_string_(green);
+    colors_.at(level::info) = to_string_(green);
-    colors_[level::warn] = to_string_(yellow_bold);
+    colors_.at(level::warn) = to_string_(yellow_bold);
-    colors_[level::err] = to_string_(red_bold);
+    colors_.at(level::err) = to_string_(red_bold);
-    colors_[level::critical] = to_string_(bold_on_red);
+    colors_.at(level::critical) = to_string_(bold_on_red);
-    colors_[level::off] = to_string_(reset);
+    colors_.at(level::off) = to_string_(reset);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_color(level::level_enum color_level, string_view_t color)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_color(level::level_enum color_level,
-{
+                                                           string_view_t color) {
     std::lock_guard<mutex_t> lock(mutex_);
-    colors_[static_cast<size_t>(color_level)] = to_string_(color);
+    colors_.at(static_cast<size_t>(color_level)) = to_string_(color);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::log(const details::log_msg &msg)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::log(const details::log_msg &msg) {
-{
     // Wrap the originally formatted message in color codes.
     // If color is not supported in the terminal, log as is instead.
     std::lock_guard<mutex_t> lock(mutex_);
@@ -47,61 +46,55 @@ SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::log(const details::log_msg &msg
     msg.color_range_end = 0;
     memory_buf_t formatted;
     formatter_->format(msg, formatted);
-    if (should_do_colors_ && msg.color_range_end > msg.color_range_start)
+    if (should_do_colors_ && msg.color_range_end > msg.color_range_start) {
-    {
         // before color range
         print_range_(formatted, 0, msg.color_range_start);
         // in color range
-        print_ccode_(colors_[static_cast<size_t>(msg.level)]);
+        print_ccode_(colors_.at(static_cast<size_t>(msg.level)));
         print_range_(formatted, msg.color_range_start, msg.color_range_end);
         print_ccode_(reset);
         // after color range
         print_range_(formatted, msg.color_range_end, formatted.size());
-    }
+    } else  // no color
-    else // no color
     {
         print_range_(formatted, 0, formatted.size());
     }
     fflush(target_file_);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::flush()
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::flush() {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     fflush(target_file_);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_pattern(const std::string &pattern)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_pattern(const std::string &pattern) {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::unique_ptr<spdlog::formatter>(new pattern_formatter(pattern));
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_formatter(
-{
+    std::unique_ptr<spdlog::formatter> sink_formatter) {
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::move(sink_formatter);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE bool ansicolor_sink<ConsoleMutex>::should_color()
+SPDLOG_INLINE bool ansicolor_sink<ConsoleMutex>::should_color() {
-{
     return should_do_colors_;
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_color_mode(color_mode mode)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_color_mode(color_mode mode) {
-{
+    switch (mode) {
-    switch (mode)
-    {
         case color_mode::always:
             should_do_colors_ = true;
             return;
         case color_mode::automatic:
-        should_do_colors_ = details::os::in_terminal(target_file_) && details::os::is_color_terminal();
+            should_do_colors_ =
+                details::os::in_terminal(target_file_) && details::os::is_color_terminal();
             return;
         case color_mode::never:
             should_do_colors_ = false;
@@ -111,35 +104,32 @@ SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::set_color_mode(color_mode mode)
     }
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::print_ccode_(const string_view_t &color_code)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::print_ccode_(const string_view_t &color_code) {
-{
     fwrite(color_code.data(), sizeof(char), color_code.size(), target_file_);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::print_range_(const memory_buf_t &formatted, size_t start, size_t end)
+SPDLOG_INLINE void ansicolor_sink<ConsoleMutex>::print_range_(const memory_buf_t &formatted,
-{
+                                                              size_t start,
+                                                              size_t end) {
     fwrite(formatted.data() + start, sizeof(char), end - start, target_file_);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE std::string ansicolor_sink<ConsoleMutex>::to_string_(const string_view_t &sv)
+SPDLOG_INLINE std::string ansicolor_sink<ConsoleMutex>::to_string_(const string_view_t &sv) {
-{
     return std::string(sv.data(), sv.size());
 }
 
 // ansicolor_stdout_sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE ansicolor_stdout_sink<ConsoleMutex>::ansicolor_stdout_sink(color_mode mode)
-    : ansicolor_sink<ConsoleMutex>(stdout, mode)
+    : ansicolor_sink<ConsoleMutex>(stdout, mode) {}
-{}
 
 // ansicolor_stderr_sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE ansicolor_stderr_sink<ConsoleMutex>::ansicolor_stderr_sink(color_mode mode)
-    : ansicolor_sink<ConsoleMutex>(stderr, mode)
+    : ansicolor_sink<ConsoleMutex>(stderr, mode) {}
-{}
 
 }  // namespace sinks
 }  // namespace spdlog

vendor/spdlog/sinks/ansicolor_sink.h

@@ -3,13 +3,13 @@
 
 #pragma once
 
+#include <array>
+#include <memory>
+#include <mutex>
 #include <spdlog/details/console_globals.h>
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/sinks/sink.h>
-#include <memory>
-#include <mutex>
 #include <string>
-#include <array>
 
 namespace spdlog {
 namespace sinks {
@@ -21,9 +21,8 @@ namespace sinks {
  * If no color terminal detected, omit the escape codes.
  */
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class ansicolor_sink : public sink
+class ansicolor_sink : public sink {
-{
 public:
     using mutex_t = typename ConsoleMutex::mutex_t;
     ansicolor_sink(FILE *target_file, color_mode mode);
@@ -90,16 +89,14 @@ private:
     static std::string to_string_(const string_view_t &sv);
 };
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class ansicolor_stdout_sink : public ansicolor_sink<ConsoleMutex>
+class ansicolor_stdout_sink : public ansicolor_sink<ConsoleMutex> {
-{
 public:
     explicit ansicolor_stdout_sink(color_mode mode = color_mode::automatic);
 };
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class ansicolor_stderr_sink : public ansicolor_sink<ConsoleMutex>
+class ansicolor_stderr_sink : public ansicolor_sink<ConsoleMutex> {
-{
 public:
     explicit ansicolor_stderr_sink(color_mode mode = color_mode::automatic);
 };
@@ -114,5 +111,5 @@ using ansicolor_stderr_sink_st = ansicolor_stderr_sink<details::console_nullmute
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "ansicolor_sink-inl.h"
+    #include "ansicolor_sink-inl.h"
 #endif

vendor/spdlog/sinks/base_sink-inl.h

@@ -4,60 +4,56 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/base_sink.h>
+    #include <spdlog/sinks/base_sink.h>
 #endif
 
 #include <spdlog/common.h>
 #include <spdlog/pattern_formatter.h>
 
 #include <memory>
+#include <mutex>
 
-template<typename Mutex>
+template <typename Mutex>
 SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::base_sink()
-    : formatter_{details::make_unique<spdlog::pattern_formatter>()}
+    : formatter_{details::make_unique<spdlog::pattern_formatter>()} {}
-{}
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::base_sink(std::unique_ptr<spdlog::formatter> formatter)
+SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::base_sink(
-    : formatter_{std::move(formatter)}
+    std::unique_ptr<spdlog::formatter> formatter)
-{}
+    : formatter_{std::move(formatter)} {}
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::log(const details::log_msg &msg)
+void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::log(const details::log_msg &msg) {
-{
     std::lock_guard<Mutex> lock(mutex_);
     sink_it_(msg);
 }
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::flush()
+void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::flush() {
-{
     std::lock_guard<Mutex> lock(mutex_);
     flush_();
 }
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_pattern(const std::string &pattern)
+void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_pattern(const std::string &pattern) {
-{
     std::lock_guard<Mutex> lock(mutex_);
     set_pattern_(pattern);
 }
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter)
+void SPDLOG_INLINE
-{
+spdlog::sinks::base_sink<Mutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) {
     std::lock_guard<Mutex> lock(mutex_);
     set_formatter_(std::move(sink_formatter));
 }
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_pattern_(const std::string &pattern)
+void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_pattern_(const std::string &pattern) {
-{
     set_formatter_(details::make_unique<spdlog::pattern_formatter>(pattern));
 }
 
-template<typename Mutex>
+template <typename Mutex>
-void SPDLOG_INLINE spdlog::sinks::base_sink<Mutex>::set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter)
+void SPDLOG_INLINE
-{
+spdlog::sinks::base_sink<Mutex>::set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) {
     formatter_ = std::move(sink_formatter);
 }

vendor/spdlog/sinks/base_sink.h

@@ -15,9 +15,8 @@
 
 namespace spdlog {
 namespace sinks {
-template<typename Mutex>
+template <typename Mutex>
-class SPDLOG_API base_sink : public sink
+class SPDLOG_API base_sink : public sink {
-{
 public:
     base_sink();
     explicit base_sink(std::unique_ptr<spdlog::formatter> formatter);
@@ -48,5 +47,5 @@ protected:
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "base_sink-inl.h"
+    #include "base_sink-inl.h"
 #endif

vendor/spdlog/sinks/basic_file_sink-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/basic_file_sink.h>
+    #include <spdlog/sinks/basic_file_sink.h>
 #endif
 
 #include <spdlog/common.h>
@@ -13,30 +13,28 @@
 namespace spdlog {
 namespace sinks {
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE basic_file_sink<Mutex>::basic_file_sink(const filename_t &filename, bool truncate, const file_event_handlers &event_handlers)
+SPDLOG_INLINE basic_file_sink<Mutex>::basic_file_sink(const filename_t &filename,
-    : file_helper_{event_handlers}
+                                                      bool truncate,
-{
+                                                      const file_event_handlers &event_handlers)
+    : file_helper_{event_handlers} {
     file_helper_.open(filename, truncate);
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE const filename_t &basic_file_sink<Mutex>::filename() const
+SPDLOG_INLINE const filename_t &basic_file_sink<Mutex>::filename() const {
-{
     return file_helper_.filename();
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE void basic_file_sink<Mutex>::sink_it_(const details::log_msg &msg)
+SPDLOG_INLINE void basic_file_sink<Mutex>::sink_it_(const details::log_msg &msg) {
-{
     memory_buf_t formatted;
     base_sink<Mutex>::formatter_->format(msg, formatted);
     file_helper_.write(formatted);
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE void basic_file_sink<Mutex>::flush_()
+SPDLOG_INLINE void basic_file_sink<Mutex>::flush_() {
-{
     file_helper_.flush();
 }
 

vendor/spdlog/sinks/basic_file_sink.h

@@ -5,8 +5,8 @@
 
 #include <spdlog/details/file_helper.h>
 #include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <mutex>
 #include <string>
@@ -16,11 +16,12 @@ namespace sinks {
 /*
  * Trivial file sink with single file as target
  */
-template<typename Mutex>
+template <typename Mutex>
-class basic_file_sink final : public base_sink<Mutex>
+class basic_file_sink final : public base_sink<Mutex> {
-{
 public:
-    explicit basic_file_sink(const filename_t &filename, bool truncate = false, const file_event_handlers &event_handlers = {});
+    explicit basic_file_sink(const filename_t &filename,
+                             bool truncate = false,
+                             const file_event_handlers &event_handlers = {});
     const filename_t &filename() const;
 
 protected:
@@ -39,22 +40,26 @@ using basic_file_sink_st = basic_file_sink<details::null_mutex>;
 //
 // factory functions
 //
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> basic_logger_mt(
+inline std::shared_ptr<logger> basic_logger_mt(const std::string &logger_name,
-    const std::string &logger_name, const filename_t &filename, bool truncate = false, const file_event_handlers &event_handlers = {})
+                                               const filename_t &filename,
-{
+                                               bool truncate = false,
-    return Factory::template create<sinks::basic_file_sink_mt>(logger_name, filename, truncate, event_handlers);
+                                               const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::basic_file_sink_mt>(logger_name, filename, truncate,
+                                                               event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> basic_logger_st(
+inline std::shared_ptr<logger> basic_logger_st(const std::string &logger_name,
-    const std::string &logger_name, const filename_t &filename, bool truncate = false, const file_event_handlers &event_handlers = {})
+                                               const filename_t &filename,
-{
+                                               bool truncate = false,
-    return Factory::template create<sinks::basic_file_sink_st>(logger_name, filename, truncate, event_handlers);
+                                               const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::basic_file_sink_st>(logger_name, filename, truncate,
+                                                               event_handlers);
 }
 
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "basic_file_sink-inl.h"
+    #include "basic_file_sink-inl.h"
 #endif

vendor/spdlog/sinks/callback_sink.h

@@ -0,0 +1,56 @@
+// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+
+#pragma once
+
+#include <spdlog/details/null_mutex.h>
+#include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
+
+#include <mutex>
+#include <string>
+
+namespace spdlog {
+
+// callbacks type
+typedef std::function<void(const details::log_msg &msg)> custom_log_callback;
+
+namespace sinks {
+/*
+ * Trivial callback sink, gets a callback function and calls it on each log
+ */
+template <typename Mutex>
+class callback_sink final : public base_sink<Mutex> {
+public:
+    explicit callback_sink(const custom_log_callback &callback)
+        : callback_{callback} {}
+
+protected:
+    void sink_it_(const details::log_msg &msg) override { callback_(msg); }
+    void flush_() override{};
+
+private:
+    custom_log_callback callback_;
+};
+
+using callback_sink_mt = callback_sink<std::mutex>;
+using callback_sink_st = callback_sink<details::null_mutex>;
+
+}  // namespace sinks
+
+//
+// factory functions
+//
+template <typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> callback_logger_mt(const std::string &logger_name,
+                                                  const custom_log_callback &callback) {
+    return Factory::template create<sinks::callback_sink_mt>(logger_name, callback);
+}
+
+template <typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> callback_logger_st(const std::string &logger_name,
+                                                  const custom_log_callback &callback) {
+    return Factory::template create<sinks::callback_sink_st>(logger_name, callback);
+}
+
+}  // namespace spdlog

vendor/spdlog/sinks/daily_file_sink.h

@@ -4,19 +4,20 @@
 #pragma once
 
 #include <spdlog/common.h>
+#include <spdlog/details/circular_q.h>
 #include <spdlog/details/file_helper.h>
 #include <spdlog/details/null_mutex.h>
-#include <spdlog/fmt/fmt.h>
-#include <spdlog/fmt/chrono.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/os.h>
-#include <spdlog/details/circular_q.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/fmt/chrono.h>
+#include <spdlog/fmt/fmt.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <chrono>
 #include <cstdio>
-#include <ctime>
+#include <iomanip>
 #include <mutex>
+#include <sstream>
 #include <string>
 
 namespace spdlog {
@@ -25,85 +26,36 @@ namespace sinks {
 /*
  * Generator of daily log file names in format basename.YYYY-MM-DD.ext
  */
-struct daily_filename_calculator
+struct daily_filename_calculator {
-{
     // Create filename for the form basename.YYYY-MM-DD
-    static filename_t calc_filename(const filename_t &filename, const tm &now_tm)
+    static filename_t calc_filename(const filename_t &filename, const tm &now_tm) {
-    {
         filename_t basename, ext;
         std::tie(basename, ext) = details::file_helper::split_by_extension(filename);
-        return fmt_lib::format(
+        return fmt_lib::format(SPDLOG_FMT_STRING(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}{}")),
-            SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}{}"), basename, now_tm.tm_year + 1900, now_tm.tm_mon + 1, now_tm.tm_mday, ext);
+                               basename, now_tm.tm_year + 1900, now_tm.tm_mon + 1, now_tm.tm_mday,
+                               ext);
     }
 };
 
 /*
  * Generator of daily log file names with strftime format.
  * Usages:
- *    auto sink =  std::make_shared<spdlog::sinks::daily_file_format_sink_mt>("myapp-%Y-%m-%d:%H:%M:%S.log", hour, minute);"
+ *    auto sink =
- *    auto logger = spdlog::daily_logger_format_mt("loggername, "myapp-%Y-%m-%d:%X.log", hour,  minute)"
+ * std::make_shared<spdlog::sinks::daily_file_format_sink_mt>("myapp-%Y-%m-%d:%H:%M:%S.log", hour,
+ * minute);" auto logger = spdlog::daily_logger_format_mt("loggername, "myapp-%Y-%m-%d:%X.log",
+ * hour,  minute)"
  *
  */
-struct daily_filename_format_calculator
+struct daily_filename_format_calculator {
-{
+    static filename_t calc_filename(const filename_t &file_path, const tm &now_tm) {
-    static filename_t calc_filename(const filename_t &filename, const tm &now_tm)
+#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
-    {
+        std::wstringstream stream;
-#ifdef SPDLOG_USE_STD_FORMAT
-        // adapted from fmtlib: https://github.com/fmtlib/fmt/blob/8.0.1/include/fmt/chrono.h#L522-L546
-
-        filename_t tm_format;
-        tm_format.append(filename);
-        // By appending an extra space we can distinguish an empty result that
-        // indicates insufficient buffer size from a guaranteed non-empty result
-        // https://github.com/fmtlib/fmt/issues/2238
-        tm_format.push_back(' ');
-
-        const size_t MIN_SIZE = 10;
-        filename_t buf;
-        buf.resize(MIN_SIZE);
-        for (;;)
-        {
-            size_t count = strftime(buf.data(), buf.size(), tm_format.c_str(), &now_tm);
-            if (count != 0)
-            {
-                // Remove the extra space.
-                buf.resize(count - 1);
-                break;
-            }
-            buf.resize(buf.size() * 2);
-        }
-
-        return buf;
 #else
-        // generate fmt datetime format string, e.g. {:%Y-%m-%d}.
+        std::stringstream stream;
-        filename_t fmt_filename = fmt::format(SPDLOG_FILENAME_T("{{:{}}}"), filename);
-#    if defined(_MSC_VER) && defined(SPDLOG_WCHAR_FILENAMES) // for some reason msvc doesn't allow fmt::runtime(..) with wchar here
-        return fmt::format(fmt_filename, now_tm);
-#    else
-        return fmt::format(SPDLOG_FMT_RUNTIME(fmt_filename), now_tm);
-#    endif
 #endif
+        stream << std::put_time(&now_tm, file_path.c_str());
+        return stream.str();
     }
-
-private:
-#if defined __GNUC__
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wformat-nonliteral"
-#endif
-
-    static size_t strftime(char *str, size_t count, const char *format, const std::tm *time)
-    {
-        return std::strftime(str, count, format, time);
-    }
-
-    static size_t strftime(wchar_t *str, size_t count, const wchar_t *format, const std::tm *time)
-    {
-        return std::wcsftime(str, count, format, time);
-    }
-
-#if defined(__GNUC__)
-#    pragma GCC diagnostic pop
-#endif
 };
 
 /*
@@ -111,23 +63,25 @@ private:
  * If truncate != false , the created file will be truncated.
  * If max_files > 0, retain only the last max_files and delete previous.
  */
-template<typename Mutex, typename FileNameCalc = daily_filename_calculator>
+template <typename Mutex, typename FileNameCalc = daily_filename_calculator>
-class daily_file_sink final : public base_sink<Mutex>
+class daily_file_sink final : public base_sink<Mutex> {
-{
 public:
     // create daily file sink which rotates on given time
-    daily_file_sink(filename_t base_filename, int rotation_hour, int rotation_minute, bool truncate = false, uint16_t max_files = 0,
+    daily_file_sink(filename_t base_filename,
+                    int rotation_hour,
+                    int rotation_minute,
+                    bool truncate = false,
+                    uint16_t max_files = 0,
                     const file_event_handlers &event_handlers = {})
-        : base_filename_(std::move(base_filename))
+        : base_filename_(std::move(base_filename)),
-        , rotation_h_(rotation_hour)
+          rotation_h_(rotation_hour),
-        , rotation_m_(rotation_minute)
+          rotation_m_(rotation_minute),
-        , file_helper_{event_handlers}
+          file_helper_{event_handlers},
-        , truncate_(truncate)
+          truncate_(truncate),
-        , max_files_(max_files)
+          max_files_(max_files),
-        , filenames_q_()
+          filenames_q_() {
-    {
+        if (rotation_hour < 0 || rotation_hour > 23 || rotation_minute < 0 ||
-        if (rotation_hour < 0 || rotation_hour > 23 || rotation_minute < 0 || rotation_minute > 59)
+            rotation_minute > 59) {
-        {
             throw_spdlog_ex("daily_file_sink: Invalid rotation time in ctor");
         }
 
@@ -136,25 +90,21 @@ public:
         file_helper_.open(filename, truncate_);
         rotation_tp_ = next_rotation_tp_();
 
-        if (max_files_ > 0)
+        if (max_files_ > 0) {
-        {
             init_filenames_q_();
         }
     }
 
-    filename_t filename()
+    filename_t filename() {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         return file_helper_.filename();
     }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         auto time = msg.time;
         bool should_rotate = time >= rotation_tp_;
-        if (should_rotate)
+        if (should_rotate) {
-        {
             auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(time));
             file_helper_.open(filename, truncate_);
             rotation_tp_ = next_rotation_tp_();
@@ -164,57 +114,46 @@ protected:
         file_helper_.write(formatted);
 
         // Do the cleaning only at the end because it might throw on failure.
-        if (should_rotate && max_files_ > 0)
+        if (should_rotate && max_files_ > 0) {
-        {
             delete_old_();
         }
     }
 
-    void flush_() override
+    void flush_() override { file_helper_.flush(); }
-    {
-        file_helper_.flush();
-    }
 
 private:
-    void init_filenames_q_()
+    void init_filenames_q_() {
-    {
         using details::os::path_exists;
 
         filenames_q_ = details::circular_q<filename_t>(static_cast<size_t>(max_files_));
         std::vector<filename_t> filenames;
         auto now = log_clock::now();
-        while (filenames.size() < max_files_)
+        while (filenames.size() < max_files_) {
-        {
             auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(now));
-            if (!path_exists(filename))
+            if (!path_exists(filename)) {
-            {
                 break;
             }
             filenames.emplace_back(filename);
             now -= std::chrono::hours(24);
         }
-        for (auto iter = filenames.rbegin(); iter != filenames.rend(); ++iter)
+        for (auto iter = filenames.rbegin(); iter != filenames.rend(); ++iter) {
-        {
             filenames_q_.push_back(std::move(*iter));
         }
     }
 
-    tm now_tm(log_clock::time_point tp)
+    tm now_tm(log_clock::time_point tp) {
-    {
         time_t tnow = log_clock::to_time_t(tp);
         return spdlog::details::os::localtime(tnow);
     }
 
-    log_clock::time_point next_rotation_tp_()
+    log_clock::time_point next_rotation_tp_() {
-    {
         auto now = log_clock::now();
         tm date = now_tm(now);
         date.tm_hour = rotation_h_;
         date.tm_min = rotation_m_;
         date.tm_sec = 0;
         auto rotation_time = log_clock::from_time_t(std::mktime(&date));
-        if (rotation_time > now)
+        if (rotation_time > now) {
-        {
             return rotation_time;
         }
         return {rotation_time + std::chrono::hours(24)};
@@ -222,21 +161,19 @@ private:
 
     // Delete the file N rotations ago.
     // Throw spdlog_ex on failure to delete the old file.
-    void delete_old_()
+    void delete_old_() {
-    {
         using details::os::filename_to_str;
         using details::os::remove_if_exists;
 
         filename_t current_file = file_helper_.filename();
-        if (filenames_q_.full())
+        if (filenames_q_.full()) {
-        {
             auto old_filename = std::move(filenames_q_.front());
             filenames_q_.pop_front();
             bool ok = remove_if_exists(old_filename) == 0;
-            if (!ok)
+            if (!ok) {
-            {
                 filenames_q_.push_back(std::move(current_file));
-                throw_spdlog_ex("Failed removing daily file " + filename_to_str(old_filename), errno);
+                throw_spdlog_ex("Failed removing daily file " + filename_to_str(old_filename),
+                                errno);
             }
         }
         filenames_q_.push_back(std::move(current_file));
@@ -255,39 +192,60 @@ private:
 using daily_file_sink_mt = daily_file_sink<std::mutex>;
 using daily_file_sink_st = daily_file_sink<details::null_mutex>;
 using daily_file_format_sink_mt = daily_file_sink<std::mutex, daily_filename_format_calculator>;
-using daily_file_format_sink_st = daily_file_sink<details::null_mutex, daily_filename_format_calculator>;
+using daily_file_format_sink_st =
+    daily_file_sink<details::null_mutex, daily_filename_format_calculator>;
 
 }  // namespace sinks
 
 //
 // factory functions
 //
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> daily_logger_mt(const std::string &logger_name, const filename_t &filename, int hour = 0, int minute = 0,
+inline std::shared_ptr<logger> daily_logger_mt(const std::string &logger_name,
-    bool truncate = false, uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+                                               const filename_t &filename,
-{
+                                               int hour = 0,
-    return Factory::template create<sinks::daily_file_sink_mt>(logger_name, filename, hour, minute, truncate, max_files, event_handlers);
+                                               int minute = 0,
+                                               bool truncate = false,
+                                               uint16_t max_files = 0,
+                                               const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::daily_file_sink_mt>(logger_name, filename, hour, minute,
+                                                               truncate, max_files, event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> daily_logger_format_mt(const std::string &logger_name, const filename_t &filename, int hour = 0,
+inline std::shared_ptr<logger> daily_logger_format_mt(
-    int minute = 0, bool truncate = false, uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+    const std::string &logger_name,
-{
+    const filename_t &filename,
+    int hour = 0,
+    int minute = 0,
+    bool truncate = false,
+    uint16_t max_files = 0,
+    const file_event_handlers &event_handlers = {}) {
     return Factory::template create<sinks::daily_file_format_sink_mt>(
         logger_name, filename, hour, minute, truncate, max_files, event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> daily_logger_st(const std::string &logger_name, const filename_t &filename, int hour = 0, int minute = 0,
+inline std::shared_ptr<logger> daily_logger_st(const std::string &logger_name,
-    bool truncate = false, uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+                                               const filename_t &filename,
-{
+                                               int hour = 0,
-    return Factory::template create<sinks::daily_file_sink_st>(logger_name, filename, hour, minute, truncate, max_files, event_handlers);
+                                               int minute = 0,
+                                               bool truncate = false,
+                                               uint16_t max_files = 0,
+                                               const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::daily_file_sink_st>(logger_name, filename, hour, minute,
+                                                               truncate, max_files, event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> daily_logger_format_st(const std::string &logger_name, const filename_t &filename, int hour = 0,
+inline std::shared_ptr<logger> daily_logger_format_st(
-    int minute = 0, bool truncate = false, uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+    const std::string &logger_name,
-{
+    const filename_t &filename,
+    int hour = 0,
+    int minute = 0,
+    bool truncate = false,
+    uint16_t max_files = 0,
+    const file_event_handlers &event_handlers = {}) {
     return Factory::template create<sinks::daily_file_format_sink_st>(
         logger_name, filename, hour, minute, truncate, max_files, event_handlers);
 }

vendor/spdlog/sinks/dist_sink.h

@@ -19,72 +19,56 @@
 namespace spdlog {
 namespace sinks {
 
-template<typename Mutex>
+template <typename Mutex>
-class dist_sink : public base_sink<Mutex>
+class dist_sink : public base_sink<Mutex> {
-{
 public:
     dist_sink() = default;
     explicit dist_sink(std::vector<std::shared_ptr<sink>> sinks)
-        : sinks_(sinks)
+        : sinks_(sinks) {}
-    {}
 
     dist_sink(const dist_sink &) = delete;
     dist_sink &operator=(const dist_sink &) = delete;
 
-    void add_sink(std::shared_ptr<sink> sink)
+    void add_sink(std::shared_ptr<sink> sub_sink) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
-        sinks_.push_back(sink);
+        sinks_.push_back(sub_sink);
     }
 
-    void remove_sink(std::shared_ptr<sink> sink)
+    void remove_sink(std::shared_ptr<sink> sub_sink) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
-        sinks_.erase(std::remove(sinks_.begin(), sinks_.end(), sink), sinks_.end());
+        sinks_.erase(std::remove(sinks_.begin(), sinks_.end(), sub_sink), sinks_.end());
     }
 
-    void set_sinks(std::vector<std::shared_ptr<sink>> sinks)
+    void set_sinks(std::vector<std::shared_ptr<sink>> sinks) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         sinks_ = std::move(sinks);
     }
 
-    std::vector<std::shared_ptr<sink>> &sinks()
+    std::vector<std::shared_ptr<sink>> &sinks() { return sinks_; }
-    {
-        return sinks_;
-    }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
+        for (auto &sub_sink : sinks_) {
-        for (auto &sink : sinks_)
+            if (sub_sink->should_log(msg.level)) {
-        {
+                sub_sink->log(msg);
-            if (sink->should_log(msg.level))
-            {
-                sink->log(msg);
             }
         }
     }
 
-    void flush_() override
+    void flush_() override {
-    {
+        for (auto &sub_sink : sinks_) {
-        for (auto &sink : sinks_)
+            sub_sink->flush();
-        {
-            sink->flush();
         }
     }
 
-    void set_pattern_(const std::string &pattern) override
+    void set_pattern_(const std::string &pattern) override {
-    {
         set_formatter_(details::make_unique<spdlog::pattern_formatter>(pattern));
     }
 
-    void set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) override
+    void set_formatter_(std::unique_ptr<spdlog::formatter> sink_formatter) override {
-    {
         base_sink<Mutex>::formatter_ = std::move(sink_formatter);
-        for (auto &sink : sinks_)
+        for (auto &sub_sink : sinks_) {
-        {
+            sub_sink->set_formatter(base_sink<Mutex>::formatter_->clone());
-            sink->set_formatter(base_sink<Mutex>::formatter_->clone());
         }
     }
     std::vector<std::shared_ptr<sink>> sinks_;

vendor/spdlog/sinks/dup_filter_sink.h

@@ -4,13 +4,13 @@
 #pragma once
 
 #include "dist_sink.h"
-#include <spdlog/details/null_mutex.h>
 #include <spdlog/details/log_msg.h>
+#include <spdlog/details/null_mutex.h>
 
+#include <chrono>
 #include <cstdio>
 #include <mutex>
 #include <string>
-#include <chrono>
 
 // Duplicate message removal sink.
 // Skip the message if previous one is identical and less than "max_skip_duration" have passed
@@ -20,8 +20,8 @@
 //     #include <spdlog/sinks/dup_filter_sink.h>
 //
 //     int main() {
-//         auto dup_filter = std::make_shared<dup_filter_sink_st>(std::chrono::seconds(5));
+//         auto dup_filter = std::make_shared<dup_filter_sink_st>(std::chrono::seconds(5),
-//         dup_filter->add_sink(std::make_shared<stdout_color_sink_mt>());
+//         level::info); dup_filter->add_sink(std::make_shared<stdout_color_sink_mt>());
 //         spdlog::logger l("logger", dup_filter);
 //         l.info("Hello");
 //         l.info("Hello");
@@ -36,38 +36,37 @@
 
 namespace spdlog {
 namespace sinks {
-template<typename Mutex>
+template <typename Mutex>
-class dup_filter_sink : public dist_sink<Mutex>
+class dup_filter_sink : public dist_sink<Mutex> {
-{
 public:
-    template<class Rep, class Period>
+    template <class Rep, class Period>
-    explicit dup_filter_sink(std::chrono::duration<Rep, Period> max_skip_duration)
+    explicit dup_filter_sink(std::chrono::duration<Rep, Period> max_skip_duration,
-        : max_skip_duration_{max_skip_duration}
+                             level::level_enum notification_level = level::info)
-    {}
+        : max_skip_duration_{max_skip_duration},
+          log_level_{notification_level} {}
 
 protected:
     std::chrono::microseconds max_skip_duration_;
     log_clock::time_point last_msg_time_;
     std::string last_msg_payload_;
     size_t skip_counter_ = 0;
+    level::level_enum log_level_;
 
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         bool filtered = filter_(msg);
-        if (!filtered)
+        if (!filtered) {
-        {
             skip_counter_ += 1;
             return;
         }
 
         // log the "skipped.." message
-        if (skip_counter_ > 0)
+        if (skip_counter_ > 0) {
-        {
             char buf[64];
-            auto msg_size = ::snprintf(buf, sizeof(buf), "Skipped %u duplicate messages..", static_cast<unsigned>(skip_counter_));
+            auto msg_size = ::snprintf(buf, sizeof(buf), "Skipped %u duplicate messages..",
-            if (msg_size > 0 && static_cast<size_t>(msg_size) < sizeof(buf))
+                                       static_cast<unsigned>(skip_counter_));
-            {
+            if (msg_size > 0 && static_cast<size_t>(msg_size) < sizeof(buf)) {
-                details::log_msg skipped_msg{msg.logger_name, level::info, string_view_t{buf, static_cast<size_t>(msg_size)}};
+                details::log_msg skipped_msg{msg.source, msg.logger_name, log_level_,
+                                             string_view_t{buf, static_cast<size_t>(msg_size)}};
                 dist_sink<Mutex>::sink_it_(skipped_msg);
             }
         }
@@ -80,8 +79,7 @@ protected:
     }
 
     // return whether the log msg should be displayed (true) or skipped (false)
-    bool filter_(const details::log_msg &msg)
+    bool filter_(const details::log_msg &msg) {
-    {
         auto filter_duration = msg.time - last_msg_time_;
         return (filter_duration > max_skip_duration_) || (msg.payload != last_msg_payload_);
     }

vendor/spdlog/sinks/hourly_file_sink.h

@@ -4,13 +4,13 @@
 #pragma once
 
 #include <spdlog/common.h>
+#include <spdlog/details/circular_q.h>
 #include <spdlog/details/file_helper.h>
 #include <spdlog/details/null_mutex.h>
+#include <spdlog/details/os.h>
+#include <spdlog/details/synchronous_factory.h>
 #include <spdlog/fmt/fmt.h>
 #include <spdlog/sinks/base_sink.h>
-#include <spdlog/details/os.h>
-#include <spdlog/details/circular_q.h>
-#include <spdlog/details/synchronous_factory.h>
 
 #include <chrono>
 #include <cstdio>
@@ -24,15 +24,14 @@ namespace sinks {
 /*
  * Generator of Hourly log file names in format basename.YYYY-MM-DD-HH.ext
  */
-struct hourly_filename_calculator
+struct hourly_filename_calculator {
-{
     // Create filename for the form basename.YYYY-MM-DD-H
-    static filename_t calc_filename(const filename_t &filename, const tm &now_tm)
+    static filename_t calc_filename(const filename_t &filename, const tm &now_tm) {
-    {
         filename_t basename, ext;
         std::tie(basename, ext) = details::file_helper::split_by_extension(filename);
-        return fmt_lib::format(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}_{:02d}{}"), basename, now_tm.tm_year + 1900, now_tm.tm_mon + 1,
+        return fmt_lib::format(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}_{:02d}{}"), basename,
-            now_tm.tm_mday, now_tm.tm_hour, ext);
+                               now_tm.tm_year + 1900, now_tm.tm_mon + 1, now_tm.tm_mday,
+                               now_tm.tm_hour, ext);
     }
 };
 
@@ -41,102 +40,93 @@ struct hourly_filename_calculator
  * If truncate != false , the created file will be truncated.
  * If max_files > 0, retain only the last max_files and delete previous.
  */
-template<typename Mutex, typename FileNameCalc = hourly_filename_calculator>
+template <typename Mutex, typename FileNameCalc = hourly_filename_calculator>
-class hourly_file_sink final : public base_sink<Mutex>
+class hourly_file_sink final : public base_sink<Mutex> {
-{
 public:
     // create hourly file sink which rotates on given time
-    hourly_file_sink(
+    hourly_file_sink(filename_t base_filename,
-        filename_t base_filename, bool truncate = false, uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+                     bool truncate = false,
-        : base_filename_(std::move(base_filename))
+                     uint16_t max_files = 0,
-        , file_helper_{event_handlers}
+                     const file_event_handlers &event_handlers = {})
-        , truncate_(truncate)
+        : base_filename_(std::move(base_filename)),
-        , max_files_(max_files)
+          file_helper_{event_handlers},
-        , filenames_q_()
+          truncate_(truncate),
-    {
+          max_files_(max_files),
+          filenames_q_() {
         auto now = log_clock::now();
         auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(now));
         file_helper_.open(filename, truncate_);
+        remove_init_file_ = file_helper_.size() == 0;
         rotation_tp_ = next_rotation_tp_();
 
-        if (max_files_ > 0)
+        if (max_files_ > 0) {
-        {
             init_filenames_q_();
         }
     }
 
-    filename_t filename()
+    filename_t filename() {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         return file_helper_.filename();
     }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         auto time = msg.time;
         bool should_rotate = time >= rotation_tp_;
-        if (should_rotate)
+        if (should_rotate) {
-        {
+            if (remove_init_file_) {
+                file_helper_.close();
+                details::os::remove(file_helper_.filename());
+            }
             auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(time));
             file_helper_.open(filename, truncate_);
             rotation_tp_ = next_rotation_tp_();
         }
+        remove_init_file_ = false;
         memory_buf_t formatted;
         base_sink<Mutex>::formatter_->format(msg, formatted);
         file_helper_.write(formatted);
 
         // Do the cleaning only at the end because it might throw on failure.
-        if (should_rotate && max_files_ > 0)
+        if (should_rotate && max_files_ > 0) {
-        {
             delete_old_();
         }
     }
 
-    void flush_() override
+    void flush_() override { file_helper_.flush(); }
-    {
-        file_helper_.flush();
-    }
 
 private:
-    void init_filenames_q_()
+    void init_filenames_q_() {
-    {
         using details::os::path_exists;
 
         filenames_q_ = details::circular_q<filename_t>(static_cast<size_t>(max_files_));
         std::vector<filename_t> filenames;
         auto now = log_clock::now();
-        while (filenames.size() < max_files_)
+        while (filenames.size() < max_files_) {
-        {
             auto filename = FileNameCalc::calc_filename(base_filename_, now_tm(now));
-            if (!path_exists(filename))
+            if (!path_exists(filename)) {
-            {
                 break;
             }
             filenames.emplace_back(filename);
             now -= std::chrono::hours(1);
         }
-        for (auto iter = filenames.rbegin(); iter != filenames.rend(); ++iter)
+        for (auto iter = filenames.rbegin(); iter != filenames.rend(); ++iter) {
-        {
             filenames_q_.push_back(std::move(*iter));
         }
     }
 
-    tm now_tm(log_clock::time_point tp)
+    tm now_tm(log_clock::time_point tp) {
-    {
         time_t tnow = log_clock::to_time_t(tp);
         return spdlog::details::os::localtime(tnow);
     }
 
-    log_clock::time_point next_rotation_tp_()
+    log_clock::time_point next_rotation_tp_() {
-    {
         auto now = log_clock::now();
         tm date = now_tm(now);
         date.tm_min = 0;
         date.tm_sec = 0;
         auto rotation_time = log_clock::from_time_t(std::mktime(&date));
-        if (rotation_time > now)
+        if (rotation_time > now) {
-        {
             return rotation_time;
         }
         return {rotation_time + std::chrono::hours(1)};
@@ -144,21 +134,19 @@ private:
 
     // Delete the file N rotations ago.
     // Throw spdlog_ex on failure to delete the old file.
-    void delete_old_()
+    void delete_old_() {
-    {
         using details::os::filename_to_str;
         using details::os::remove_if_exists;
 
         filename_t current_file = file_helper_.filename();
-        if (filenames_q_.full())
+        if (filenames_q_.full()) {
-        {
             auto old_filename = std::move(filenames_q_.front());
             filenames_q_.pop_front();
             bool ok = remove_if_exists(old_filename) == 0;
-            if (!ok)
+            if (!ok) {
-            {
                 filenames_q_.push_back(std::move(current_file));
-                SPDLOG_THROW(spdlog_ex("Failed removing hourly file " + filename_to_str(old_filename), errno));
+                SPDLOG_THROW(spdlog_ex(
+                    "Failed removing hourly file " + filename_to_str(old_filename), errno));
             }
         }
         filenames_q_.push_back(std::move(current_file));
@@ -170,6 +158,7 @@ private:
     bool truncate_;
     uint16_t max_files_;
     details::circular_q<filename_t> filenames_q_;
+    bool remove_init_file_;
 };
 
 using hourly_file_sink_mt = hourly_file_sink<std::mutex>;
@@ -180,17 +169,23 @@ using hourly_file_sink_st = hourly_file_sink<details::null_mutex>;
 //
 // factory functions
 //
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> hourly_logger_mt(const std::string &logger_name, const filename_t &filename, bool truncate = false,
+inline std::shared_ptr<logger> hourly_logger_mt(const std::string &logger_name,
-    uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+                                                const filename_t &filename,
-{
+                                                bool truncate = false,
-    return Factory::template create<sinks::hourly_file_sink_mt>(logger_name, filename, truncate, max_files, event_handlers);
+                                                uint16_t max_files = 0,
+                                                const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::hourly_file_sink_mt>(logger_name, filename, truncate,
+                                                                max_files, event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> hourly_logger_st(const std::string &logger_name, const filename_t &filename, bool truncate = false,
+inline std::shared_ptr<logger> hourly_logger_st(const std::string &logger_name,
-    uint16_t max_files = 0, const file_event_handlers &event_handlers = {})
+                                                const filename_t &filename,
-{
+                                                bool truncate = false,
-    return Factory::template create<sinks::hourly_file_sink_st>(logger_name, filename, truncate, max_files, event_handlers);
+                                                uint16_t max_files = 0,
+                                                const file_event_handlers &event_handlers = {}) {
+    return Factory::template create<sinks::hourly_file_sink_st>(logger_name, filename, truncate,
+                                                                max_files, event_handlers);
 }
 }  // namespace spdlog

vendor/spdlog/sinks/kafka_sink.h

@@ -0,0 +1,119 @@
+// Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+
+#pragma once
+
+//
+// Custom sink for kafka
+// Building and using requires librdkafka library.
+// For building librdkafka library check the url below
+// https://github.com/confluentinc/librdkafka
+//
+
+#include "spdlog/async.h"
+#include "spdlog/details/log_msg.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/details/synchronous_factory.h"
+#include "spdlog/sinks/base_sink.h"
+#include <mutex>
+#include <spdlog/common.h>
+
+// kafka header
+#include <librdkafka/rdkafkacpp.h>
+
+namespace spdlog {
+namespace sinks {
+
+struct kafka_sink_config {
+    std::string server_addr;
+    std::string produce_topic;
+    int32_t flush_timeout_ms = 1000;
+
+    kafka_sink_config(std::string addr, std::string topic, int flush_timeout_ms = 1000)
+        : server_addr{std::move(addr)},
+          produce_topic{std::move(topic)},
+          flush_timeout_ms(flush_timeout_ms) {}
+};
+
+template <typename Mutex>
+class kafka_sink : public base_sink<Mutex> {
+public:
+    kafka_sink(kafka_sink_config config)
+        : config_{std::move(config)} {
+        try {
+            std::string errstr;
+            conf_.reset(RdKafka::Conf::create(RdKafka::Conf::CONF_GLOBAL));
+            RdKafka::Conf::ConfResult confRes =
+                conf_->set("bootstrap.servers", config_.server_addr, errstr);
+            if (confRes != RdKafka::Conf::CONF_OK) {
+                throw_spdlog_ex(
+                    fmt_lib::format("conf set bootstrap.servers failed err:{}", errstr));
+            }
+
+            tconf_.reset(RdKafka::Conf::create(RdKafka::Conf::CONF_TOPIC));
+            if (tconf_ == nullptr) {
+                throw_spdlog_ex(fmt_lib::format("create topic config failed"));
+            }
+
+            producer_.reset(RdKafka::Producer::create(conf_.get(), errstr));
+            if (producer_ == nullptr) {
+                throw_spdlog_ex(fmt_lib::format("create producer failed err:{}", errstr));
+            }
+            topic_.reset(RdKafka::Topic::create(producer_.get(), config_.produce_topic,
+                                                tconf_.get(), errstr));
+            if (topic_ == nullptr) {
+                throw_spdlog_ex(fmt_lib::format("create topic failed err:{}", errstr));
+            }
+        } catch (const std::exception &e) {
+            throw_spdlog_ex(fmt_lib::format("error create kafka instance: {}", e.what()));
+        }
+    }
+
+    ~kafka_sink() { producer_->flush(config_.flush_timeout_ms); }
+
+protected:
+    void sink_it_(const details::log_msg &msg) override {
+        producer_->produce(topic_.get(), 0, RdKafka::Producer::RK_MSG_COPY,
+                           (void *)msg.payload.data(), msg.payload.size(), NULL, NULL);
+    }
+
+    void flush_() override { producer_->flush(config_.flush_timeout_ms); }
+
+private:
+    kafka_sink_config config_;
+    std::unique_ptr<RdKafka::Producer> producer_ = nullptr;
+    std::unique_ptr<RdKafka::Conf> conf_ = nullptr;
+    std::unique_ptr<RdKafka::Conf> tconf_ = nullptr;
+    std::unique_ptr<RdKafka::Topic> topic_ = nullptr;
+};
+
+using kafka_sink_mt = kafka_sink<std::mutex>;
+using kafka_sink_st = kafka_sink<spdlog::details::null_mutex>;
+
+}  // namespace sinks
+
+template <typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> kafka_logger_mt(const std::string &logger_name,
+                                               spdlog::sinks::kafka_sink_config config) {
+    return Factory::template create<sinks::kafka_sink_mt>(logger_name, config);
+}
+
+template <typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> kafka_logger_st(const std::string &logger_name,
+                                               spdlog::sinks::kafka_sink_config config) {
+    return Factory::template create<sinks::kafka_sink_st>(logger_name, config);
+}
+
+template <typename Factory = spdlog::async_factory>
+inline std::shared_ptr<spdlog::logger> kafka_logger_async_mt(
+    std::string logger_name, spdlog::sinks::kafka_sink_config config) {
+    return Factory::template create<sinks::kafka_sink_mt>(logger_name, config);
+}
+
+template <typename Factory = spdlog::async_factory>
+inline std::shared_ptr<spdlog::logger> kafka_logger_async_st(
+    std::string logger_name, spdlog::sinks::kafka_sink_config config) {
+    return Factory::template create<sinks::kafka_sink_st>(logger_name, config);
+}
+
+}  // namespace spdlog

vendor/spdlog/sinks/mongo_sink.h

@@ -25,41 +25,46 @@
 
 namespace spdlog {
 namespace sinks {
-template<typename Mutex>
+template <typename Mutex>
-class mongo_sink : public base_sink<Mutex>
+class mongo_sink : public base_sink<Mutex> {
-{
 public:
-    mongo_sink(const std::string &db_name, const std::string &collection_name, const std::string &uri = "mongodb://localhost:27017")
+    mongo_sink(const std::string &db_name,
-    {
+               const std::string &collection_name,
-        try
+               const std::string &uri = "mongodb://localhost:27017") try
-        {
+        : mongo_sink(std::make_shared<mongocxx::instance>(), db_name, collection_name, uri) {
-            client_ = spdlog::details::make_unique<mongocxx::client>(mongocxx::uri{uri});
+    } catch (const std::exception &e) {
-            db_name_ = db_name;
+        throw_spdlog_ex(fmt_lib::format("Error opening database: {}", e.what()));
-            coll_name_ = collection_name;
     }
-        catch (const std::exception)
+
-        {
+    mongo_sink(std::shared_ptr<mongocxx::instance> instance,
-            throw spdlog_ex("Error opening database");
+               const std::string &db_name,
+               const std::string &collection_name,
+               const std::string &uri = "mongodb://localhost:27017")
+        : instance_(std::move(instance)),
+          db_name_(db_name),
+          coll_name_(collection_name) {
+        try {
+            client_ = spdlog::details::make_unique<mongocxx::client>(mongocxx::uri{uri});
+        } catch (const std::exception &e) {
+            throw_spdlog_ex(fmt_lib::format("Error opening database: {}", e.what()));
         }
     }
 
-    ~mongo_sink()
+    ~mongo_sink() { flush_(); }
-    {
-        flush_();
-    }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         using bsoncxx::builder::stream::document;
         using bsoncxx::builder::stream::finalize;
 
-        if (client_ != nullptr)
+        if (client_ != nullptr) {
-        {
+            auto doc = document{} << "timestamp" << bsoncxx::types::b_date(msg.time) << "level"
-            auto doc = document{} << "timestamp" << bsoncxx::types::b_date(msg.time) << "level" << level::to_string_view(msg.level).data()
+                                  << level::to_string_view(msg.level).data() << "level_num"
-                                  << "message" << std::string(msg.payload.begin(), msg.payload.end()) << "logger_name"
+                                  << msg.level << "message"
-                                  << std::string(msg.logger_name.begin(), msg.logger_name.end()) << "thread_id"
+                                  << std::string(msg.payload.begin(), msg.payload.end())
-                                  << static_cast<int>(msg.thread_id) << finalize;
+                                  << "logger_name"
+                                  << std::string(msg.logger_name.begin(), msg.logger_name.end())
+                                  << "thread_id" << static_cast<int>(msg.thread_id) << finalize;
             client_->database(db_name_).collection(coll_name_).insert_one(doc.view());
         }
     }
@@ -67,13 +72,11 @@ protected:
     void flush_() override {}
 
 private:
-    static mongocxx::instance instance_;
+    std::shared_ptr<mongocxx::instance> instance_;
     std::string db_name_;
     std::string coll_name_;
     std::unique_ptr<mongocxx::client> client_ = nullptr;
 };
-template<>
-mongocxx::instance mongo_sink<std::mutex>::instance_{};
 
 #include "spdlog/details/null_mutex.h"
 #include <mutex>
@@ -82,18 +85,24 @@ using mongo_sink_st = mongo_sink<spdlog::details::null_mutex>;
 
 }  // namespace sinks
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> mongo_logger_mt(const std::string &logger_name, const std::string &db_name,
+inline std::shared_ptr<logger> mongo_logger_mt(
-    const std::string &collection_name, const std::string &uri = "mongodb://localhost:27017")
+    const std::string &logger_name,
-{
+    const std::string &db_name,
-    return Factory::template create<sinks::mongo_sink_mt>(logger_name, db_name, collection_name, uri);
+    const std::string &collection_name,
+    const std::string &uri = "mongodb://localhost:27017") {
+    return Factory::template create<sinks::mongo_sink_mt>(logger_name, db_name, collection_name,
+                                                          uri);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> mongo_logger_st(const std::string &logger_name, const std::string &db_name,
+inline std::shared_ptr<logger> mongo_logger_st(
-    const std::string &collection_name, const std::string &uri = "mongodb://localhost:27017")
+    const std::string &logger_name,
-{
+    const std::string &db_name,
-    return Factory::template create<sinks::mongo_sink_st>(logger_name, db_name, collection_name, uri);
+    const std::string &collection_name,
+    const std::string &uri = "mongodb://localhost:27017") {
+    return Factory::template create<sinks::mongo_sink_st>(logger_name, db_name, collection_name,
+                                                          uri);
 }
 
 }  // namespace spdlog

vendor/spdlog/sinks/msvc_sink.h

@@ -1,40 +1,59 @@
-// Copyright(c) 2016 Alexander Dalshov.
+// Copyright(c) 2016 Alexander Dalshov & spdlog contributors.
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
 #pragma once
 
 #if defined(_WIN32)
 
-#    include <spdlog/details/null_mutex.h>
+    #include <spdlog/details/null_mutex.h>
-#    include <spdlog/sinks/base_sink.h>
+    #if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+        #include <spdlog/details/os.h>
+    #endif
+    #include <spdlog/sinks/base_sink.h>
 
-#    include <mutex>
+    #include <mutex>
-#    include <string>
+    #include <string>
 
-// Avoid including windows.h (https://stackoverflow.com/a/30741042)
+    // Avoid including windows.h (https://stackoverflow.com/a/30741042)
+    #if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+extern "C" __declspec(dllimport) void __stdcall OutputDebugStringW(const wchar_t *lpOutputString);
+    #else
 extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char *lpOutputString);
+    #endif
+extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
 
 namespace spdlog {
 namespace sinks {
 /*
  * MSVC sink (logging using OutputDebugStringA)
  */
-template<typename Mutex>
+template <typename Mutex>
-class msvc_sink : public base_sink<Mutex>
+class msvc_sink : public base_sink<Mutex> {
-{
 public:
     msvc_sink() = default;
+    msvc_sink(bool check_debugger_present)
+        : check_debugger_present_{check_debugger_present} {};
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
+        if (check_debugger_present_ && !IsDebuggerPresent()) {
+            return;
+        }
         memory_buf_t formatted;
         base_sink<Mutex>::formatter_->format(msg, formatted);
-        formatted.push_back('\0'); // add a null terminator for OutputDebugStringA
+        formatted.push_back('\0');  // add a null terminator for OutputDebugString
+    #if defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
+        wmemory_buf_t wformatted;
+        details::os::utf8_to_wstrbuf(string_view_t(formatted.data(), formatted.size()), wformatted);
+        OutputDebugStringW(wformatted.data());
+    #else
         OutputDebugStringA(formatted.data());
+    #endif
     }
 
     void flush_() override {}
+
+    bool check_debugger_present_ = true;
 };
 
 using msvc_sink_mt = msvc_sink<std::mutex>;

vendor/spdlog/sinks/null_sink.h

@@ -4,17 +4,16 @@
 #pragma once
 
 #include <spdlog/details/null_mutex.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <mutex>
 
 namespace spdlog {
 namespace sinks {
 
-template<typename Mutex>
+template <typename Mutex>
-class null_sink : public base_sink<Mutex>
+class null_sink : public base_sink<Mutex> {
-{
 protected:
     void sink_it_(const details::log_msg &) override {}
     void flush_() override {}
@@ -25,17 +24,15 @@ using null_sink_st = null_sink<details::null_mutex>;
 
 }  // namespace sinks
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> null_logger_mt(const std::string &logger_name)
+inline std::shared_ptr<logger> null_logger_mt(const std::string &logger_name) {
-{
     auto null_logger = Factory::template create<sinks::null_sink_mt>(logger_name);
     null_logger->set_level(level::off);
     return null_logger;
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> null_logger_st(const std::string &logger_name)
+inline std::shared_ptr<logger> null_logger_st(const std::string &logger_name) {
-{
     auto null_logger = Factory::template create<sinks::null_sink_st>(logger_name);
     null_logger->set_level(level::off);
     return null_logger;

vendor/spdlog/sinks/ostream_sink.h

@@ -11,33 +11,26 @@
 
 namespace spdlog {
 namespace sinks {
-template<typename Mutex>
+template <typename Mutex>
-class ostream_sink final : public base_sink<Mutex>
+class ostream_sink final : public base_sink<Mutex> {
-{
 public:
     explicit ostream_sink(std::ostream &os, bool force_flush = false)
-        : ostream_(os)
+        : ostream_(os),
-        , force_flush_(force_flush)
+          force_flush_(force_flush) {}
-    {}
     ostream_sink(const ostream_sink &) = delete;
     ostream_sink &operator=(const ostream_sink &) = delete;
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         memory_buf_t formatted;
         base_sink<Mutex>::formatter_->format(msg, formatted);
         ostream_.write(formatted.data(), static_cast<std::streamsize>(formatted.size()));
-        if (force_flush_)
+        if (force_flush_) {
-        {
             ostream_.flush();
         }
     }
 
-    void flush_() override
+    void flush_() override { ostream_.flush(); }
-    {
-        ostream_.flush();
-    }
 
     std::ostream &ostream_;
     bool force_flush_;

vendor/spdlog/sinks/qt_sinks.h

@@ -4,45 +4,48 @@
 #pragma once
 
 //
-// Custom sink for QPlainTextEdit or QTextEdit and its childs(QTextBrowser...
+// Custom sink for QPlainTextEdit or QTextEdit and its children (QTextBrowser...
 // etc) Building and using requires Qt library.
 //
+// Warning: the qt_sink won't be notified if the target widget is destroyed.
+// If the widget's lifetime can be shorter than the logger's one, you should provide some permanent
+// QObject, and then use a standard signal/slot.
+//
 
 #include "spdlog/common.h"
 #include "spdlog/details/log_msg.h"
 #include "spdlog/details/synchronous_factory.h"
 #include "spdlog/sinks/base_sink.h"
+#include <array>
 
-#include <QTextEdit>
 #include <QPlainTextEdit>
+#include <QTextEdit>
 
 //
 // qt_sink class
 //
 namespace spdlog {
 namespace sinks {
-template<typename Mutex>
+template <typename Mutex>
-class qt_sink : public base_sink<Mutex>
+class qt_sink : public base_sink<Mutex> {
-{
 public:
-    qt_sink(QObject *qt_object, const std::string &meta_method)
+    qt_sink(QObject *qt_object, std::string meta_method)
-    {
+        : qt_object_(qt_object),
-        qt_object_ = qt_object;
+          meta_method_(std::move(meta_method)) {
-        meta_method_ = meta_method;
+        if (!qt_object_) {
+            throw_spdlog_ex("qt_sink: qt_object is null");
+        }
     }
 
-    ~qt_sink()
+    ~qt_sink() { flush_(); }
-    {
-        flush_();
-    }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         memory_buf_t formatted;
         base_sink<Mutex>::formatter_->format(msg, formatted);
-        string_view_t str = string_view_t(formatted.data(), formatted.size());
+        const string_view_t str = string_view_t(formatted.data(), formatted.size());
-        QMetaObject::invokeMethod(qt_object_, meta_method_.c_str(), Qt::AutoConnection,
+        QMetaObject::invokeMethod(
+            qt_object_, meta_method_.c_str(), Qt::AutoConnection,
             Q_ARG(QString, QString::fromUtf8(str.data(), static_cast<int>(str.size())).trimmed()));
     }
 
@@ -53,50 +56,249 @@ private:
     std::string meta_method_;
 };
 
+// Qt color sink to QTextEdit.
+// Color location is determined by the sink log pattern like in the rest of spdlog sinks.
+// Colors can be modified if needed using sink->set_color(level, qtTextCharFormat).
+// max_lines is the maximum number of lines that the sink will hold before removing the oldest
+// lines. By default, only ascii (latin1) is supported by this sink. Set is_utf8 to true if utf8
+// support is needed.
+template <typename Mutex>
+class qt_color_sink : public base_sink<Mutex> {
+public:
+    qt_color_sink(QTextEdit *qt_text_edit,
+                  int max_lines,
+                  bool dark_colors = false,
+                  bool is_utf8 = false)
+        : qt_text_edit_(qt_text_edit),
+          max_lines_(max_lines),
+          is_utf8_(is_utf8) {
+        if (!qt_text_edit_) {
+            throw_spdlog_ex("qt_color_text_sink: text_edit is null");
+        }
+
+        default_color_ = qt_text_edit_->currentCharFormat();
+        // set colors
+        QTextCharFormat format;
+        // trace
+        format.setForeground(dark_colors ? Qt::darkGray : Qt::gray);
+        colors_.at(level::trace) = format;
+        // debug
+        format.setForeground(dark_colors ? Qt::darkCyan : Qt::cyan);
+        colors_.at(level::debug) = format;
+        // info
+        format.setForeground(dark_colors ? Qt::darkGreen : Qt::green);
+        colors_.at(level::info) = format;
+        // warn
+        format.setForeground(dark_colors ? Qt::darkYellow : Qt::yellow);
+        colors_.at(level::warn) = format;
+        // err
+        format.setForeground(Qt::red);
+        colors_.at(level::err) = format;
+        // critical
+        format.setForeground(Qt::white);
+        format.setBackground(Qt::red);
+        colors_.at(level::critical) = format;
+    }
+
+    ~qt_color_sink() { flush_(); }
+
+    void set_default_color(QTextCharFormat format) {
+        // std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
+        default_color_ = format;
+    }
+
+    void set_level_color(level::level_enum color_level, QTextCharFormat format) {
+        // std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
+        colors_.at(static_cast<size_t>(color_level)) = format;
+    }
+
+    QTextCharFormat &get_level_color(level::level_enum color_level) {
+        std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
+        return colors_.at(static_cast<size_t>(color_level));
+    }
+
+    QTextCharFormat &get_default_color() {
+        std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
+        return default_color_;
+    }
+
+protected:
+    struct invoke_params {
+        invoke_params(int max_lines,
+                      QTextEdit *q_text_edit,
+                      QString payload,
+                      QTextCharFormat default_color,
+                      QTextCharFormat level_color,
+                      int color_range_start,
+                      int color_range_end)
+            : max_lines(max_lines),
+              q_text_edit(q_text_edit),
+              payload(std::move(payload)),
+              default_color(default_color),
+              level_color(level_color),
+              color_range_start(color_range_start),
+              color_range_end(color_range_end) {}
+        int max_lines;
+        QTextEdit *q_text_edit;
+        QString payload;
+        QTextCharFormat default_color;
+        QTextCharFormat level_color;
+        int color_range_start;
+        int color_range_end;
+    };
+
+    void sink_it_(const details::log_msg &msg) override {
+        memory_buf_t formatted;
+        base_sink<Mutex>::formatter_->format(msg, formatted);
+
+        const string_view_t str = string_view_t(formatted.data(), formatted.size());
+        // apply the color to the color range in the formatted message.
+        QString payload;
+        int color_range_start = static_cast<int>(msg.color_range_start);
+        int color_range_end = static_cast<int>(msg.color_range_end);
+        if (is_utf8_) {
+            payload = QString::fromUtf8(str.data(), static_cast<int>(str.size()));
+            // convert color ranges from byte index to character index.
+            if (msg.color_range_start < msg.color_range_end) {
+                color_range_start = QString::fromUtf8(str.data(), msg.color_range_start).size();
+                color_range_end = QString::fromUtf8(str.data(), msg.color_range_end).size();
+            }
+        } else {
+            payload = QString::fromLatin1(str.data(), static_cast<int>(str.size()));
+        }
+
+        invoke_params params{max_lines_,             // max lines
+                             qt_text_edit_,          // text edit to append to
+                             std::move(payload),     // text to append
+                             default_color_,         // default color
+                             colors_.at(msg.level),  // color to apply
+                             color_range_start,      // color range start
+                             color_range_end};       // color range end
+
+        QMetaObject::invokeMethod(
+            qt_text_edit_, [params]() { invoke_method_(params); }, Qt::AutoConnection);
+    }
+
+    void flush_() override {}
+
+    // Add colored text to the text edit widget. This method is invoked in the GUI thread.
+    // It is a static method to ensure that it is handled correctly even if the sink is destroyed
+    // prematurely before it is invoked.
+
+    static void invoke_method_(invoke_params params) {
+        auto *document = params.q_text_edit->document();
+        QTextCursor cursor(document);
+
+        // remove first blocks if number of blocks exceeds max_lines
+        while (document->blockCount() > params.max_lines) {
+            cursor.select(QTextCursor::BlockUnderCursor);
+            cursor.removeSelectedText();
+            cursor.deleteChar();  // delete the newline after the block
+        }
+
+        cursor.movePosition(QTextCursor::End);
+        cursor.setCharFormat(params.default_color);
+
+        // if color range not specified or not not valid, just append the text with default color
+        if (params.color_range_end <= params.color_range_start) {
+            cursor.insertText(params.payload);
+            return;
+        }
+
+        // insert the text before the color range
+        cursor.insertText(params.payload.left(params.color_range_start));
+
+        // insert the colorized text
+        cursor.setCharFormat(params.level_color);
+        cursor.insertText(params.payload.mid(params.color_range_start,
+                                             params.color_range_end - params.color_range_start));
+
+        // insert the text after the color range with default format
+        cursor.setCharFormat(params.default_color);
+        cursor.insertText(params.payload.mid(params.color_range_end));
+    }
+
+    QTextEdit *qt_text_edit_;
+    int max_lines_;
+    bool is_utf8_;
+    QTextCharFormat default_color_;
+    std::array<QTextCharFormat, level::n_levels> colors_;
+};
+
 #include "spdlog/details/null_mutex.h"
 #include <mutex>
+
 using qt_sink_mt = qt_sink<std::mutex>;
-using qt_sink_st = qt_sink<spdlog::details::null_mutex>;
+using qt_sink_st = qt_sink<details::null_mutex>;
+using qt_color_sink_mt = qt_color_sink<std::mutex>;
+using qt_color_sink_st = qt_color_sink<details::null_mutex>;
 }  // namespace sinks
 
 //
 // Factory functions
 //
-template<typename Factory = spdlog::synchronous_factory>
+
-inline std::shared_ptr<logger> qt_logger_mt(const std::string &logger_name, QTextEdit *qt_object, const std::string &meta_method = "append")
+// log to QTextEdit
-{
+template <typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> qt_logger_mt(const std::string &logger_name,
+                                            QTextEdit *qt_object,
+                                            const std::string &meta_method = "append") {
     return Factory::template create<sinks::qt_sink_mt>(logger_name, qt_object, meta_method);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_logger_st(const std::string &logger_name, QTextEdit *qt_object, const std::string &meta_method = "append")
+inline std::shared_ptr<logger> qt_logger_st(const std::string &logger_name,
-{
+                                            QTextEdit *qt_object,
+                                            const std::string &meta_method = "append") {
     return Factory::template create<sinks::qt_sink_st>(logger_name, qt_object, meta_method);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+// log to QPlainTextEdit
-inline std::shared_ptr<logger> qt_logger_mt(
+template <typename Factory = spdlog::synchronous_factory>
-    const std::string &logger_name, QPlainTextEdit *qt_object, const std::string &meta_method = "appendPlainText")
+inline std::shared_ptr<logger> qt_logger_mt(const std::string &logger_name,
-{
+                                            QPlainTextEdit *qt_object,
+                                            const std::string &meta_method = "appendPlainText") {
     return Factory::template create<sinks::qt_sink_mt>(logger_name, qt_object, meta_method);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_logger_st(
+inline std::shared_ptr<logger> qt_logger_st(const std::string &logger_name,
-    const std::string &logger_name, QPlainTextEdit *qt_object, const std::string &meta_method = "appendPlainText")
+                                            QPlainTextEdit *qt_object,
-{
+                                            const std::string &meta_method = "appendPlainText") {
     return Factory::template create<sinks::qt_sink_st>(logger_name, qt_object, meta_method);
 }
-
+// log to QObject
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_logger_mt(const std::string &logger_name, QObject *qt_object, const std::string &meta_method)
+inline std::shared_ptr<logger> qt_logger_mt(const std::string &logger_name,
-{
+                                            QObject *qt_object,
+                                            const std::string &meta_method) {
     return Factory::template create<sinks::qt_sink_mt>(logger_name, qt_object, meta_method);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> qt_logger_st(const std::string &logger_name, QObject *qt_object, const std::string &meta_method)
+inline std::shared_ptr<logger> qt_logger_st(const std::string &logger_name,
-{
+                                            QObject *qt_object,
+                                            const std::string &meta_method) {
     return Factory::template create<sinks::qt_sink_st>(logger_name, qt_object, meta_method);
 }
+
+// log to QTextEdit with colorized output
+template <typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> qt_color_logger_mt(const std::string &logger_name,
+                                                  QTextEdit *qt_text_edit,
+                                                  int max_lines,
+                                                  bool is_utf8 = false) {
+    return Factory::template create<sinks::qt_color_sink_mt>(logger_name, qt_text_edit, max_lines,
+                                                             false, is_utf8);
+}
+
+template <typename Factory = spdlog::synchronous_factory>
+inline std::shared_ptr<logger> qt_color_logger_st(const std::string &logger_name,
+                                                  QTextEdit *qt_text_edit,
+                                                  int max_lines,
+                                                  bool is_utf8 = false) {
+    return Factory::template create<sinks::qt_color_sink_st>(logger_name, qt_text_edit, max_lines,
+                                                             false, is_utf8);
+}
+
 }  // namespace spdlog

vendor/spdlog/sinks/ringbuffer_sink.h

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include "spdlog/sinks/base_sink.h"
 #include "spdlog/details/circular_q.h"
 #include "spdlog/details/log_msg_buffer.h"
 #include "spdlog/details/null_mutex.h"
+#include "spdlog/sinks/base_sink.h"
 
 #include <mutex>
 #include <string>
@@ -17,47 +17,40 @@ namespace sinks {
 /*
  * Ring buffer sink
  */
-template<typename Mutex>
+template <typename Mutex>
-class ringbuffer_sink final : public base_sink<Mutex>
+class ringbuffer_sink final : public base_sink<Mutex> {
-{
 public:
     explicit ringbuffer_sink(size_t n_items)
-        : q_{n_items}
+        : q_{n_items} {}
-    {}
 
-    std::vector<details::log_msg_buffer> last_raw(size_t lim = 0)
+    std::vector<details::log_msg_buffer> last_raw(size_t lim = 0) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         auto items_available = q_.size();
         auto n_items = lim > 0 ? (std::min)(lim, items_available) : items_available;
         std::vector<details::log_msg_buffer> ret;
         ret.reserve(n_items);
-        for (size_t i = (items_available - n_items); i < items_available; i++)
+        for (size_t i = (items_available - n_items); i < items_available; i++) {
-        {
             ret.push_back(q_.at(i));
         }
         return ret;
     }
 
-    std::vector<std::string> last_formatted(size_t lim = 0)
+    std::vector<std::string> last_formatted(size_t lim = 0) {
-    {
         std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
         auto items_available = q_.size();
         auto n_items = lim > 0 ? (std::min)(lim, items_available) : items_available;
         std::vector<std::string> ret;
         ret.reserve(n_items);
-        for (size_t i = (items_available - n_items); i < items_available; i++)
+        for (size_t i = (items_available - n_items); i < items_available; i++) {
-        {
             memory_buf_t formatted;
             base_sink<Mutex>::formatter_->format(q_.at(i), formatted);
-            ret.push_back(std::move(SPDLOG_BUF_TO_STRING(formatted)));
+            ret.push_back(SPDLOG_BUF_TO_STRING(formatted));
         }
         return ret;
     }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         q_.push_back(details::log_msg_buffer{msg});
     }
     void flush_() override {}

vendor/spdlog/sinks/rotating_file_sink-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/rotating_file_sink.h>
+    #include <spdlog/sinks/rotating_file_sink.h>
 #endif
 
 #include <spdlog/common.h>
@@ -23,27 +23,27 @@
 namespace spdlog {
 namespace sinks {
 
-template<typename Mutex>
+template <typename Mutex>
 SPDLOG_INLINE rotating_file_sink<Mutex>::rotating_file_sink(
-    filename_t base_filename, std::size_t max_size, std::size_t max_files, bool rotate_on_open, const file_event_handlers &event_handlers)
+    filename_t base_filename,
-    : base_filename_(std::move(base_filename))
+    std::size_t max_size,
-    , max_size_(max_size)
+    std::size_t max_files,
-    , max_files_(max_files)
+    bool rotate_on_open,
-    , file_helper_{event_handlers}
+    const file_event_handlers &event_handlers)
-{
+    : base_filename_(std::move(base_filename)),
-    if (max_size == 0)
+      max_size_(max_size),
-    {
+      max_files_(max_files),
+      file_helper_{event_handlers} {
+    if (max_size == 0) {
         throw_spdlog_ex("rotating sink constructor: max_size arg cannot be zero");
     }
 
-    if (max_files > 200000)
+    if (max_files > 200000) {
-    {
         throw_spdlog_ex("rotating sink constructor: max_files arg cannot exceed 200000");
     }
     file_helper_.open(calc_filename(base_filename_, 0));
     current_size_ = file_helper_.size();  // expensive. called only once
-    if (rotate_on_open && current_size_ > 0)
+    if (rotate_on_open && current_size_ > 0) {
-    {
         rotate_();
         current_size_ = 0;
     }
@@ -51,11 +51,10 @@ SPDLOG_INLINE rotating_file_sink<Mutex>::rotating_file_sink(
 
 // calc filename according to index and file extension if exists.
 // e.g. calc_filename("logs/mylog.txt, 3) => "logs/mylog.3.txt".
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::calc_filename(const filename_t &filename, std::size_t index)
+SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::calc_filename(const filename_t &filename,
-{
+                                                                  std::size_t index) {
-    if (index == 0u)
+    if (index == 0u) {
-    {
         return filename;
     }
 
@@ -64,16 +63,14 @@ SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::calc_filename(const filename
     return fmt_lib::format(SPDLOG_FILENAME_T("{}.{}{}"), basename, index, ext);
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::filename()
+SPDLOG_INLINE filename_t rotating_file_sink<Mutex>::filename() {
-{
     std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
     return file_helper_.filename();
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE void rotating_file_sink<Mutex>::sink_it_(const details::log_msg &msg)
+SPDLOG_INLINE void rotating_file_sink<Mutex>::sink_it_(const details::log_msg &msg) {
-{
     memory_buf_t formatted;
     base_sink<Mutex>::formatter_->format(msg, formatted);
     auto new_size = current_size_ + formatted.size();
@@ -81,11 +78,9 @@ SPDLOG_INLINE void rotating_file_sink<Mutex>::sink_it_(const details::log_msg &m
     // rotate if the new estimated file size exceeds max size.
     // rotate only if the real size > 0 to better deal with full disk (see issue #2261).
     // we only check the real size when new_size > max_size_ because it is relatively expensive.
-    if (new_size > max_size_)
+    if (new_size > max_size_) {
-    {
         file_helper_.flush();
-        if (file_helper_.size() > 0)
+        if (file_helper_.size() > 0) {
-        {
             rotate_();
             new_size = formatted.size();
         }
@@ -94,9 +89,8 @@ SPDLOG_INLINE void rotating_file_sink<Mutex>::sink_it_(const details::log_msg &m
     current_size_ = new_size;
 }
 
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE void rotating_file_sink<Mutex>::flush_()
+SPDLOG_INLINE void rotating_file_sink<Mutex>::flush_() {
-{
     file_helper_.flush();
 }
 
@@ -105,33 +99,31 @@ SPDLOG_INLINE void rotating_file_sink<Mutex>::flush_()
 // log.1.txt -> log.2.txt
 // log.2.txt -> log.3.txt
 // log.3.txt -> delete
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE void rotating_file_sink<Mutex>::rotate_()
+SPDLOG_INLINE void rotating_file_sink<Mutex>::rotate_() {
-{
     using details::os::filename_to_str;
     using details::os::path_exists;
 
     file_helper_.close();
-    for (auto i = max_files_; i > 0; --i)
+    for (auto i = max_files_; i > 0; --i) {
-    {
         filename_t src = calc_filename(base_filename_, i - 1);
-        if (!path_exists(src))
+        if (!path_exists(src)) {
-        {
             continue;
         }
         filename_t target = calc_filename(base_filename_, i);
 
-        if (!rename_file_(src, target))
+        if (!rename_file_(src, target)) {
-        {
             // if failed try again after a small delay.
             // this is a workaround to a windows issue, where very high rotation
             // rates can cause the rename to fail with permission denied (because of antivirus?).
             details::os::sleep_for_millis(100);
-            if (!rename_file_(src, target))
+            if (!rename_file_(src, target)) {
-            {
+                file_helper_.reopen(
-                file_helper_.reopen(true); // truncate the log file anyway to prevent it to grow beyond its limit!
+                    true);  // truncate the log file anyway to prevent it to grow beyond its limit!
                 current_size_ = 0;
-                throw_spdlog_ex("rotating_file_sink: failed renaming " + filename_to_str(src) + " to " + filename_to_str(target), errno);
+                throw_spdlog_ex("rotating_file_sink: failed renaming " + filename_to_str(src) +
+                                    " to " + filename_to_str(target),
+                                errno);
             }
         }
     }
@@ -140,9 +132,9 @@ SPDLOG_INLINE void rotating_file_sink<Mutex>::rotate_()
 
 // delete the target if exists, and rename the src file  to target
 // return true on success, false otherwise.
-template<typename Mutex>
+template <typename Mutex>
-SPDLOG_INLINE bool rotating_file_sink<Mutex>::rename_file_(const filename_t &src_filename, const filename_t &target_filename)
+SPDLOG_INLINE bool rotating_file_sink<Mutex>::rename_file_(const filename_t &src_filename,
-{
+                                                           const filename_t &target_filename) {
     // try to delete the target file in case it already exists.
     (void)details::os::remove(target_filename);
     return details::os::rename(src_filename, target_filename) == 0;

vendor/spdlog/sinks/rotating_file_sink.h

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/file_helper.h>
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <chrono>
 #include <mutex>
@@ -18,11 +18,13 @@ namespace sinks {
 //
 // Rotating file sink based on size
 //
-template<typename Mutex>
+template <typename Mutex>
-class rotating_file_sink final : public base_sink<Mutex>
+class rotating_file_sink final : public base_sink<Mutex> {
-{
 public:
-    rotating_file_sink(filename_t base_filename, std::size_t max_size, std::size_t max_files, bool rotate_on_open = false,
+    rotating_file_sink(filename_t base_filename,
+                       std::size_t max_size,
+                       std::size_t max_files,
+                       bool rotate_on_open = false,
                        const file_event_handlers &event_handlers = {});
     static filename_t calc_filename(const filename_t &filename, std::size_t index);
     filename_t filename();
@@ -59,23 +61,29 @@ using rotating_file_sink_st = rotating_file_sink<details::null_mutex>;
 // factory functions
 //
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> rotating_logger_mt(const std::string &logger_name, const filename_t &filename, size_t max_file_size,
+inline std::shared_ptr<logger> rotating_logger_mt(const std::string &logger_name,
-    size_t max_files, bool rotate_on_open = false, const file_event_handlers &event_handlers = {})
+                                                  const filename_t &filename,
-{
+                                                  size_t max_file_size,
+                                                  size_t max_files,
+                                                  bool rotate_on_open = false,
+                                                  const file_event_handlers &event_handlers = {}) {
     return Factory::template create<sinks::rotating_file_sink_mt>(
         logger_name, filename, max_file_size, max_files, rotate_on_open, event_handlers);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> rotating_logger_st(const std::string &logger_name, const filename_t &filename, size_t max_file_size,
+inline std::shared_ptr<logger> rotating_logger_st(const std::string &logger_name,
-    size_t max_files, bool rotate_on_open = false, const file_event_handlers &event_handlers = {})
+                                                  const filename_t &filename,
-{
+                                                  size_t max_file_size,
+                                                  size_t max_files,
+                                                  bool rotate_on_open = false,
+                                                  const file_event_handlers &event_handlers = {}) {
     return Factory::template create<sinks::rotating_file_sink_st>(
         logger_name, filename, max_file_size, max_files, rotate_on_open, event_handlers);
 }
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "rotating_file_sink-inl.h"
+    #include "rotating_file_sink-inl.h"
 #endif

vendor/spdlog/sinks/sink-inl.h

@@ -4,22 +4,19 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/sink.h>
+    #include <spdlog/sinks/sink.h>
 #endif
 
 #include <spdlog/common.h>
 
-SPDLOG_INLINE bool spdlog::sinks::sink::should_log(spdlog::level::level_enum msg_level) const
+SPDLOG_INLINE bool spdlog::sinks::sink::should_log(spdlog::level::level_enum msg_level) const {
-{
     return msg_level >= level_.load(std::memory_order_relaxed);
 }
 
-SPDLOG_INLINE void spdlog::sinks::sink::set_level(level::level_enum log_level)
+SPDLOG_INLINE void spdlog::sinks::sink::set_level(level::level_enum log_level) {
-{
     level_.store(log_level, std::memory_order_relaxed);
 }
 
-SPDLOG_INLINE spdlog::level::level_enum spdlog::sinks::sink::level() const
+SPDLOG_INLINE spdlog::level::level_enum spdlog::sinks::sink::level() const {
-{
     return static_cast<spdlog::level::level_enum>(level_.load(std::memory_order_relaxed));
 }

vendor/spdlog/sinks/sink.h

@@ -9,8 +9,7 @@
 namespace spdlog {
 
 namespace sinks {
-class SPDLOG_API sink
+class SPDLOG_API sink {
-{
 public:
     virtual ~sink() = default;
     virtual void log(const details::log_msg &msg) = 0;
@@ -31,5 +30,5 @@ protected:
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "sink-inl.h"
+    #include "sink-inl.h"
 #endif

vendor/spdlog/sinks/stdout_color_sinks-inl.h

@@ -4,35 +4,35 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/stdout_color_sinks.h>
+    #include <spdlog/sinks/stdout_color_sinks.h>
 #endif
 
-#include <spdlog/logger.h>
 #include <spdlog/common.h>
+#include <spdlog/logger.h>
 
 namespace spdlog {
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name, color_mode mode)
+SPDLOG_INLINE std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name,
-{
+                                                      color_mode mode) {
     return Factory::template create<sinks::stdout_color_sink_mt>(logger_name, mode);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stdout_color_st(const std::string &logger_name, color_mode mode)
+SPDLOG_INLINE std::shared_ptr<logger> stdout_color_st(const std::string &logger_name,
-{
+                                                      color_mode mode) {
     return Factory::template create<sinks::stdout_color_sink_st>(logger_name, mode);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name, color_mode mode)
+SPDLOG_INLINE std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name,
-{
+                                                      color_mode mode) {
     return Factory::template create<sinks::stderr_color_sink_mt>(logger_name, mode);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stderr_color_st(const std::string &logger_name, color_mode mode)
+SPDLOG_INLINE std::shared_ptr<logger> stderr_color_st(const std::string &logger_name,
-{
+                                                      color_mode mode) {
     return Factory::template create<sinks::stderr_color_sink_st>(logger_name, mode);
 }
 }  // namespace spdlog

vendor/spdlog/sinks/stdout_color_sinks.h

@@ -4,9 +4,9 @@
 #pragma once
 
 #ifdef _WIN32
-#    include <spdlog/sinks/wincolor_sink.h>
+    #include <spdlog/sinks/wincolor_sink.h>
 #else
-#    include <spdlog/sinks/ansicolor_sink.h>
+    #include <spdlog/sinks/ansicolor_sink.h>
 #endif
 
 #include <spdlog/details/synchronous_factory.h>
@@ -26,20 +26,24 @@ using stderr_color_sink_st = ansicolor_stderr_sink_st;
 #endif
 }  // namespace sinks
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name, color_mode mode = color_mode::automatic);
+std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name,
+                                        color_mode mode = color_mode::automatic);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-std::shared_ptr<logger> stdout_color_st(const std::string &logger_name, color_mode mode = color_mode::automatic);
+std::shared_ptr<logger> stdout_color_st(const std::string &logger_name,
+                                        color_mode mode = color_mode::automatic);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name, color_mode mode = color_mode::automatic);
+std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name,
+                                        color_mode mode = color_mode::automatic);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-std::shared_ptr<logger> stderr_color_st(const std::string &logger_name, color_mode mode = color_mode::automatic);
+std::shared_ptr<logger> stderr_color_st(const std::string &logger_name,
+                                        color_mode mode = color_mode::automatic);
 
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "stdout_color_sinks-inl.h"
+    #include "stdout_color_sinks-inl.h"
 #endif

vendor/spdlog/sinks/stdout_sinks-inl.h

@@ -4,36 +4,35 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/stdout_sinks.h>
+    #include <spdlog/sinks/stdout_sinks.h>
 #endif
 
+#include <memory>
 #include <spdlog/details/console_globals.h>
 #include <spdlog/pattern_formatter.h>
-#include <memory>
 
 #ifdef _WIN32
-// under windows using fwrite to non-binary stream results in \r\r\n (see issue #1675)
+    // under windows using fwrite to non-binary stream results in \r\r\n (see issue #1675)
-// so instead we use ::FileWrite
+    // so instead we use ::FileWrite
-#    include <spdlog/details/windows_include.h>
+    #include <spdlog/details/windows_include.h>
 
-#    ifndef _USING_V110_SDK71_ // fileapi.h doesn't exist in winxp
+    #ifndef _USING_V110_SDK71_  // fileapi.h doesn't exist in winxp
-#        include <fileapi.h>   // WriteFile (..)
+        #include <fileapi.h>    // WriteFile (..)
-#    endif
+    #endif
 
-#    include <io.h>    // _get_osfhandle(..)
+    #include <io.h>     // _get_osfhandle(..)
-#    include <stdio.h> // _fileno(..)
+    #include <stdio.h>  // _fileno(..)
 #endif                  // WIN32
 
 namespace spdlog {
 
 namespace sinks {
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE stdout_sink_base<ConsoleMutex>::stdout_sink_base(FILE *file)
-    : mutex_(ConsoleMutex::mutex())
+    : mutex_(ConsoleMutex::mutex()),
-    , file_(file)
+      file_(file),
-    , formatter_(details::make_unique<spdlog::pattern_formatter>())
+      formatter_(details::make_unique<spdlog::pattern_formatter>()) {
-{
 #ifdef _WIN32
     // get windows handle from the FILE* object
 
@@ -42,98 +41,86 @@ SPDLOG_INLINE stdout_sink_base<ConsoleMutex>::stdout_sink_base(FILE *file)
     // don't throw to support cases where no console is attached,
     // and let the log method to do nothing if (handle_ == INVALID_HANDLE_VALUE).
     // throw only if non stdout/stderr target is requested (probably regular file and not console).
-    if (handle_ == INVALID_HANDLE_VALUE && file != stdout && file != stderr)
+    if (handle_ == INVALID_HANDLE_VALUE && file != stdout && file != stderr) {
-    {
         throw_spdlog_ex("spdlog::stdout_sink_base: _get_osfhandle() failed", errno);
     }
 #endif  // WIN32
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::log(const details::log_msg &msg)
+SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::log(const details::log_msg &msg) {
-{
 #ifdef _WIN32
-    if (handle_ == INVALID_HANDLE_VALUE)
+    if (handle_ == INVALID_HANDLE_VALUE) {
-    {
         return;
     }
     std::lock_guard<mutex_t> lock(mutex_);
     memory_buf_t formatted;
     formatter_->format(msg, formatted);
-    ::fflush(file_); // flush in case there is something in this file_ already
     auto size = static_cast<DWORD>(formatted.size());
     DWORD bytes_written = 0;
     bool ok = ::WriteFile(handle_, formatted.data(), size, &bytes_written, nullptr) != 0;
-    if (!ok)
+    if (!ok) {
-    {
+        throw_spdlog_ex("stdout_sink_base: WriteFile() failed. GetLastError(): " +
-        throw_spdlog_ex("stdout_sink_base: WriteFile() failed. GetLastError(): " + std::to_string(::GetLastError()));
+                        std::to_string(::GetLastError()));
     }
 #else
     std::lock_guard<mutex_t> lock(mutex_);
     memory_buf_t formatted;
     formatter_->format(msg, formatted);
     ::fwrite(formatted.data(), sizeof(char), formatted.size(), file_);
-    ::fflush(file_); // flush every line to terminal
 #endif                // WIN32
+    ::fflush(file_);  // flush every line to terminal
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::flush()
+SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::flush() {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     fflush(file_);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::set_pattern(const std::string &pattern)
+SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::set_pattern(const std::string &pattern) {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::unique_ptr<spdlog::formatter>(new pattern_formatter(pattern));
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter)
+SPDLOG_INLINE void stdout_sink_base<ConsoleMutex>::set_formatter(
-{
+    std::unique_ptr<spdlog::formatter> sink_formatter) {
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::move(sink_formatter);
 }
 
 // stdout sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE stdout_sink<ConsoleMutex>::stdout_sink()
-    : stdout_sink_base<ConsoleMutex>(stdout)
+    : stdout_sink_base<ConsoleMutex>(stdout) {}
-{}
 
 // stderr sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE stderr_sink<ConsoleMutex>::stderr_sink()
-    : stdout_sink_base<ConsoleMutex>(stderr)
+    : stdout_sink_base<ConsoleMutex>(stderr) {}
-{}
 
 }  // namespace sinks
 
 // factory methods
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stdout_logger_mt(const std::string &logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> stdout_logger_mt(const std::string &logger_name) {
-{
     return Factory::template create<sinks::stdout_sink_mt>(logger_name);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stdout_logger_st(const std::string &logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> stdout_logger_st(const std::string &logger_name) {
-{
     return Factory::template create<sinks::stdout_sink_st>(logger_name);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stderr_logger_mt(const std::string &logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> stderr_logger_mt(const std::string &logger_name) {
-{
     return Factory::template create<sinks::stderr_sink_mt>(logger_name);
 }
 
-template<typename Factory>
+template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stderr_logger_st(const std::string &logger_name)
+SPDLOG_INLINE std::shared_ptr<logger> stderr_logger_st(const std::string &logger_name) {
-{
     return Factory::template create<sinks::stderr_sink_st>(logger_name);
 }
 }  // namespace spdlog

vendor/spdlog/sinks/stdout_sinks.h

@@ -3,22 +3,21 @@
 
 #pragma once
 
+#include <cstdio>
 #include <spdlog/details/console_globals.h>
 #include <spdlog/details/synchronous_factory.h>
 #include <spdlog/sinks/sink.h>
-#include <cstdio>
 
 #ifdef _WIN32
-#    include <spdlog/details/windows_include.h>
+    #include <spdlog/details/windows_include.h>
 #endif
 
 namespace spdlog {
 
 namespace sinks {
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class stdout_sink_base : public sink
+class stdout_sink_base : public sink {
-{
 public:
     using mutex_t = typename ConsoleMutex::mutex_t;
     explicit stdout_sink_base(FILE *file);
@@ -45,16 +44,14 @@ protected:
 #endif  // WIN32
 };
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class stdout_sink : public stdout_sink_base<ConsoleMutex>
+class stdout_sink : public stdout_sink_base<ConsoleMutex> {
-{
 public:
     stdout_sink();
 };
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-class stderr_sink : public stdout_sink_base<ConsoleMutex>
+class stderr_sink : public stdout_sink_base<ConsoleMutex> {
-{
 public:
     stderr_sink();
 };
@@ -68,20 +65,20 @@ using stderr_sink_st = stderr_sink<details::console_nullmutex>;
 }  // namespace sinks
 
 // factory methods
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
 std::shared_ptr<logger> stdout_logger_mt(const std::string &logger_name);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
 std::shared_ptr<logger> stdout_logger_st(const std::string &logger_name);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
 std::shared_ptr<logger> stderr_logger_mt(const std::string &logger_name);
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
 std::shared_ptr<logger> stderr_logger_st(const std::string &logger_name);
 
 }  // namespace spdlog
 
 #ifdef SPDLOG_HEADER_ONLY
-#    include "stdout_sinks-inl.h"
+    #include "stdout_sinks-inl.h"
 #endif

vendor/spdlog/sinks/syslog_sink.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <array>
 #include <string>
@@ -16,53 +16,42 @@ namespace sinks {
 /**
  * Sink that write to syslog using the `syscall()` library call.
  */
-template<typename Mutex>
+template <typename Mutex>
-class syslog_sink : public base_sink<Mutex>
+class syslog_sink : public base_sink<Mutex> {
-{
-
 public:
     syslog_sink(std::string ident, int syslog_option, int syslog_facility, bool enable_formatting)
-        : enable_formatting_{enable_formatting}
+        : enable_formatting_{enable_formatting},
-        , syslog_levels_{{/* spdlog::level::trace      */ LOG_DEBUG,
+          syslog_levels_{{/* spdlog::level::trace      */ LOG_DEBUG,
                           /* spdlog::level::debug      */ LOG_DEBUG,
                           /* spdlog::level::info       */ LOG_INFO,
                           /* spdlog::level::warn       */ LOG_WARNING,
                           /* spdlog::level::err        */ LOG_ERR,
                           /* spdlog::level::critical   */ LOG_CRIT,
-              /* spdlog::level::off        */ LOG_INFO}}
+                          /* spdlog::level::off        */ LOG_INFO}},
-        , ident_{std::move(ident)}
+          ident_{std::move(ident)} {
-    {
         // set ident to be program name if empty
         ::openlog(ident_.empty() ? nullptr : ident_.c_str(), syslog_option, syslog_facility);
     }
 
-    ~syslog_sink() override
+    ~syslog_sink() override { ::closelog(); }
-    {
-        ::closelog();
-    }
 
     syslog_sink(const syslog_sink &) = delete;
     syslog_sink &operator=(const syslog_sink &) = delete;
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         string_view_t payload;
         memory_buf_t formatted;
-        if (enable_formatting_)
+        if (enable_formatting_) {
-        {
             base_sink<Mutex>::formatter_->format(msg, formatted);
             payload = string_view_t(formatted.data(), formatted.size());
-        }
+        } else {
-        else
-        {
             payload = msg.payload;
         }
 
         size_t length = payload.size();
         // limit to max int
-        if (length > static_cast<size_t>(std::numeric_limits<int>::max()))
+        if (length > static_cast<size_t>(std::numeric_limits<int>::max())) {
-        {
             length = static_cast<size_t>(std::numeric_limits<int>::max());
         }
 
@@ -72,20 +61,19 @@ protected:
     void flush_() override {}
     bool enable_formatting_ = false;
 
+    //
+    // Simply maps spdlog's log level to syslog priority level.
+    //
+    int syslog_prio_from_level(const details::log_msg &msg) const {
+        return syslog_levels_.at(static_cast<levels_array::size_type>(msg.level));
+    }
+
 private:
     using levels_array = std::array<int, 7>;
     levels_array syslog_levels_;
     // must store the ident because the man says openlog might use the pointer as
     // is and not a string copy
     const std::string ident_;
-
-    //
-    // Simply maps spdlog's log level to syslog priority level.
-    //
-    int syslog_prio_from_level(const details::log_msg &msg) const
-    {
-        return syslog_levels_.at(static_cast<levels_array::size_type>(msg.level));
-    }
 };
 
 using syslog_sink_mt = syslog_sink<std::mutex>;
@@ -93,17 +81,23 @@ using syslog_sink_st = syslog_sink<details::null_mutex>;
 }  // namespace sinks
 
 // Create and register a syslog logger
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> syslog_logger_mt(const std::string &logger_name, const std::string &syslog_ident = "", int syslog_option = 0,
+inline std::shared_ptr<logger> syslog_logger_mt(const std::string &logger_name,
-    int syslog_facility = LOG_USER, bool enable_formatting = false)
+                                                const std::string &syslog_ident = "",
-{
+                                                int syslog_option = 0,
-    return Factory::template create<sinks::syslog_sink_mt>(logger_name, syslog_ident, syslog_option, syslog_facility, enable_formatting);
+                                                int syslog_facility = LOG_USER,
+                                                bool enable_formatting = false) {
+    return Factory::template create<sinks::syslog_sink_mt>(logger_name, syslog_ident, syslog_option,
+                                                           syslog_facility, enable_formatting);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> syslog_logger_st(const std::string &logger_name, const std::string &syslog_ident = "", int syslog_option = 0,
+inline std::shared_ptr<logger> syslog_logger_st(const std::string &logger_name,
-    int syslog_facility = LOG_USER, bool enable_formatting = false)
+                                                const std::string &syslog_ident = "",
-{
+                                                int syslog_option = 0,
-    return Factory::template create<sinks::syslog_sink_st>(logger_name, syslog_ident, syslog_option, syslog_facility, enable_formatting);
+                                                int syslog_facility = LOG_USER,
+                                                bool enable_formatting = false) {
+    return Factory::template create<sinks::syslog_sink_st>(logger_name, syslog_ident, syslog_option,
+                                                           syslog_facility, enable_formatting);
 }
 }  // namespace spdlog

vendor/spdlog/sinks/systemd_sink.h

@@ -3,13 +3,14 @@
 
 #pragma once
 
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/null_mutex.h>
+#include <spdlog/details/os.h>
 #include <spdlog/details/synchronous_factory.h>
+#include <spdlog/sinks/base_sink.h>
 
 #include <array>
 #ifndef SD_JOURNAL_SUPPRESS_LOCATION
-#    define SD_JOURNAL_SUPPRESS_LOCATION
+    #define SD_JOURNAL_SUPPRESS_LOCATION
 #endif
 #include <systemd/sd-journal.h>
 
@@ -19,21 +20,19 @@ namespace sinks {
 /**
  * Sink that write to systemd journal using the `sd_journal_send()` library call.
  */
-template<typename Mutex>
+template <typename Mutex>
-class systemd_sink : public base_sink<Mutex>
+class systemd_sink : public base_sink<Mutex> {
-{
 public:
     systemd_sink(std::string ident = "", bool enable_formatting = false)
-        : ident_{std::move(ident)}
+        : ident_{std::move(ident)},
-        , enable_formatting_{enable_formatting}
+          enable_formatting_{enable_formatting},
-        , syslog_levels_{{/* spdlog::level::trace      */ LOG_DEBUG,
+          syslog_levels_{{/* spdlog::level::trace      */ LOG_DEBUG,
                           /* spdlog::level::debug      */ LOG_DEBUG,
                           /* spdlog::level::info       */ LOG_INFO,
                           /* spdlog::level::warn       */ LOG_WARNING,
                           /* spdlog::level::err        */ LOG_ERR,
                           /* spdlog::level::critical   */ LOG_CRIT,
-              /* spdlog::level::off        */ LOG_INFO}}
+                          /* spdlog::level::off        */ LOG_INFO}} {}
-    {}
 
     ~systemd_sink() override {}
 
@@ -46,52 +45,55 @@ protected:
     using levels_array = std::array<int, 7>;
     levels_array syslog_levels_;
 
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         int err;
         string_view_t payload;
         memory_buf_t formatted;
-        if (enable_formatting_)
+        if (enable_formatting_) {
-        {
             base_sink<Mutex>::formatter_->format(msg, formatted);
             payload = string_view_t(formatted.data(), formatted.size());
-        }
+        } else {
-        else
-        {
             payload = msg.payload;
         }
 
         size_t length = payload.size();
         // limit to max int
-        if (length > static_cast<size_t>(std::numeric_limits<int>::max()))
+        if (length > static_cast<size_t>(std::numeric_limits<int>::max())) {
-        {
             length = static_cast<size_t>(std::numeric_limits<int>::max());
         }
 
         const string_view_t syslog_identifier = ident_.empty() ? msg.logger_name : ident_;
 
         // Do not send source location if not available
-        if (msg.source.empty())
+        if (msg.source.empty()) {
-        {
             // Note: function call inside '()' to avoid macro expansion
-            err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), payload.data(), "PRIORITY=%d", syslog_level(msg.level),
+            err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), payload.data(),
-                "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(syslog_identifier.size()), syslog_identifier.data(), nullptr);
+                                    "PRIORITY=%d", syslog_level(msg.level),
-        }
+#ifndef SPDLOG_NO_THREAD_ID
-        else
+                                    "TID=%zu", msg.thread_id,
-        {
+#endif
-            err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), payload.data(), "PRIORITY=%d", syslog_level(msg.level),
+                                    "SYSLOG_IDENTIFIER=%.*s",
-                "SYSLOG_IDENTIFIER=%.*s", static_cast<int>(syslog_identifier.size()), syslog_identifier.data(), "CODE_FILE=%s",
+                                    static_cast<int>(syslog_identifier.size()),
-                msg.source.filename, "CODE_LINE=%d", msg.source.line, "CODE_FUNC=%s", msg.source.funcname, nullptr);
+                                    syslog_identifier.data(), nullptr);
+        } else {
+            err = (sd_journal_send)("MESSAGE=%.*s", static_cast<int>(length), payload.data(),
+                                    "PRIORITY=%d", syslog_level(msg.level),
+#ifndef SPDLOG_NO_THREAD_ID
+                                    "TID=%zu", msg.thread_id,
+#endif
+                                    "SYSLOG_IDENTIFIER=%.*s",
+                                    static_cast<int>(syslog_identifier.size()),
+                                    syslog_identifier.data(), "CODE_FILE=%s", msg.source.filename,
+                                    "CODE_LINE=%d", msg.source.line, "CODE_FUNC=%s",
+                                    msg.source.funcname, nullptr);
         }
 
-        if (err)
+        if (err) {
-        {
             throw_spdlog_ex("Failed writing to systemd", errno);
         }
     }
 
-    int syslog_level(level::level_enum l)
+    int syslog_level(level::level_enum l) {
-    {
         return syslog_levels_.at(static_cast<levels_array::size_type>(l));
     }
 
@@ -103,17 +105,17 @@ using systemd_sink_st = systemd_sink<details::null_mutex>;
 }  // namespace sinks
 
 // Create and register a syslog logger
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> systemd_logger_mt(
+inline std::shared_ptr<logger> systemd_logger_mt(const std::string &logger_name,
-    const std::string &logger_name, const std::string &ident = "", bool enable_formatting = false)
+                                                 const std::string &ident = "",
-{
+                                                 bool enable_formatting = false) {
     return Factory::template create<sinks::systemd_sink_mt>(logger_name, ident, enable_formatting);
 }
 
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> systemd_logger_st(
+inline std::shared_ptr<logger> systemd_logger_st(const std::string &logger_name,
-    const std::string &logger_name, const std::string &ident = "", bool enable_formatting = false)
+                                                 const std::string &ident = "",
-{
+                                                 bool enable_formatting = false) {
     return Factory::template create<sinks::systemd_sink_st>(logger_name, ident, enable_formatting);
 }
 }  // namespace spdlog

vendor/spdlog/sinks/tcp_sink.h

@@ -4,53 +4,49 @@
 #pragma once
 
 #include <spdlog/common.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/null_mutex.h>
+#include <spdlog/sinks/base_sink.h>
 #ifdef _WIN32
-#    include <spdlog/details/tcp_client-windows.h>
+    #include <spdlog/details/tcp_client-windows.h>
 #else
-#    include <spdlog/details/tcp_client.h>
+    #include <spdlog/details/tcp_client.h>
 #endif
 
-#include <mutex>
-#include <string>
 #include <chrono>
 #include <functional>
+#include <mutex>
+#include <string>
 
 #pragma once
 
 // Simple tcp client sink
 // Connects to remote address and send the formatted log.
 // Will attempt to reconnect if connection drops.
-// If more complicated behaviour is needed (i.e get responses), you can inherit it and override the sink_it_ method.
+// If more complicated behaviour is needed (i.e get responses), you can inherit it and override the
+// sink_it_ method.
 
 namespace spdlog {
 namespace sinks {
 
-struct tcp_sink_config
+struct tcp_sink_config {
-{
     std::string server_host;
     int server_port;
     bool lazy_connect = false;  // if true connect on first log call instead of on construction
 
     tcp_sink_config(std::string host, int port)
-        : server_host{std::move(host)}
+        : server_host{std::move(host)},
-        , server_port{port}
+          server_port{port} {}
-    {}
 };
 
-template<typename Mutex>
+template <typename Mutex>
-class tcp_sink : public spdlog::sinks::base_sink<Mutex>
+class tcp_sink : public spdlog::sinks::base_sink<Mutex> {
-{
 public:
     // connect to tcp host/port or throw if failed
     // host can be hostname or ip address
 
     explicit tcp_sink(tcp_sink_config sink_config)
-        : config_{std::move(sink_config)}
+        : config_{std::move(sink_config)} {
-    {
+        if (!config_.lazy_connect) {
-        if (!config_.lazy_connect)
-        {
             this->client_.connect(config_.server_host, config_.server_port);
         }
     }
@@ -58,12 +54,10 @@ public:
     ~tcp_sink() override = default;
 
 protected:
-    void sink_it_(const spdlog::details::log_msg &msg) override
+    void sink_it_(const spdlog::details::log_msg &msg) override {
-    {
         spdlog::memory_buf_t formatted;
         spdlog::sinks::base_sink<Mutex>::formatter_->format(msg, formatted);
-        if (!client_.is_connected())
+        if (!client_.is_connected()) {
-        {
             client_.connect(config_.server_host, config_.server_port);
         }
         client_.send(formatted.data(), formatted.size());

vendor/spdlog/sinks/udp_sink.h

@@ -4,18 +4,18 @@
 #pragma once
 
 #include <spdlog/common.h>
-#include <spdlog/sinks/base_sink.h>
 #include <spdlog/details/null_mutex.h>
+#include <spdlog/sinks/base_sink.h>
 #ifdef _WIN32
-#    include <spdlog/details/udp_client-windows.h>
+    #include <spdlog/details/udp_client-windows.h>
 #else
-#    include <spdlog/details/udp_client.h>
+    #include <spdlog/details/udp_client.h>
 #endif
 
-#include <mutex>
-#include <string>
 #include <chrono>
 #include <functional>
+#include <mutex>
+#include <string>
 
 // Simple udp client sink
 // Sends formatted log via udp
@@ -23,31 +23,26 @@
 namespace spdlog {
 namespace sinks {
 
-struct udp_sink_config
+struct udp_sink_config {
-{
     std::string server_host;
     uint16_t server_port;
 
     udp_sink_config(std::string host, uint16_t port)
-        : server_host{std::move(host)}
+        : server_host{std::move(host)},
-        , server_port{port}
+          server_port{port} {}
-    {}
 };
 
-template<typename Mutex>
+template <typename Mutex>
-class udp_sink : public spdlog::sinks::base_sink<Mutex>
+class udp_sink : public spdlog::sinks::base_sink<Mutex> {
-{
 public:
     // host can be hostname or ip address
     explicit udp_sink(udp_sink_config sink_config)
-        : client_{sink_config.server_host, sink_config.server_port}
+        : client_{sink_config.server_host, sink_config.server_port} {}
-    {}
 
     ~udp_sink() override = default;
 
 protected:
-    void sink_it_(const spdlog::details::log_msg &msg) override
+    void sink_it_(const spdlog::details::log_msg &msg) override {
-    {
         spdlog::memory_buf_t formatted;
         spdlog::sinks::base_sink<Mutex>::formatter_->format(msg, formatted);
         client_.send(formatted.data(), formatted.size());
@@ -65,9 +60,9 @@ using udp_sink_st = udp_sink<spdlog::details::null_mutex>;
 //
 // factory functions
 //
-template<typename Factory = spdlog::synchronous_factory>
+template <typename Factory = spdlog::synchronous_factory>
-inline std::shared_ptr<logger> udp_logger_mt(const std::string &logger_name, sinks::udp_sink_config skin_config)
+inline std::shared_ptr<logger> udp_logger_mt(const std::string &logger_name,
-{
+                                             sinks::udp_sink_config skin_config) {
     return Factory::template create<sinks::udp_sink_mt>(logger_name, skin_config);
 }
 

vendor/spdlog/sinks/win_eventlog_sink.h

@@ -1,17 +1,20 @@
 // Copyright(c) 2015-present, Gabi Melman & spdlog contributors.
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 
-// Writing to Windows Event Log requires the registry entries below to be present, with the following modifications:
+// Writing to Windows Event Log requires the registry entries below to be present, with the
+// following modifications:
 // 1. <log_name>    should be replaced with your log name (e.g. your application name)
-// 2. <source_name> should be replaced with the specific source name and the key should be duplicated for
+// 2. <source_name> should be replaced with the specific source name and the key should be
+// duplicated for
 //                  each source used in the application
 //
-// Since typically modifications of this kind require elevation, it's better to do it as a part of setup procedure.
+// Since typically modifications of this kind require elevation, it's better to do it as a part of
-// The snippet below uses mscoree.dll as the message file as it exists on most of the Windows systems anyway and
+// setup procedure. The snippet below uses mscoree.dll as the message file as it exists on most of
-// happens to contain the needed resource.
+// the Windows systems anyway and happens to contain the needed resource.
 //
 // You can also specify a custom message file if needed.
-// Please refer to Event Log functions descriptions in MSDN for more details on custom message files.
+// Please refer to Event Log functions descriptions in MSDN for more details on custom message
+// files.
 
 /*---------------------------------------------------------------------------------------
 
@@ -47,8 +50,7 @@ namespace win_eventlog {
 
 namespace internal {
 
-struct local_alloc_t
+struct local_alloc_t {
-{
     HLOCAL hlocal_;
 
     SPDLOG_CONSTEXPR local_alloc_t() SPDLOG_NOEXCEPT : hlocal_(nullptr) {}
@@ -56,30 +58,27 @@ struct local_alloc_t
     local_alloc_t(local_alloc_t const &) = delete;
     local_alloc_t &operator=(local_alloc_t const &) = delete;
 
-    ~local_alloc_t() SPDLOG_NOEXCEPT
+    ~local_alloc_t() SPDLOG_NOEXCEPT {
-    {
+        if (hlocal_) {
-        if (hlocal_)
-        {
             LocalFree(hlocal_);
         }
     }
 };
 
 /** Windows error */
-struct win32_error : public spdlog_ex
+struct win32_error : public spdlog_ex {
-{
     /** Formats an error report line: "user-message: error-code (system message)" */
-    static std::string format(std::string const &user_message, DWORD error_code = GetLastError())
+    static std::string format(std::string const &user_message, DWORD error_code = GetLastError()) {
-    {
         std::string system_message;
 
         local_alloc_t format_message_result{};
         auto format_message_succeeded =
-            ::FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, nullptr,
+            ::FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
-                error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&format_message_result.hlocal_, 0, nullptr);
+                                 FORMAT_MESSAGE_IGNORE_INSERTS,
+                             nullptr, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                             (LPSTR)&format_message_result.hlocal_, 0, nullptr);
 
-        if (format_message_succeeded && format_message_result.hlocal_)
+        if (format_message_succeeded && format_message_result.hlocal_) {
-        {
             system_message = fmt_lib::format(" ({})", (LPSTR)format_message_result.hlocal_);
         }
 
@@ -87,23 +86,19 @@ struct win32_error : public spdlog_ex
     }
 
     explicit win32_error(std::string const &func_name, DWORD error = GetLastError())
-        : spdlog_ex(format(func_name, error))
+        : spdlog_ex(format(func_name, error)) {}
-    {}
 };
 
 /** Wrapper for security identifiers (SID) on Windows */
-struct sid_t
+struct sid_t {
-{
     std::vector<char> buffer_;
 
 public:
     sid_t() {}
 
     /** creates a wrapped SID copy */
-    static sid_t duplicate_sid(PSID psid)
+    static sid_t duplicate_sid(PSID psid) {
-    {
+        if (!::IsValidSid(psid)) {
-        if (!::IsValidSid(psid))
-        {
             throw_spdlog_ex("sid_t::sid_t(): invalid SID received");
         }
 
@@ -111,8 +106,7 @@ public:
 
         sid_t result;
         result.buffer_.resize(sid_length);
-        if (!::CopySid(sid_length, (PSID)result.as_sid(), psid))
+        if (!::CopySid(sid_length, (PSID)result.as_sid(), psid)) {
-        {
             SPDLOG_THROW(win32_error("CopySid"));
         }
 
@@ -120,44 +114,36 @@ public:
     }
 
     /** Retrieves pointer to the internal buffer contents as SID* */
-    SID *as_sid() const
+    SID *as_sid() const { return buffer_.empty() ? nullptr : (SID *)buffer_.data(); }
-    {
-        return buffer_.empty() ? nullptr : (SID *)buffer_.data();
-    }
 
     /** Get SID for the current user */
-    static sid_t get_current_user_sid()
+    static sid_t get_current_user_sid() {
-    {
         /* create and init RAII holder for process token */
-        struct process_token_t
+        struct process_token_t {
-        {
             HANDLE token_handle_ = INVALID_HANDLE_VALUE;
-            explicit process_token_t(HANDLE process)
+            explicit process_token_t(HANDLE process) {
-            {
+                if (!::OpenProcessToken(process, TOKEN_QUERY, &token_handle_)) {
-                if (!::OpenProcessToken(process, TOKEN_QUERY, &token_handle_))
-                {
                     SPDLOG_THROW(win32_error("OpenProcessToken"));
                 }
             }
 
-            ~process_token_t()
+            ~process_token_t() { ::CloseHandle(token_handle_); }
-            {
-                ::CloseHandle(token_handle_);
-            }
 
-        } current_process_token(::GetCurrentProcess()); // GetCurrentProcess returns pseudohandle, no leak here!
+        } current_process_token(
+            ::GetCurrentProcess());  // GetCurrentProcess returns pseudohandle, no leak here!
 
-        // Get the required size, this is expected to fail with ERROR_INSUFFICIENT_BUFFER and return the token size
+        // Get the required size, this is expected to fail with ERROR_INSUFFICIENT_BUFFER and return
+        // the token size
         DWORD tusize = 0;
-        if (::GetTokenInformation(current_process_token.token_handle_, TokenUser, NULL, 0, &tusize))
+        if (::GetTokenInformation(current_process_token.token_handle_, TokenUser, NULL, 0,
-        {
+                                  &tusize)) {
             SPDLOG_THROW(win32_error("GetTokenInformation should fail"));
         }
 
         // get user token
         std::vector<unsigned char> buffer(static_cast<size_t>(tusize));
-        if (!::GetTokenInformation(current_process_token.token_handle_, TokenUser, (LPVOID)buffer.data(), tusize, &tusize))
+        if (!::GetTokenInformation(current_process_token.token_handle_, TokenUser,
-        {
+                                   (LPVOID)buffer.data(), tusize, &tusize)) {
             SPDLOG_THROW(win32_error("GetTokenInformation"));
         }
 
@@ -166,12 +152,9 @@ public:
     }
 };
 
-struct eventlog
+struct eventlog {
-{
+    static WORD get_event_type(details::log_msg const &msg) {
-    static WORD get_event_type(details::log_msg const &msg)
+        switch (msg.level) {
-    {
-        switch (msg.level)
-        {
             case level::trace:
             case level::debug:
                 return EVENTLOG_SUCCESS;
@@ -192,10 +175,7 @@ struct eventlog
         }
     }
 
-    static WORD get_event_category(details::log_msg const &msg)
+    static WORD get_event_category(details::log_msg const &msg) { return (WORD)msg.level; }
-    {
-        return (WORD)msg.level;
-    }
 };
 
 }  // namespace internal
@@ -203,22 +183,18 @@ struct eventlog
 /*
  * Windows Event Log sink
  */
-template<typename Mutex>
+template <typename Mutex>
-class win_eventlog_sink : public base_sink<Mutex>
+class win_eventlog_sink : public base_sink<Mutex> {
-{
 private:
     HANDLE hEventLog_{NULL};
     internal::sid_t current_user_sid_;
     std::string source_;
-    WORD event_id_;
+    DWORD event_id_;
 
-    HANDLE event_log_handle()
+    HANDLE event_log_handle() {
-    {
+        if (!hEventLog_) {
-        if (!hEventLog_)
-        {
             hEventLog_ = ::RegisterEventSourceA(nullptr, source_.c_str());
-            if (!hEventLog_ || hEventLog_ == (HANDLE)ERROR_ACCESS_DENIED)
+            if (!hEventLog_ || hEventLog_ == (HANDLE)ERROR_ACCESS_DENIED) {
-            {
                 SPDLOG_THROW(internal::win32_error("RegisterEventSource"));
             }
         }
@@ -227,8 +203,7 @@ private:
     }
 
 protected:
-    void sink_it_(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override {
-    {
         using namespace internal;
 
         bool succeeded;
@@ -241,16 +216,17 @@ protected:
         details::os::utf8_to_wstrbuf(string_view_t(formatted.data(), formatted.size()), buf);
 
         LPCWSTR lp_wstr = buf.data();
-        succeeded = ::ReportEventW(event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg), event_id_,
+        succeeded = static_cast<bool>(::ReportEventW(
-            current_user_sid_.as_sid(), 1, 0, &lp_wstr, nullptr);
+            event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg),
+            event_id_, current_user_sid_.as_sid(), 1, 0, &lp_wstr, nullptr));
 #else
         LPCSTR lp_str = formatted.data();
-        succeeded = ::ReportEventA(event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg), event_id_,
+        succeeded = static_cast<bool>(::ReportEventA(
-            current_user_sid_.as_sid(), 1, 0, &lp_str, nullptr);
+            event_log_handle(), eventlog::get_event_type(msg), eventlog::get_event_category(msg),
+            event_id_, current_user_sid_.as_sid(), 1, 0, &lp_str, nullptr));
 #endif
 
-        if (!succeeded)
+        if (!succeeded) {
-        {
             SPDLOG_THROW(win32_error("ReportEvent"));
         }
     }
@@ -258,25 +234,20 @@ protected:
     void flush_() override {}
 
 public:
-    win_eventlog_sink(std::string const &source, WORD event_id = 1000 /* according to mscoree.dll */)
+    win_eventlog_sink(std::string const &source,
-        : source_(source)
+                      DWORD event_id = 1000 /* according to mscoree.dll */)
-        , event_id_(event_id)
+        : source_(source),
-    {
+          event_id_(event_id) {
-        try
+        try {
-        {
             current_user_sid_ = internal::sid_t::get_current_user_sid();
-        }
+        } catch (...) {
-        catch (...)
+            // get_current_user_sid() is unlikely to fail and if it does, we can still proceed
-        {
+            // without current_user_sid but in the event log the record will have no user name
-            // get_current_user_sid() is unlikely to fail and if it does, we can still proceed without
-            // current_user_sid but in the event log the record will have no user name
         }
     }
 
-    ~win_eventlog_sink()
+    ~win_eventlog_sink() {
-    {
+        if (hEventLog_) DeregisterEventSource(hEventLog_);
-        if (hEventLog_)
-            DeregisterEventSource(hEventLog_);
     }
 };
 

vendor/spdlog/sinks/wincolor_sink-inl.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #ifndef SPDLOG_HEADER_ONLY
-#    include <spdlog/sinks/wincolor_sink.h>
+    #include <spdlog/sinks/wincolor_sink.h>
 #endif
 
 #include <spdlog/details/windows_include.h>
@@ -15,44 +15,41 @@
 
 namespace spdlog {
 namespace sinks {
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE wincolor_sink<ConsoleMutex>::wincolor_sink(void *out_handle, color_mode mode)
-    : out_handle_(out_handle)
+    : out_handle_(out_handle),
-    , mutex_(ConsoleMutex::mutex())
+      mutex_(ConsoleMutex::mutex()),
-    , formatter_(details::make_unique<spdlog::pattern_formatter>())
+      formatter_(details::make_unique<spdlog::pattern_formatter>()) {
-{
-
     set_color_mode_impl(mode);
     // set level colors
     colors_[level::trace] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;  // white
     colors_[level::debug] = FOREGROUND_GREEN | FOREGROUND_BLUE;                   // cyan
     colors_[level::info] = FOREGROUND_GREEN;                                      // green
-    colors_[level::warn] = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY; // intense yellow
+    colors_[level::warn] =
+        FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY;  // intense yellow
     colors_[level::err] = FOREGROUND_RED | FOREGROUND_INTENSITY;   // intense red
-    colors_[level::critical] =
+    colors_[level::critical] = BACKGROUND_RED | FOREGROUND_RED | FOREGROUND_GREEN |
-        BACKGROUND_RED | FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY; // intense white on red background
+                               FOREGROUND_BLUE |
+                               FOREGROUND_INTENSITY;  // intense white on red background
     colors_[level::off] = 0;
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-SPDLOG_INLINE wincolor_sink<ConsoleMutex>::~wincolor_sink()
+SPDLOG_INLINE wincolor_sink<ConsoleMutex>::~wincolor_sink() {
-{
     this->flush();
 }
 
 // change the color for the given level
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color(level::level_enum level, std::uint16_t color)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color(level::level_enum level,
-{
+                                                          std::uint16_t color) {
     std::lock_guard<mutex_t> lock(mutex_);
-    colors_[level] = color;
+    colors_[static_cast<size_t>(level)] = color;
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::log(const details::log_msg &msg)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::log(const details::log_msg &msg) {
-{
+    if (out_handle_ == nullptr || out_handle_ == INVALID_HANDLE_VALUE) {
-    if (out_handle_ == nullptr || out_handle_ == INVALID_HANDLE_VALUE)
-    {
         return;
     }
 
@@ -61,115 +58,106 @@ void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::log(const details::log_msg &msg)
     msg.color_range_end = 0;
     memory_buf_t formatted;
     formatter_->format(msg, formatted);
-    if (should_do_colors_ && msg.color_range_end > msg.color_range_start)
+    if (should_do_colors_ && msg.color_range_end > msg.color_range_start) {
-    {
         // before color range
         print_range_(formatted, 0, msg.color_range_start);
         // in color range
-        auto orig_attribs = static_cast<WORD>(set_foreground_color_(colors_[msg.level]));
+        auto orig_attribs =
+            static_cast<WORD>(set_foreground_color_(colors_[static_cast<size_t>(msg.level)]));
         print_range_(formatted, msg.color_range_start, msg.color_range_end);
         // reset to orig colors
         ::SetConsoleTextAttribute(static_cast<HANDLE>(out_handle_), orig_attribs);
         print_range_(formatted, msg.color_range_end, formatted.size());
-    }
+    } else  // print without colors if color range is invalid (or color is disabled)
-    else // print without colors if color range is invalid (or color is disabled)
     {
         write_to_file_(formatted);
     }
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::flush()
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::flush() {
-{
     // windows console always flushed?
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_pattern(const std::string &pattern)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_pattern(const std::string &pattern) {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::unique_ptr<spdlog::formatter>(new pattern_formatter(pattern));
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter)
+void SPDLOG_INLINE
-{
+wincolor_sink<ConsoleMutex>::set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) {
     std::lock_guard<mutex_t> lock(mutex_);
     formatter_ = std::move(sink_formatter);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color_mode(color_mode mode)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color_mode(color_mode mode) {
-{
     std::lock_guard<mutex_t> lock(mutex_);
     set_color_mode_impl(mode);
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color_mode_impl(color_mode mode)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_color_mode_impl(color_mode mode) {
-{
+    if (mode == color_mode::automatic) {
-    if (mode == color_mode::automatic)
-    {
         // should do colors only if out_handle_  points to actual console.
         DWORD console_mode;
         bool in_console = ::GetConsoleMode(static_cast<HANDLE>(out_handle_), &console_mode) != 0;
         should_do_colors_ = in_console;
-    }
+    } else {
-    else
-    {
         should_do_colors_ = mode == color_mode::always ? true : false;
     }
 }
 
 // set foreground color and return the orig console attributes (for resetting later)
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-std::uint16_t SPDLOG_INLINE wincolor_sink<ConsoleMutex>::set_foreground_color_(std::uint16_t attribs)
+std::uint16_t SPDLOG_INLINE
-{
+wincolor_sink<ConsoleMutex>::set_foreground_color_(std::uint16_t attribs) {
     CONSOLE_SCREEN_BUFFER_INFO orig_buffer_info;
-    if (!::GetConsoleScreenBufferInfo(static_cast<HANDLE>(out_handle_), &orig_buffer_info))
+    if (!::GetConsoleScreenBufferInfo(static_cast<HANDLE>(out_handle_), &orig_buffer_info)) {
-    {
         // just return white if failed getting console info
         return FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
     }
 
     // change only the foreground bits (lowest 4 bits)
     auto new_attribs = static_cast<WORD>(attribs) | (orig_buffer_info.wAttributes & 0xfff0);
-    auto ignored = ::SetConsoleTextAttribute(static_cast<HANDLE>(out_handle_), static_cast<WORD>(new_attribs));
+    auto ignored =
+        ::SetConsoleTextAttribute(static_cast<HANDLE>(out_handle_), static_cast<WORD>(new_attribs));
     (void)(ignored);
     return static_cast<std::uint16_t>(orig_buffer_info.wAttributes);  // return orig attribs
 }
 
 // print a range of formatted message to console
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::print_range_(const memory_buf_t &formatted, size_t start, size_t end)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::print_range_(const memory_buf_t &formatted,
-{
+                                                             size_t start,
-    if (end > start)
+                                                             size_t end) {
-    {
+    if (end > start) {
         auto size = static_cast<DWORD>(end - start);
-        auto ignored = ::WriteConsoleA(static_cast<HANDLE>(out_handle_), formatted.data() + start, size, nullptr, nullptr);
+        auto ignored = ::WriteConsoleA(static_cast<HANDLE>(out_handle_), formatted.data() + start,
+                                       size, nullptr, nullptr);
         (void)(ignored);
     }
 }
 
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
-void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::write_to_file_(const memory_buf_t &formatted)
+void SPDLOG_INLINE wincolor_sink<ConsoleMutex>::write_to_file_(const memory_buf_t &formatted) {
-{
     auto size = static_cast<DWORD>(formatted.size());
     DWORD bytes_written = 0;
-    auto ignored = ::WriteFile(static_cast<HANDLE>(out_handle_), formatted.data(), size, &bytes_written, nullptr);
+    auto ignored = ::WriteFile(static_cast<HANDLE>(out_handle_), formatted.data(), size,
+                               &bytes_written, nullptr);
     (void)(ignored);
 }
 
 // wincolor_stdout_sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE wincolor_stdout_sink<ConsoleMutex>::wincolor_stdout_sink(color_mode mode)
-    : wincolor_sink<ConsoleMutex>(::GetStdHandle(STD_OUTPUT_HANDLE), mode)
+    : wincolor_sink<ConsoleMutex>(::GetStdHandle(STD_OUTPUT_HANDLE), mode) {}
-{}
 
 // wincolor_stderr_sink
-template<typename ConsoleMutex>
+template <typename ConsoleMutex>
 SPDLOG_INLINE wincolor_stderr_sink<ConsoleMutex>::wincolor_stderr_sink(color_mode mode)
-    : wincolor_sink<ConsoleMutex>(::GetStdHandle(STD_ERROR_HANDLE), mode)
+    : wincolor_sink<ConsoleMutex>(::GetStdHandle(STD_ERROR_HANDLE), mode) {}
-{}
 }  // namespace sinks
 }  // namespace spdlog