fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 10:47:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Exclude fallback from is_formattable

Browse Source
This commit is contained in:
Victor Zverovich
2021-05-05 06:29:51 -07:00
parent 400b953fbb
commit 4f0eadfce4
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/fmt/core.h
View File

@ -949,9 +949,9 @@ struct fallback_formatter {
}; };
// Specifies if T has an enabled fallback_formatter specialization. // Specifies if T has an enabled fallback_formatter specialization.
template <typename T, typename Context> template <typename T, typename Char>
using has_fallback_formatter = using has_fallback_formatter =
std::is_constructible<fallback_formatter<T, typename Context::char_type>>; std::is_constructible<fallback_formatter<T, Char>>;
struct view {}; struct view {};
@ -1224,7 +1224,7 @@ template <typename Context> struct arg_mapper {
FMT_ENABLE_IF( FMT_ENABLE_IF(
std::is_constructible<basic_string_view<char_type>, T>::value && std::is_constructible<basic_string_view<char_type>, T>::value &&
!is_string<T>::value && !has_formatter<T, Context>::value && !is_string<T>::value && !has_formatter<T, Context>::value &&
!has_fallback_formatter<T, Context>::value)> !has_fallback_formatter<T, char_type>::value)>
FMT_CONSTEXPR FMT_INLINE basic_string_view<char_type> map(const T& val) { FMT_CONSTEXPR FMT_INLINE basic_string_view<char_type> map(const T& val) {
return basic_string_view<char_type>(val); return basic_string_view<char_type>(val);
} }
@ -1234,7 +1234,7 @@ template <typename Context> struct arg_mapper {
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 && !has_formatter<T, Context>::value && !is_string<T>::value && !has_formatter<T, Context>::value &&
!has_fallback_formatter<T, Context>::value)> !has_fallback_formatter<T, char_type>::value)>
FMT_CONSTEXPR FMT_INLINE basic_string_view<char_type> map(const T& val) { FMT_CONSTEXPR FMT_INLINE basic_string_view<char_type> map(const T& val) {
return std_string_view<char_type>(val); return std_string_view<char_type>(val);
} }
@ -1279,7 +1279,7 @@ template <typename Context> struct arg_mapper {
template <typename T, template <typename T,
FMT_ENABLE_IF(std::is_enum<T>::value && FMT_ENABLE_IF(std::is_enum<T>::value &&
!has_formatter<T, Context>::value && !has_formatter<T, Context>::value &&
!has_fallback_formatter<T, Context>::value)> !has_fallback_formatter<T, char_type>::value)>
FMT_CONSTEXPR FMT_INLINE auto map(const T& val) FMT_CONSTEXPR FMT_INLINE auto map(const T& val)
-> decltype(std::declval<arg_mapper>().map( -> decltype(std::declval<arg_mapper>().map(
static_cast<typename std::underlying_type<T>::type>(val))) { static_cast<typename std::underlying_type<T>::type>(val))) {
@ -1288,7 +1288,7 @@ template <typename Context> struct arg_mapper {
template <typename T, template <typename T,
FMT_ENABLE_IF(!is_string<T>::value && !is_char<T>::value && FMT_ENABLE_IF(!is_string<T>::value && !is_char<T>::value &&
(has_formatter<T, Context>::value || (has_formatter<T, Context>::value ||
has_fallback_formatter<T, Context>::value))> has_fallback_formatter<T, char_type>::value))>
FMT_CONSTEXPR FMT_INLINE const T& map(const T& val) { FMT_CONSTEXPR FMT_INLINE const T& map(const T& val) {
return val; return val;
} }
@ -1578,9 +1578,11 @@ FMT_MODULE_EXPORT_END
FMT_MODULE_EXPORT_BEGIN FMT_MODULE_EXPORT_BEGIN
template <typename T, typename Char = char> template <typename T, typename Char = char>
using is_formattable = bool_constant<!std::is_same< using is_formattable = bool_constant<
decltype(detail::arg_mapper<buffer_context<Char>>().map(std::declval<T>())), !std::is_same<decltype(detail::arg_mapper<buffer_context<Char>>().map(
detail::unformattable>::value>; std::declval<T>())),
detail::unformattable>::value &&
!detail::has_fallback_formatter<T, Char>::value>;
/** /**
\rst \rst

11
include/fmt/ranges.h
View File

@ -331,15 +331,14 @@ template <typename T, typename Char> struct is_range {
template <typename T, typename Char> template <typename T, typename Char>
struct formatter< struct formatter<
T, Char, T, Char,
enable_if_t<fmt::is_range<T, Char>::value enable_if_t<
fmt::is_range<T, Char>::value
// Workaround a bug in MSVC 2017 and earlier. // Workaround a bug in MSVC 2017 and earlier.
#if !FMT_MSC_VER || FMT_MSC_VER >= 1927 #if !FMT_MSC_VER || FMT_MSC_VER >= 1927
&& && (has_formatter<detail::value_type<T>, format_context>::value ||
(has_formatter<detail::value_type<T>, format_context>::value || detail::has_fallback_formatter<detail::value_type<T>, Char>::value)
detail::has_fallback_formatter<detail::value_type<T>,
format_context>::value)
#endif #endif
>> { >> {
formatting_range<Char> formatting; formatting_range<Char> formatting;
template <typename ParseContext> template <typename ParseContext>