External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust to PR feedback.

Browse Source
This commit is contained in:
John Eivind Helset 2022-06-23 19:21:33 +02:00
parent 643fabfde2
commit 0928604213
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/api.rst
View File

@ -472,11 +472,11 @@ A ``std::variant`` is only formattable if every variant alternative is formattab
#include <fmt/std.h> #include <fmt/std.h>
std::variant<char, float> v0{'x'}; std::variant<char, float> v0{'x'};
// Prints "<'x'>" // Prints "variant('x')"
fmt::print("{}", v0); fmt::print("{}", v0);
std::variant<std::monostate, char> v1{}; std::variant<std::monostate, char> v1;
// Prints "< >" // Prints "variant(monostate)"
.. _compile-api: .. _compile-api:

18
include/fmt/std.h
View File

@ -72,6 +72,7 @@ FMT_END_NAMESPACE
#ifdef __cpp_lib_variant #ifdef __cpp_lib_variant
# include <variant> # include <variant>
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE
template <typename Char> struct formatter<std::monostate, Char> { template <typename Char> struct formatter<std::monostate, Char> {
template <typename ParseContext> template <typename ParseContext>
@ -83,7 +84,7 @@ template <typename Char> struct formatter<std::monostate, Char> {
auto format(const std::monostate&, FormatContext& ctx) const auto format(const std::monostate&, FormatContext& ctx) const
-> decltype(ctx.out()) { -> decltype(ctx.out()) {
auto out = ctx.out(); auto out = ctx.out();
*out++ = ' '; out = detail::write<Char>(out, "monostate");
return out; return out;
} }
}; };
@ -134,27 +135,28 @@ template <typename T, typename C> struct is_variant_formattable {
detail::is_variant_formattable_<T, C>::value; detail::is_variant_formattable_<T, C>::value;
}; };
template <typename VariantT, typename Char> template <typename Variant, typename Char>
struct formatter< struct formatter<
VariantT, Char, Variant, Char,
std::enable_if_t<std::conjunction_v< std::enable_if_t<std::conjunction_v<
is_variant_like<VariantT>, is_variant_formattable<VariantT, Char>>>> { is_variant_like<Variant>, is_variant_formattable<Variant, Char>>>> {
template <typename ParseContext> template <typename ParseContext>
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
return ctx.begin(); return ctx.begin();
} }
template <typename FormatContext = format_context> template <typename FormatContext>
auto format(const VariantT& value, FormatContext& ctx) const auto format(const Variant& value, FormatContext& ctx) const
-> decltype(ctx.out()) { -> decltype(ctx.out()) {
auto out = ctx.out(); auto out = ctx.out();
*out++ = '<';
out = detail::write<Char>(out, "variant(");
std::visit( std::visit(
[&](const auto& v) { [&](const auto& v) {
out = detail::write_variant_alternative<Char>(out, v); out = detail::write_variant_alternative<Char>(out, v);
}, },
value); value);
*out++ = '>'; *out++ = ')';
return out; return out;
} }
}; };

14
test/std-test.cc
View File

@ -37,16 +37,16 @@ TEST(std_test, thread_id) {
TEST(std_test, variant) { TEST(std_test, variant) {
#ifdef __cpp_lib_variant #ifdef __cpp_lib_variant
EXPECT_EQ(fmt::format("{}", std::monostate{}), " "); EXPECT_EQ(fmt::format("{}", std::monostate{}), "monostate");
using V0 = std::variant<int, float, std::string, char>; using V0 = std::variant<int, float, std::string, char>;
V0 v0(42); V0 v0(42);
V0 v1(1.5f); V0 v1(1.5f);
V0 v2("hello"); V0 v2("hello");
V0 v3('i'); V0 v3('i');
EXPECT_EQ(fmt::format("{}", v0), "<42>"); EXPECT_EQ(fmt::format("{}", v0), "variant(42)");
EXPECT_EQ(fmt::format("{}", v1), "<1.5>"); EXPECT_EQ(fmt::format("{}", v1), "variant(1.5)");
EXPECT_EQ(fmt::format("{}", v2), "<\"hello\">"); EXPECT_EQ(fmt::format("{}", v2), "variant(\"hello\")");
EXPECT_EQ(fmt::format("{}", v3), "<'i'>"); EXPECT_EQ(fmt::format("{}", v3), "variant('i')");
struct unformattable {}; struct unformattable {};
EXPECT_FALSE((fmt::is_formattable<unformattable>::value)); EXPECT_FALSE((fmt::is_formattable<unformattable>::value));
@ -61,7 +61,7 @@ TEST(std_test, variant) {
V1 v4{}; V1 v4{};
V1 v5{std::in_place_index<1>, "yes, this is variant"}; V1 v5{std::in_place_index<1>, "yes, this is variant"};
EXPECT_EQ(fmt::format("{}", v4), "< >"); EXPECT_EQ(fmt::format("{}", v4), "variant(monostate)");
EXPECT_EQ(fmt::format("{}", v5), "<\"yes, this is variant\">"); EXPECT_EQ(fmt::format("{}", v5), "variant(\"yes, this is variant\")");
#endif #endif
} }