External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't change the parameter of vprint

Browse Source
This commit is contained in:
NukoOoOoOoO 2023-04-09 09:40:48 +08:00
parent a19700aba6
commit 9fc5f274a6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/color.h
View File

@ -460,11 +460,10 @@ void vformat_to(buffer<Char>& buf, const text_style& ts,
FMT_END_DETAIL_NAMESPACE FMT_END_DETAIL_NAMESPACE
inline void vprint(std::FILE* f, const text_style& ts, string_view fmt, inline void vprint(std::FILE* f, const text_style& ts, string_view fmt,
bool new_line, format_args args) { format_args args) {
// Legacy wide streams are not supported. // Legacy wide streams are not supported.
auto buf = memory_buffer(); auto buf = memory_buffer();
detail::vformat_to(buf, ts, fmt, args); detail::vformat_to(buf, ts, fmt, args);
if (new_line) buf.push_back('\n');
if (detail::is_utf8()) { if (detail::is_utf8()) {
detail::print(f, string_view(buf.begin(), buf.size())); detail::print(f, string_view(buf.begin(), buf.size()));
return; return;
@ -490,7 +489,7 @@ template <typename S, typename... Args,
FMT_ENABLE_IF(detail::is_string<S>::value)> FMT_ENABLE_IF(detail::is_string<S>::value)>
void print(std::FILE* f, const text_style& ts, const S& format_str, void print(std::FILE* f, const text_style& ts, const S& format_str,
const Args&... args) { const Args&... args) {
vprint(f, ts, format_str, false, vprint(f, ts, format_str,
fmt::make_format_args<buffer_context<char_t<S>>>(args...)); fmt::make_format_args<buffer_context<char_t<S>>>(args...));
} }
@ -509,8 +508,7 @@ template <typename S, typename... Args,
FMT_ENABLE_IF(detail::is_string<S>::value)> FMT_ENABLE_IF(detail::is_string<S>::value)>
void println(std::FILE* f, const text_style& ts, const S& format_str, void println(std::FILE* f, const text_style& ts, const S& format_str,
const Args&... args) { const Args&... args) {
vprint(f, ts, format_str, true, print(f, ts, "{}\n", fmt::format(format_str, std::forward<Args>(args)...));
fmt::make_format_args<buffer_context<char_t<S>>>(args...));
} }
/** /**

2
test/color-test.cc
View File

@ -70,5 +70,5 @@ TEST(color_test, print) {
EXPECT_WRITE(stdout, fmt::print(fg(fmt::rgb(255, 20, 30)), "rgb(255,20,30)"), EXPECT_WRITE(stdout, fmt::print(fg(fmt::rgb(255, 20, 30)), "rgb(255,20,30)"),
"\x1b[38;2;255;020;030mrgb(255,20,30)\x1b[0m"); "\x1b[38;2;255;020;030mrgb(255,20,30)\x1b[0m");
EXPECT_WRITE(stdout, fmt::println(fg(fmt::rgb(255, 20, 30)), "rgb(255,20,30)"), EXPECT_WRITE(stdout, fmt::println(fg(fmt::rgb(255, 20, 30)), "rgb(255,20,30)"),
"\x1b[38;2;255;020;030mrgb(255,20,30)\x1b[0m\n"); "\x1b[38;2;255;020;030mrgb(255,20,30)\n\x1b[0m");
} }