clang-format

bench/bench.cpp

@@ -67,7 +67,6 @@ int main(int argc, char *argv[])
 
         bench(howmany, spdlog::create<null_sink_st>("null_st"));
 
-
         spdlog::info("**************************************************************");
         spdlog::info("C-string (400 bytes). Single thread, {:n} iterations", howmany);
         spdlog::info("**************************************************************");

include/spdlog/common.h

@@ -185,12 +185,19 @@ using filename_t = std::wstring;
 using filename_t = std::string;
 #endif
 
-
 struct source_loc
 {
-    SPDLOG_CONSTEXPR  source_loc(): filename(""), line(0) {}
+    SPDLOG_CONSTEXPR source_loc()
-    SPDLOG_CONSTEXPR source_loc(const char *filename, int line) : filename(filename), line(line) {}
+        : filename("")
-    const char* const filename ;
+        , line(0)
+    {
+    }
+    SPDLOG_CONSTEXPR source_loc(const char *filename, int line)
+        : filename(filename)
+        , line(line)
+    {
+    }
+    const char *const filename;
     const uint32_t line;
 };
 

include/spdlog/details/log_msg.h

@@ -31,8 +31,10 @@ struct log_msg
     {
     }
 
-    log_msg(const std::string *loggers_name, level::level_enum lvl, string_view_t view):
+    log_msg(const std::string *loggers_name, level::level_enum lvl, string_view_t view)
-        log_msg(source_loc{}, loggers_name, lvl, view){}
+        : log_msg(source_loc{}, loggers_name, lvl, view)
+    {
+    }
 
     log_msg(const log_msg &other) = default;
     log_msg &operator=(const log_msg &other) = default;

include/spdlog/details/logger_impl.h

@@ -57,7 +57,6 @@ inline void spdlog::logger::set_pattern(std::string pattern, pattern_time_type t
     set_formatter(std::move(new_formatter));
 }
 
-
 template<typename... Args>
 inline void spdlog::logger::log(source_loc source, level::level_enum lvl, const char *fmt, const Args &... args)
 {
@@ -77,11 +76,10 @@ inline void spdlog::logger::log(source_loc source, level::level_enum lvl, const
     SPDLOG_CATCH_AND_HANDLE
 }
 
-
 template<typename... Args>
 inline void spdlog::logger::log(level::level_enum lvl, const char *fmt, const Args &... args)
 {
-   log(source_loc{}, lvl, fmt, args...);
+    log(source_loc{}, lvl, fmt, args...);
 }
 
 inline void spdlog::logger::log(source_loc source, level::level_enum lvl, const char *msg)

include/spdlog/details/pattern_formatter.h

@@ -813,34 +813,32 @@ class source_location_formatter final : public flag_formatter
 {
 public:
     explicit source_location_formatter(padding_info padinfo)
-            : flag_formatter(padinfo){};
+        : flag_formatter(padinfo){};
 
-void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
-{
-    if(padinfo_.width_)
     {
-        const auto text_size = std::char_traits<char>::length(msg.source.filename)
+        if (padinfo_.width_)
-                               + fmt_helper::count_digits(msg.source.line)
+        {
-                               +1;
+            const auto text_size = std::char_traits<char>::length(msg.source.filename) + fmt_helper::count_digits(msg.source.line) + 1;
-        scoped_pad p(text_size, padinfo_, dest);
+            scoped_pad p(text_size, padinfo_, dest);
-        fmt_helper::append_string_view(msg.source.filename, dest);
+            fmt_helper::append_string_view(msg.source.filename, dest);
-        dest.push_back(':');
+            dest.push_back(':');
-        fmt_helper::append_int(msg.source.line, dest);
+            fmt_helper::append_int(msg.source.line, dest);
+        }
+        else
+        {
+            fmt_helper::append_string_view(msg.source.filename, dest);
+            dest.push_back(':');
+            fmt_helper::append_int(msg.source.line, dest);
+        }
     }
-    else
-    {
-        fmt_helper::append_string_view(msg.source.filename, dest);
-        dest.push_back(':');
-        fmt_helper::append_int(msg.source.line, dest);
-    }
-}
 };
 // print soruce filename
 class source_filename_formatter final : public flag_formatter
 {
 public:
     explicit source_filename_formatter(padding_info padinfo)
-            : flag_formatter(padinfo){};
+        : flag_formatter(padinfo){};
 
     void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
     {
@@ -853,12 +851,13 @@ class source_linenum_formatter final : public flag_formatter
 {
 public:
     explicit source_linenum_formatter(padding_info padinfo)
-            : flag_formatter(padinfo){};
+        : flag_formatter(padinfo){};
 
     void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
     {
 
-        if(padinfo_.width_) {
+        if (padinfo_.width_)
+        {
             const size_t field_size = fmt::internal::count_digits(msg.source.line);
             scoped_pad p(field_size, padinfo_, dest);
             fmt_helper::append_int(msg.source.line, dest);

include/spdlog/logger.h

@@ -105,9 +105,9 @@ public:
     template<class T, typename std::enable_if<std::is_convertible<T, spdlog::string_view_t>::value, T>::type * = nullptr>
     void log(level::level_enum lvl, const T &);
 
-        // T can be statically converted to string_view
+    // T can be statically converted to string_view
-        template<class T, typename std::enable_if<std::is_convertible<T, spdlog::string_view_t>::value, T>::type * = nullptr>
+    template<class T, typename std::enable_if<std::is_convertible<T, spdlog::string_view_t>::value, T>::type * = nullptr>
-        void log(source_loc loc, level::level_enum lvl, const T &);
+    void log(source_loc loc, level::level_enum lvl, const T &);
 
     // T cannot be statically converted to string_view
     template<class T, typename std::enable_if<!std::is_convertible<T, spdlog::string_view_t>::value, T>::type * = nullptr>

include/spdlog/spdlog.h

@@ -309,7 +309,6 @@ inline void critical(const wchar_t *fmt, const Args &... args)
 // SPDLOG_LEVEL_OFF
 //
 
-
 #define SPDLOG_LOGGER_LOG(logger, level, ...) logger->log(spdlog::source_loc{__FILE__, __LINE__}, level, __VA_ARGS__)
 
 #if SPDLOG_ACTIVE_LEVEL <= SPDLOG_LEVEL_TRACE

tests/test_macros.cpp

@@ -33,7 +33,6 @@ TEST_CASE("debug and trace w/o format string", "[macros]]")
 
     REQUIRE(ends_with(file_contents(filename), "Test message 4\n"));
     REQUIRE(count_lines(filename) == 2);
-
 }
 
 TEST_CASE("disable param evaluation", "[macros]")