Update fmt

Author: Vertexwahn

third_party/fmt/include/fmt/xchar.h

@@ -279,10 +279,18 @@ inline auto vformat_to_n(OutputIt out, size_t n, basic_string_view<Char> fmt,
   return {buf.out(), buf.count()};
 }
 
+template <typename OutputIt, typename... T,
+          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, wchar_t>::value)>
+FMT_INLINE auto format_to_n(OutputIt out, size_t n, wformat_string<T...> fmt,
+                            T&&... args) -> format_to_n_result<OutputIt> {
+  return vformat_to_n(out, n, fmt.get(), fmt::make_wformat_args(args...));
+}
+
 template <typename OutputIt, typename S, typename... T,
           typename Char = detail::format_string_char_t<S>,
-          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value&&
-                            detail::is_exotic_char<Char>::value)>
+          FMT_ENABLE_IF(detail::is_output_iterator<OutputIt, Char>::value &&
+                        !std::is_same<Char, char>::value &&
+                        !std::is_same<Char, wchar_t>::value)>
 inline auto format_to_n(OutputIt out, size_t n, const S& fmt, T&&... args)
     -> format_to_n_result<OutputIt> {
   return vformat_to_n(out, n, fmt::basic_string_view<Char>(fmt),

third_party/fmt/test/xchar-test.cc

@@ -146,6 +146,26 @@ TEST(format_test, wide_format_to_n) {
   EXPECT_EQ(L"BC x", fmt::wstring_view(buffer, 4));
 }
 
+TEST(format_test, wide_format_to_n_runtime) {
+  wchar_t buffer[4];
+  buffer[3] = L'x';
+  auto result = fmt::format_to_n(buffer, 3, fmt::runtime(L"{}"), 12345);
+  EXPECT_EQ(5u, result.size);
+  EXPECT_EQ(buffer + 3, result.out);
+  EXPECT_EQ(L"123x", fmt::wstring_view(buffer, 4));
+  buffer[0] = L'x';
+  buffer[1] = L'x';
+  buffer[2] = L'x';
+  result = fmt::format_to_n(buffer, 3, fmt::runtime(L"{}"), L'A');
+  EXPECT_EQ(1u, result.size);
+  EXPECT_EQ(buffer + 1, result.out);
+  EXPECT_EQ(L"Axxx", fmt::wstring_view(buffer, 4));
+  result = fmt::format_to_n(buffer, 3, fmt::runtime(L"{}{} "), L'B', L'C');
+  EXPECT_EQ(3u, result.size);
+  EXPECT_EQ(buffer + 3, result.out);
+  EXPECT_EQ(L"BC x", fmt::wstring_view(buffer, 4));
+}
+
 TEST(xchar_test, named_arg_udl) {
   using namespace fmt::literals;
   auto udl_a =

third_party/software-bill-of-materials.md

@@ -15,7 +15,7 @@ bazel-toolchain-795d76fd03e0b17c0961f0981a8512a00cba4fa2
 boringssl-fcf70a1a66f4cd000ab9acefb91e3b380fe0984b
 Catch2-ccc49ba66484d881087fdc87fcc68b488c49bca4
 cpuinfo-7607ca500436b37ad23fb8d18614bec7796b68a7
-fmt-4968433a6abecbbf7e72e97188926586a7fd0662
+fmt-ea85b81ccdb28dda636351e80a1888b1d279f325
 gflags-03a4842c9c6aaef438d7bf0c84e8a62c8064992b
 glog-570c7e4e1dd197e9ae2777152b87a5ea9e06bcac
 googletest-f38004c441a2d7ba004853bb0863ff2b2571f461