diff options
-rw-r--r-- | AK/Stream.cpp | 2 | ||||
-rw-r--r-- | AK/Stream.h | 9 | ||||
-rw-r--r-- | Userland/Libraries/LibJS/Print.cpp | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/AK/Stream.cpp b/AK/Stream.cpp index 8ea84d84a7..233224fd6a 100644 --- a/AK/Stream.cpp +++ b/AK/Stream.cpp @@ -98,7 +98,7 @@ ErrorOr<void> Stream::write_until_depleted(ReadonlyBytes buffer) return {}; } -ErrorOr<void> Stream::format_impl(StringView fmtstr, TypeErasedFormatParams& parameters) +ErrorOr<void> Stream::write_formatted_impl(StringView fmtstr, TypeErasedFormatParams& parameters) { StringBuilder builder; TRY(vformat(builder, fmtstr, parameters)); diff --git a/AK/Stream.h b/AK/Stream.h index b821a10ea6..bc2db6f12d 100644 --- a/AK/Stream.h +++ b/AK/Stream.h @@ -77,13 +77,11 @@ public: return write_until_depleted({ &value, sizeof(value) }); } - virtual ErrorOr<void> format_impl(StringView, TypeErasedFormatParams&); - template<typename... Parameters> - ErrorOr<void> format(CheckedFormatString<Parameters...>&& fmtstr, Parameters const&... parameters) + ErrorOr<void> write_formatted(CheckedFormatString<Parameters...>&& fmtstr, Parameters const&... parameters) { VariadicFormatParams<AllowDebugOnlyFormatters::No, Parameters...> variadic_format_params { parameters... }; - TRY(format_impl(fmtstr.view(), variadic_format_params)); + TRY(write_formatted_impl(fmtstr.view(), variadic_format_params)); return {}; } @@ -108,6 +106,9 @@ protected: /// content size to be in order to reduce allocations (does not affect /// actual reading). ErrorOr<ByteBuffer> read_until_eof_impl(size_t block_size, size_t expected_file_size = 0); + +private: + ErrorOr<void> write_formatted_impl(StringView, TypeErasedFormatParams&); }; enum class SeekMode { diff --git a/Userland/Libraries/LibJS/Print.cpp b/Userland/Libraries/LibJS/Print.cpp index c8a50aa778..ae77c6e2d7 100644 --- a/Userland/Libraries/LibJS/Print.cpp +++ b/Userland/Libraries/LibJS/Print.cpp @@ -141,9 +141,9 @@ ErrorOr<void> js_out(JS::PrintContext& print_context, CheckedFormatString<Args.. { if (print_context.strip_ansi) { auto format_string_without_ansi = TRY(strip_ansi(format_string.view())); - TRY(print_context.stream.format(format_string_without_ansi, args...)); + TRY(print_context.stream.write_formatted(format_string_without_ansi, args...)); } else { - TRY(print_context.stream.format(format_string.view(), args...)); + TRY(print_context.stream.write_formatted(format_string.view(), args...)); } return {}; |