Skip to content

Support to disable formatters for std::optional and std::expected #4457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robertfalkenberg wants to merge 1 commit into from
Closed

Support to disable formatters for std::optional and std::expected #4457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions include/fmt/std.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,22 @@
# endif
#endif

#ifndef FMT_CPP_LIB_OPTIONAL
# ifdef __cpp_lib_optional
# define FMT_CPP_LIB_OPTIONAL __cpp_lib_optional
# else
# define FMT_CPP_LIB_OPTIONAL 0
# endif
#endif

#ifndef FMT_CPP_LIB_EXPECTED
# ifdef __cpp_lib_expected
# define FMT_CPP_LIB_EXPECTED __cpp_lib_expected
# else
# define FMT_CPP_LIB_EXPECTED 0
# endif
#endif

FMT_BEGIN_NAMESPACE
namespace detail {

Expand Down Expand Up @@ -111,7 +127,7 @@ void write_escaped_path(basic_memory_buffer<Char>& quoted,

#endif // FMT_CPP_LIB_FILESYSTEM

#if defined(__cpp_lib_expected) || FMT_CPP_LIB_VARIANT
#if FMT_CPP_LIB_EXPECTED || FMT_CPP_LIB_VARIANT
template <typename Char, typename OutputIt, typename T>
auto write_escaped_alternative(OutputIt out, const T& v) -> OutputIt {
if constexpr (has_to_string_view<T>::value)
Expand Down Expand Up @@ -350,7 +366,7 @@ struct formatter<std::bitset<N>, Char>
template <typename Char>
struct formatter<std::thread::id, Char> : basic_ostream_formatter<Char> {};

#ifdef __cpp_lib_optional
#if FMT_CPP_LIB_OPTIONAL
template <typename T, typename Char>
struct formatter<std::optional<T>, Char,
std::enable_if_t<is_formattable<T, Char>::value>> {
Expand Down Expand Up @@ -389,9 +405,9 @@ struct formatter<std::optional<T>, Char,
return detail::write(out, ')');
}
};
#endif // __cpp_lib_optional
#endif // FMT_CPP_LIB_OPTIONAL

#ifdef __cpp_lib_expected
#if FMT_CPP_LIB_EXPECTED
template <typename T, typename E, typename Char>
struct formatter<std::expected<T, E>, Char,
std::enable_if_t<(std::is_void<T>::value ||
Expand All @@ -418,7 +434,7 @@ struct formatter<std::expected<T, E>, Char,
return out;
}
};
#endif // __cpp_lib_expected
#endif // FMT_CPP_LIB_EXPECTED

#ifdef __cpp_lib_source_location
template <> struct formatter<std::source_location> {
Expand Down
8 changes: 4 additions & 4 deletions test/std-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ TEST(ranges_std_test, format_quote_path) {
std::vector<std::filesystem::path>{"path1/file1.txt", "path2/file2.txt"};
EXPECT_EQ(fmt::format("{}", vec),
"[\"path1/file1.txt\", \"path2/file2.txt\"]");
# ifdef __cpp_lib_optional
# if FMT_CPP_LIB_OPTIONAL
auto o = std::optional<std::filesystem::path>("path/file.txt");
EXPECT_EQ(fmt::format("{}", o), "optional(\"path/file.txt\")");
EXPECT_EQ(fmt::format("{:?}", o), "optional(\"path/file.txt\")");
Expand Down Expand Up @@ -121,7 +121,7 @@ TEST(std_test, source_location) {
#endif

TEST(std_test, optional) {
#ifdef __cpp_lib_optional
#if FMT_CPP_LIB_OPTIONAL
EXPECT_EQ(fmt::format("{}", std::optional<int>{}), "none");
EXPECT_EQ(fmt::format("{}", std::pair{1, "second"}), "(1, \"second\")");
EXPECT_EQ(fmt::format("{}", std::vector{std::optional{1}, std::optional{2},
Expand Down Expand Up @@ -149,7 +149,7 @@ TEST(std_test, optional) {
}

TEST(std_test, expected) {
#ifdef __cpp_lib_expected
#if FMT_CPP_LIB_EXPECTED
EXPECT_EQ(fmt::format("{}", std::expected<void, int>{}), "expected()");
EXPECT_EQ(fmt::format("{}", std::expected<int, int>{1}), "expected(1)");
EXPECT_EQ(fmt::format("{}", std::expected<int, int>{std::unexpected(1)}),
Expand Down Expand Up @@ -198,7 +198,7 @@ class my_class {
};
} // namespace my_nso
TEST(std_test, optional_format_as) {
#ifdef __cpp_lib_optional
#if FMT_CPP_LIB_OPTIONAL
EXPECT_EQ(fmt::format("{}", std::optional<my_nso::my_number>{}), "none");
EXPECT_EQ(fmt::format("{}", std::optional{my_nso::my_number::one}),
"optional(\"first\")");
Expand Down
2 changes: 1 addition & 1 deletion test/xchar-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ TEST(std_test_xchar, complex) {
}

TEST(std_test_xchar, optional) {
# ifdef __cpp_lib_optional
# if FMT_CPP_LIB_OPTIONAL
EXPECT_EQ(fmt::format(L"{}", std::optional{L'C'}), L"optional(\'C\')");
EXPECT_EQ(fmt::format(L"{}", std::optional{std::wstring{L"wide string"}}),
L"optional(\"wide string\")");
Expand Down