From 40779749ac577e64084f2b80e89df88543f291ec Mon Sep 17 00:00:00 2001
From: Victor Zverovich <victor.zverovich@gmail.com>
Date: Fri, 7 Jun 2019 06:51:21 -0700
Subject: [PATCH] is_formattable -> has_formatter

---
 include/fmt/core.h   | 14 ++++++++------
 include/fmt/format.h |  2 +-
 test/format-test.cc  |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/fmt/core.h b/include/fmt/core.h
index b894399b..0dea4e98 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -492,6 +492,12 @@ struct convert_to_int : bool_constant<!std::is_arithmetic<T>::value &&
 
 namespace internal {
 
+// Specifies if T has an enabled formatter specialization. The type can be
+// formattable even if it doesn't have a formatter e.g. via conversion.
+template <typename T, typename Context>
+using has_formatter =
+    std::is_constructible<typename Context::template formatter_type<T>>;
+
 /** A contiguous memory buffer with an optional growing ability. */
 template <typename T> class buffer {
  private:
@@ -675,10 +681,6 @@ template <typename Context> struct custom_value {
   void (*format)(const void* arg, parse_context& parse_ctx, Context& ctx);
 };
 
-template <typename T, typename Context>
-using is_formattable =
-    std::is_constructible<typename Context::template formatter_type<T>>;
-
 // A formatting argument value.
 template <typename Context> class value {
  public:
@@ -727,7 +729,7 @@ template <typename Context> class value {
     // have different extension points, e.g. `formatter<T>` for `format` and
     // `printf_formatter<T>` for `printf`.
     custom.format = &format_custom_arg<
-        T, conditional_t<is_formattable<T, Context>::value,
+        T, conditional_t<has_formatter<T, Context>::value,
                          typename Context::template formatter_type<T>,
                          internal::fallback_formatter<T, char_type>>>;
   }
@@ -875,7 +877,7 @@ inline init<C, const T&, custom_type> make_value(const T& val) {
 
 template <typename C, typename T,
           FMT_ENABLE_IF(std::is_class<T>::value&& std::is_convertible<
-                            T, int>::value&& is_formattable<T, C>::value &&
+                            T, int>::value&& has_formatter<T, C>::value &&
                         !std::is_same<T, typename C::char_type>::value)>
 inline init<C, const T&, custom_type> make_value(const T& val) {
   return val;
diff --git a/include/fmt/format.h b/include/fmt/format.h
index 6bca25e4..fd12f99d 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -2179,7 +2179,7 @@ FMT_CONSTEXPR const typename ParseContext::char_type* parse_format_specs(
     ParseContext& ctx) {
   // GCC 7.2 requires initializer.
   typedef typename ParseContext::char_type char_type;
-  conditional_t<is_formattable<T, buffer_context<char_type>>::value,
+  conditional_t<has_formatter<T, buffer_context<char_type>>::value,
                 formatter<T, char_type>,
                 internal::fallback_formatter<T, char_type>>
       f;
diff --git a/test/format-test.cc b/test/format-test.cc
index 9832c8c7..d98c7791 100644
--- a/test/format-test.cc
+++ b/test/format-test.cc
@@ -1877,7 +1877,7 @@ enum TestEnum { A };
 TEST(FormatTest, Enum) { EXPECT_EQ("0", fmt::format("{}", A)); }
 
 TEST(FormatTest, FormatterNotSpecialized) {
-  EXPECT_FALSE((fmt::internal::is_formattable<
+  EXPECT_FALSE((fmt::internal::has_formatter<
     fmt::formatter<TestEnum>, fmt::format_context>::value));
 }