🔥 Remove logging::level_constant

Author: elbeno

include/log/fmt/logger.hpp

@@ -6,19 +6,23 @@
 #include <stdx/ct_format.hpp>
 #include <stdx/tuple.hpp>
 #include <stdx/tuple_algorithms.hpp>
+#include <stdx/utility.hpp>
 
 #include <fmt/format.h>
 
 #include <chrono>
+#include <type_traits>
 #include <utility>
 
-template <auto L> struct fmt::formatter<logging::level_constant<L>> {
+template <logging::level L>
+struct fmt::formatter<std::integral_constant<logging::level, L>> {
     constexpr static auto parse(format_parse_context &ctx) {
         return ctx.begin();
     }
 
     template <typename FormatContext>
-    auto format(logging::level_constant<L>, FormatContext &ctx) const {
+    auto format(std::integral_constant<logging::level, L>,
+                FormatContext &ctx) const {
         return ::fmt::format_to(ctx.out(), logging::to_text<L>());
     }
 };
@@ -38,7 +42,7 @@ template <typename TDestinations> struct log_handler {
         stdx::for_each(
             [&](auto &out) {
                 ::fmt::format_to(out, "{:>8}us {} [{}]: ", currentTime,
-                                 level_constant<L>{}, get_module(Env{}).value);
+                                 stdx::ct<L>(), get_module(Env{}).value);
                 msg.apply(
                     [&]<typename StringType>(StringType, auto const &...args) {
                         ::fmt::format_to(out, StringType::value, args...);

include/log/level.hpp

@@ -29,6 +29,4 @@ template <level L>
                                     "INFO"sv, "USER1"sv, "USER2"sv, "TRACE"sv};
     return level_text[stdx::to_underlying(L)];
 }
-
-template <level L> struct level_constant : std::integral_constant<level, L> {};
 } // namespace logging

test/log/fmt_logger.cpp

@@ -1,6 +1,7 @@
 #include <log/fmt/logger.hpp>
 
 #include <stdx/ct_string.hpp>
+#include <stdx/utility.hpp>
 
 #include <catch2/catch_test_macros.hpp>
 
@@ -61,49 +62,49 @@ TEST_CASE("log levels are properly represented", "[fmt_logger]") {
     {
         std::string level{};
         fmt::format_to(std::back_inserter(level), "{}",
-                       logging::level_constant<logging::level::TRACE>{});
+                       stdx::ct<logging::level::TRACE>());
         CHECK(level == "TRACE");
     }
     {
         std::string level{};
         fmt::format_to(std::back_inserter(level), "{}",
-                       logging::level_constant<logging::level::INFO>{});
+                       stdx::ct<logging::level::INFO>());
         CHECK(level == "INFO");
     }
     {
         std::string level{};
         fmt::format_to(std::back_inserter(level), "{}",
-                       logging::level_constant<logging::level::WARN>{});
+                       stdx::ct<logging::level::WARN>());
         CHECK(level == "WARN");
     }
     {
         std::string level{};
         fmt::format_to(std::back_inserter(level), "{}",
-                       logging::level_constant<logging::level::ERROR>{});
+                       stdx::ct<logging::level::ERROR>());
         CHECK(level == "ERROR");
     }
     {
         std::string level{};
         fmt::format_to(std::back_inserter(level), "{}",
-                       logging::level_constant<logging::level::FATAL>{});
+                       stdx::ct<logging::level::FATAL>());
         CHECK(level == "FATAL");
     }
     {
         std::string level{};
         fmt::format_to(std::back_inserter(level), "{}",
-                       logging::level_constant<logging::level::MAX>{});
+                       stdx::ct<logging::level::MAX>());
         CHECK(level == "MAX");
     }
     {
         std::string level{};
         fmt::format_to(std::back_inserter(level), "{}",
-                       logging::level_constant<logging::level::USER1>{});
+                       stdx::ct<logging::level::USER1>());
         CHECK(level == "USER1");
     }
     {
         std::string level{};
         fmt::format_to(std::back_inserter(level), "{}",
-                       logging::level_constant<logging::level::USER2>{});
+                       stdx::ct<logging::level::USER2>());
         CHECK(level == "USER2");
     }
 }