From 45e7c2e393dd1644f1ab18fb48ba59910c75aad0 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Sun, 22 Sep 2024 11:09:32 +0200
Subject: [PATCH] Add support for C++20 format API

Signed-off-by: Christian Parpart <christian@parpart.family>
---
 include/boxed-cpp/boxed.hpp | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/include/boxed-cpp/boxed.hpp b/include/boxed-cpp/boxed.hpp
index dfc7e46..4677190 100644
--- a/include/boxed-cpp/boxed.hpp
+++ b/include/boxed-cpp/boxed.hpp
@@ -207,19 +207,31 @@ struct hash<boxed::detail::boxed<T, U>>
 } // namespace std
 // {{{ fmtlib integration
 // clang-format off
-#if __has_include(<fmt/format.h>)
+#if __has_include(<format>)
+#include <format>
+// clang-format on
 
+template <typename Type, typename Tag>
+struct std::formatter<boxed::detail::boxed<Type, Tag>>: std::formatter<Type>
+{
+    template <typename FormatContext>
+    auto format(boxed::detail::boxed<Type, Tag> const& val, FormatContext& ctx) const
+    {
+        return std::formatter<Type>::format(val.value, ctx);
+    }
+};
+#elif __has_include(<fmt/format.h>)
+
+// clang-format off
 #include <fmt/format.h>
 // clang-format on
 
 template <typename Type, typename Tag>
-struct fmt::formatter<boxed::detail::boxed<Type, Tag>>
+struct fmt::formatter<boxed::detail::boxed<Type, Tag>>: fmt::formatter<Type>
 {
-    constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); }
-
     auto format(boxed::detail::boxed<Type, Tag> const& val, fmt::format_context& ctx) const
     {
-        return fmt::format_to(ctx.out(), "{}", val.value);
+        return fmt::formatter<Type>::format(val.value, ctx);
     }
 };