Migrate from fmt/format to std/format

CMakeLists.txt

@@ -23,18 +23,12 @@ set(sources
     src/strutils.cpp
 )
 
-set(dependencies
-    fmt
-)
-
 idf_component_register(
     INCLUDE_DIRS
         src
     SRCS
         ${headers}
         ${sources}
-    REQUIRES
-        ${dependencies}
 )
 
 target_compile_options(${COMPONENT_TARGET}

src/color_utils.cpp

@@ -2,14 +2,12 @@
 
 // system includes
 #include <cstdio>
-
-// 3rdparty lib includes
-#include <fmt/core.h>
+#include <format>
 
 namespace cpputils {
 std::string toString(ColorHelper color)
 {
-    return fmt::format("#{:02X}{:02X}{:02X}", color.r, color.g, color.b);
+    return std::format("#{:02X}{:02X}{:02X}", color.r, color.g, color.b);
 }
 
 std::expected<ColorHelper, std::string> parseColor(std::string_view str)
@@ -28,7 +26,7 @@ std::expected<ColorHelper, std::string> parseColor(std::string_view str)
         return helper;
     }
 
-    return std::unexpected(fmt::format("invalid color {}", str));
+    return std::unexpected(std::format("invalid color {}", str));
 }
 
 } // namespace cpputils

src/cpptypesafeenum.h

@@ -3,9 +3,7 @@
 // system includes
 #include <string>
 #include <expected>
-
-// 3rdparty lib includes
-#include <fmt/core.h>
+#include <format>
 
 // local includes
 #include "cppmacros.h"
@@ -38,14 +36,14 @@ struct parseEnum;
         using TheEnum = Name; \
         Values(DECLARE_TYPESAFE_ENUM_HELPER2) \
         } \
-        return fmt::format("Unknown " #Name "({})", int(value)); \
+        return std::format("Unknown " #Name "({})", int(value)); \
     } \
     inline std::expected<Name, std::string> parse##Name(std::string_view str) \
     { \
         using TheEnum = Name; \
         if (false) {} \
         Values(DECLARE_TYPESAFE_ENUM_HELPER3) \
-        return std::unexpected(fmt::format("invalid " #Name " ({})", str)); \
+        return std::unexpected(std::format("invalid " #Name " ({})", str)); \
     } \
     template<typename T> \
     void iterate##Name(T &&cb) \

src/numberparsing.h

@@ -3,12 +3,10 @@
 // system includes
 #include <cstdint>
 #include <cstdio>
+#include <expected>
+#include <format>
 #include <inttypes.h>
 #include <string>
-#include <expected>
-
-// 3rdparty lib includes
-#include <fmt/format.h>
 
 namespace cpputils {
 template<typename T> std::expected<T, std::string> fromString(std::string_view str) = delete;

src/strutils.cpp

@@ -2,10 +2,9 @@
 
 // system includes
 #include <cctype>
+#include <format>
 #include <assert.h>
 
-// 3rdparty lib includes
-#include <fmt/core.h>
 
 namespace cpputils {
 namespace {
@@ -56,7 +55,7 @@ std::expected<std::basic_string<unsigned char>, std::string> fromHexString(std::
         case 'A'...'F': nibbles.nibble0 = c - 'A' + 10; break;
         case 'a'...'f': nibbles.nibble0 = c - 'a' + 10; break;
         default:
-            return std::unexpected(fmt::format("invalid character {} at pos {}", c, std::distance(std::begin(hex), iter)));
+            return std::unexpected(std::format("invalid character {} at pos {}", c, std::distance(std::begin(hex), iter)));
         }
 
         iter++;
@@ -67,7 +66,7 @@ std::expected<std::basic_string<unsigned char>, std::string> fromHexString(std::
         case 'A'...'F': nibbles.nibble1 = c - 'A' + 10; break;
         case 'a'...'f': nibbles.nibble1 = c - 'a' + 10; break;
         default:
-            return std::unexpected(fmt::format("invalid character {} at pos {}", c, std::distance(std::begin(hex), iter)));
+            return std::unexpected(std::format("invalid character {} at pos {}", c, std::distance(std::begin(hex), iter)));
         }
 
         iter++;