Cleanup format.h

Author: vitaut

include/fmt/format-inl.h

@@ -75,6 +75,17 @@ template <typename Locale> auto locale_ref::get() const -> Locale {
 
 namespace detail {
 
+using format_func = void (*)(detail::buffer<char>&, int, const char*);
+
+FMT_FUNC void do_report_error(format_func func, int error_code,
+                              const char* message) noexcept {
+  memory_buffer full_message;
+  func(full_message, error_code, message);
+  // Don't use fwrite_all because the latter may throw.
+  if (std::fwrite(full_message.data(), full_message.size(), 1, stderr) > 0)
+    std::fputc('\n', stderr);
+}
+
 FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
                                 string_view message) noexcept {
   // Report error code making sure that the output fits into
@@ -98,15 +109,6 @@ FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code,
   FMT_ASSERT(out.size() <= inline_buffer_size, "");
 }
 
-FMT_FUNC void do_report_error(format_func func, int error_code,
-                              const char* message) noexcept {
-  memory_buffer full_message;
-  func(full_message, error_code, message);
-  // Don't use fwrite_all because the latter may throw.
-  if (std::fwrite(full_message.data(), full_message.size(), 1, stderr) > 0)
-    std::fputc('\n', stderr);
-}
-
 // A wrapper around fwrite that throws on error.
 inline void fwrite_all(const void* ptr, size_t count, FILE* stream) {
   size_t written = std::fwrite(ptr, 1, count, stream);

include/fmt/format.h

@@ -3805,13 +3805,6 @@ template <typename Char = char> struct format_handler {
   FMT_NORETURN void on_error(const char* message) { report_error(message); }
 };
 
-using format_func = void (*)(detail::buffer<char>&, int, const char*);
-FMT_API void do_report_error(format_func func, int error_code,
-                             const char* message) noexcept;
-
-FMT_API void format_error_code(buffer<char>& out, int error_code,
-                               string_view message) noexcept;
-
 template <typename T, typename Char, type TYPE>
 template <typename FormatContext>
 FMT_CONSTEXPR auto native_formatter<T, Char, TYPE>::format(