Try to fix modules ci

z4kn4fein · Jul 28, 2024 · fc72bb2 · fc72bb2
1 parent 3c887ee
commit fc72bb2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/include/semver/semver.hpp b/include/semver/semver.hpp
@@ -395,9 +395,10 @@ namespace semver
 #ifdef __cpp_lib_format
 #if __cpp_lib_format >= 201907L
 
-template <>
-struct std::formatter<semver::version> : std::formatter<std::string_view> {
-    auto format(const semver::version& version, std::format_context& ctx) const {
+template <class CharT>
+struct std::formatter<semver::version, CharT> : std::formatter<std::string_view> {
+    template <class FormatContext>
+    auto format(const semver::version& version, FormatContext& ctx) const {
         return std::formatter<std::string_view>::format(version.str(), ctx);
     }
 };

diff --git a/module/semver.cppm b/module/semver.cppm
@@ -38,4 +38,10 @@ export namespace semver {
 export namespace semver::literals {
     using semver::literals::operator""_v;
     using semver::literals::operator""_lv;
-}
+}
+
+#if defined(__cpp_lib_format)
+export namespace std {
+    using std::formatter;
+}
+#endif
diff --git a/test/module/module_tests.cpp b/test/module/module_tests.cpp
@@ -1,7 +1,7 @@
-import semver;
-
 #include <catch2/catch_test_macros.hpp>
 
+import semver;
+
 using namespace semver::literals;
 
 TEST_CASE("Module test version components", "[version][module]") {
@@ -46,4 +46,18 @@ TEST_CASE("Module test version std::ostream <<", "[version][module]") {
     std::stringstream ss;
     ss << v;
     REQUIRE(ss.str() == "5.2.3");
-}
+}
+
+#ifdef __cpp_lib_format
+#if __cpp_lib_format >= 201907L
+
+TEST_CASE("Module test version std::format formatter", "[version][module]") {
+    REQUIRE(std::format("{}", semver::version::parse("5.2.3")) == "5.2.3");
+    REQUIRE(std::format("{}", semver::version::parse("5.2.3-alpha")) == "5.2.3-alpha");
+    REQUIRE(std::format("{}", semver::version::parse("5.2.3-1.2.3")) == "5.2.3-1.2.3");
+    REQUIRE(std::format("{}", semver::version::parse("5.2.3-alpha+build34")) == "5.2.3-alpha+build34");
+    REQUIRE(std::format("{}", semver::version::parse("5.2.3-1.2.3+build34")) == "5.2.3-1.2.3+build34");
+}
+
+#endif
+#endif