From 1e0c6cdc3ba05fe740860ded5e92ee33792c3f11 Mon Sep 17 00:00:00 2001
From: Victor Zverovich <viz@meta.com>
Date: Tue, 3 Sep 2024 20:44:37 -0700
Subject: [PATCH] Make symbol sizes shorter

---
 include/fmt/base.h | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/include/fmt/base.h b/include/fmt/base.h
index 4c00d729..6dd9dda0 100644
--- a/include/fmt/base.h
+++ b/include/fmt/base.h
@@ -2759,30 +2759,31 @@ template <typename Char = char> struct runtime_format_string {
 inline auto runtime(string_view s) -> runtime_format_string<> { return {{s}}; }
 
 /// A compile-time format string.
-template <typename Char, typename... Args> class basic_format_string {
+template <typename Char, typename... T> class fstring {
  private:
   basic_string_view<Char> str_;
 
   static constexpr int num_static_named_args =
-      detail::count_static_named_args<Args...>();
+      detail::count_static_named_args<T...>();
 
   using checker = detail::format_string_checker<
-      Char, static_cast<int>(sizeof...(Args)), num_static_named_args,
-      num_static_named_args != detail::count_named_args<Args...>()>;
+      Char, static_cast<int>(sizeof...(T)), num_static_named_args,
+      num_static_named_args != detail::count_named_args<T...>()>;
 
-  using arg_pack = detail::arg_pack<Args...>;
+  using arg_pack = detail::arg_pack<T...>;
 
  public:
-  // Reports a compile-time error if S is not a valid format string for Args.
+  using t = fstring;
+
+  // Reports a compile-time error if S is not a valid format string for T.
   template <typename S,
             FMT_ENABLE_IF(
                 std::is_convertible<const S&, basic_string_view<Char>>::value)>
-  FMT_CONSTEVAL FMT_ALWAYS_INLINE basic_format_string(const S& s) : str_(s) {
+  FMT_CONSTEVAL FMT_ALWAYS_INLINE fstring(const S& s) : str_(s) {
     using namespace detail;
-    static_assert(
-        count<(std::is_base_of<view, remove_reference_t<Args>>::value &&
-               std::is_reference<Args>::value)...>() == 0,
-        "passing views as lvalues is disallowed");
+    static_assert(count<(std::is_base_of<view, remove_reference_t<T>>::value &&
+                         std::is_reference<T>::value)...>() == 0,
+                  "passing views as lvalues is disallowed");
     if (FMT_USE_CONSTEVAL) parse_format_string<Char>(s, checker(s, arg_pack()));
 #ifdef FMT_ENFORCE_COMPILE_STRING
     static_assert(
@@ -2793,20 +2794,22 @@ template <typename Char, typename... Args> class basic_format_string {
   template <typename S,
             FMT_ENABLE_IF(std::is_base_of<detail::compile_string, S>::value&&
                               std::is_same<typename S::char_type, Char>::value)>
-  FMT_ALWAYS_INLINE basic_format_string(const S& s) : str_(s) {
+  FMT_ALWAYS_INLINE fstring(const S& s) : str_(s) {
     FMT_CONSTEXPR auto fmt = basic_string_view<Char>(S());
     FMT_CONSTEXPR int ignore =
         (parse_format_string(fmt, checker(fmt, arg_pack())), 0);
     detail::ignore_unused(ignore);
   }
-  basic_format_string(runtime_format_string<Char> fmt) : str_(fmt.str) {}
+  fstring(runtime_format_string<Char> fmt) : str_(fmt.str) {}
 
   FMT_ALWAYS_INLINE operator basic_string_view<Char>() const { return str_; }
   auto get() const -> basic_string_view<Char> { return str_; }
 };
 
-template <typename... T>
-using format_string = basic_format_string<char, type_identity_t<T>...>;
+template <typename Char, typename... T>
+using basic_format_string = typename fstring<Char, T...>::t;
+
+template <typename... T> using format_string = typename fstring<char, T...>::t;
 
 template <typename T, typename Char = char>
 using is_formattable = bool_constant<