forked from fmtlib/fmt
Fix handling of types with custom formatters that are convertible to std::string_view
This commit is contained in:
committed by
Victor Zverovich
parent
4f4d876616
commit
1ab80aa92c
@ -878,7 +878,9 @@ template <typename Context> struct arg_mapper {
|
|||||||
FMT_ENABLE_IF(
|
FMT_ENABLE_IF(
|
||||||
std::is_constructible<std_string_view<char_type>, T>::value &&
|
std::is_constructible<std_string_view<char_type>, T>::value &&
|
||||||
!std::is_constructible<basic_string_view<char_type>, T>::value &&
|
!std::is_constructible<basic_string_view<char_type>, T>::value &&
|
||||||
!is_string<T>::value)>
|
!is_string<T>::value &&
|
||||||
|
!has_formatter<T, Context>::value &&
|
||||||
|
!has_fallback_formatter<T, Context>::value)>
|
||||||
FMT_CONSTEXPR basic_string_view<char_type> map(const T& val) {
|
FMT_CONSTEXPR basic_string_view<char_type> map(const T& val) {
|
||||||
return std_string_view<char_type>(val);
|
return std_string_view<char_type>(val);
|
||||||
}
|
}
|
||||||
|
@ -1685,6 +1685,28 @@ TEST(FormatterTest, FormatStdStringView) {
|
|||||||
EXPECT_EQ("test", format("{}", std::string_view("test")));
|
EXPECT_EQ("test", format("{}", std::string_view("test")));
|
||||||
EXPECT_EQ("foo", format("{}", string_viewable()));
|
EXPECT_EQ("foo", format("{}", string_viewable()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct explicitly_convertible_to_std_string_view {
|
||||||
|
explicit operator std::string_view() const { return "foo"; }
|
||||||
|
};
|
||||||
|
|
||||||
|
namespace fmt {
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct formatter<explicitly_convertible_to_std_string_view>
|
||||||
|
: formatter<std::string_view> {
|
||||||
|
auto format(const explicitly_convertible_to_std_string_view& v,
|
||||||
|
format_context& ctx) {
|
||||||
|
return format_to(ctx.out(), "'{}'", std::string_view(v));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace fmt
|
||||||
|
|
||||||
|
TEST(FormatterTest, FormatExplicitlyConvertibleToStdStringView) {
|
||||||
|
EXPECT_EQ("'foo'",
|
||||||
|
fmt::format("{}", explicitly_convertible_to_std_string_view()));
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
Reference in New Issue
Block a user