feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Fix handling of types convertible to std::string_view

Browse Source
This commit is contained in:
Victor Zverovich
2019-12-09 13:25:08 -08:00
parent fd52de0c6b
commit 9f2e7edaeb
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/fmt/core.h
View File

@ -878,9 +878,7 @@ 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_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);
} }
@ -913,12 +911,14 @@ template <typename Context> struct arg_mapper {
map(static_cast<typename std::underlying_type<T>::type>(val))) { map(static_cast<typename std::underlying_type<T>::type>(val))) {
return map(static_cast<typename std::underlying_type<T>::type>(val)); return map(static_cast<typename std::underlying_type<T>::type>(val));
} }
template <typename T, template <
FMT_ENABLE_IF(!is_string<T>::value && !is_char<T>::value && typename T,
!std::is_constructible<basic_string_view<char_type>, FMT_ENABLE_IF(
T>::value && !is_string<T>::value && !is_char<T>::value &&
(has_formatter<T, Context>::value || !std::is_constructible<basic_string_view<char_type>, T>::value &&
has_fallback_formatter<T, Context>::value))> (has_formatter<T, Context>::value ||
(has_fallback_formatter<T, Context>::value &&
!std::is_constructible<std_string_view<char_type>, T>::value)))>
FMT_CONSTEXPR const T& map(const T& val) { FMT_CONSTEXPR const T& map(const T& val) {
return val; return val;
} }

4
test/format-test.cc
View File

@ -1691,16 +1691,14 @@ struct explicitly_convertible_to_std_string_view {
}; };
namespace fmt { namespace fmt {
template <> template <>
struct formatter<explicitly_convertible_to_std_string_view> struct formatter<explicitly_convertible_to_std_string_view>
: formatter<std::string_view> { : formatter<std::string_view> {
auto format(const explicitly_convertible_to_std_string_view& v, auto format(const explicitly_convertible_to_std_string_view& v,
format_context& ctx) { format_context& ctx) -> decltype(ctx.out()) {
return format_to(ctx.out(), "'{}'", std::string_view(v)); return format_to(ctx.out(), "'{}'", std::string_view(v));
} }
}; };
} // namespace fmt } // namespace fmt
TEST(FormatterTest, FormatExplicitlyConvertibleToStdStringView) { TEST(FormatterTest, FormatExplicitlyConvertibleToStdStringView) {

22
test/ostream-test.cc
View File

@ -276,3 +276,25 @@ std::ostream& operator<<(std::ostream& os,
TEST(FormatterTest, FormatExplicitlyConvertibleToStringLikeIgnoreInserter) { TEST(FormatterTest, FormatExplicitlyConvertibleToStringLikeIgnoreInserter) {
EXPECT_EQ("foo", fmt::format("{}", explicitly_convertible_to_string_like())); EXPECT_EQ("foo", fmt::format("{}", explicitly_convertible_to_string_like()));
} }
#ifdef FMT_USE_STRING_VIEW
struct explicitly_convertible_to_std_string_view {
explicit operator fmt::internal::std_string_view<char>() const {
return {"foo", 3u};
}
};
TEST(FormatterTest, FormatExplicitlyConvertibleToStdStringView) {
EXPECT_EQ("foo", fmt::format("{}", explicitly_convertible_to_string_like()));
}
std::ostream& operator<<(std::ostream& os,
explicitly_convertible_to_std_string_view) {
return os << "bar";
}
TEST(FormatterTest, FormatExplicitlyConvertibleToStdStringViewIgnoreInserter) {
EXPECT_EQ("foo",
fmt::format("{}", explicitly_convertible_to_std_string_view()));
}
#endif // FMT_USE_STRING_VIEW