From c9ef07bc4e004a379bfa86db9fa513672d100954 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <viz@meta.com>
Date: Sun, 1 Sep 2024 17:34:47 -0700
Subject: [PATCH] Minor cleanup

---
 include/fmt/base.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/include/fmt/base.h b/include/fmt/base.h
index 96e31ea2..398d7402 100644
--- a/include/fmt/base.h
+++ b/include/fmt/base.h
@@ -640,10 +640,18 @@ template <typename T> struct is_char : std::false_type {};
 template <> struct is_char<char> : std::true_type {};
 
 template <typename T> class basic_appender;
+using appender = basic_appender<char>;
 
 class context;
 template <typename OutputIt, typename Char> class generic_context;
 
+// Longer aliases for C++20 compatibility.
+template <typename OutputIt, typename Char>
+using basic_format_context =
+    conditional_t<std::is_same<OutputIt, appender>::value, context,
+                  generic_context<OutputIt, Char>>;
+using format_context = context;
+
 template <typename Char>
 using buffered_context =
     conditional_t<std::is_same<Char, char>::value, context,
@@ -1894,8 +1902,6 @@ template <typename T> class basic_appender {
   FMT_CONSTEXPR20 auto operator++(int) -> basic_appender { return *this; }
 };
 
-using appender = basic_appender<char>;
-
 namespace detail {
 template <typename T>
 struct is_back_insert_iterator<basic_appender<T>> : std::true_type {};
@@ -2901,13 +2907,6 @@ template <typename Char, typename... Args> class basic_format_string {
 template <typename... T>
 using format_string = basic_format_string<char, type_identity_t<T>...>;
 
-// Longer aliases for C++20 compatibility.
-template <typename OutputIt, typename Char>
-using basic_format_context =
-    conditional_t<std::is_same<OutputIt, appender>::value, context,
-                  generic_context<OutputIt, Char>>;
-using format_context = context;
-
 template <typename T, typename Char = char>
 using is_formattable = bool_constant<
     !std::is_base_of<detail::unformattable,