diff options
author | Bruce Mitchener <bruce.mitchener@gmail.com> | 2024-01-01 09:57:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-01 06:57:03 -0800 |
commit | ebd5c8f99421b1e7e0455b9c10060f38bb613121 (patch) | |
tree | 23623f5fa924214cd187493dfcd51a68b2d50df8 | |
parent | f5ca178c12fa15865332380424d87fcfc061a98c (diff) | |
download | fmtlib-ebd5c8f99421b1e7e0455b9c10060f38bb613121.tar.gz |
Consistently use `fmt::` when invoking `format_to`. (#3779)
This has been done partially in previous commits:
* 2ac6c5ca8b3dfbcb1cc5cf49a8cc121e3984559c
* 258000064d71a7d228d608a2e3d43bde3e32a658
* ba50c19e827383bd5dacb74189fb4852c8dcbdae
* 5ab9d39253b8bcb85a475dc058955b3916f3410a
A patch that includes the `std::error_code` changes here is
upstream in vcpkg, so that will be able to be removed when
updating to the next release.
-rw-r--r-- | include/fmt/chrono.h | 10 | ||||
-rw-r--r-- | include/fmt/compile.h | 3 | ||||
-rw-r--r-- | include/fmt/format-inl.h | 12 | ||||
-rw-r--r-- | include/fmt/format.h | 2 | ||||
-rw-r--r-- | test/xchar-test.cc | 6 |
5 files changed, 17 insertions, 16 deletions
diff --git a/include/fmt/chrono.h b/include/fmt/chrono.h index 30d68dc3..9d54574e 100644 --- a/include/fmt/chrono.h +++ b/include/fmt/chrono.h @@ -1156,11 +1156,11 @@ void write_floating_seconds(memory_buffer& buf, Duration duration, num_fractional_digits = 6; } - format_to(std::back_inserter(buf), FMT_STRING("{:.{}f}"), - std::fmod(val * static_cast<rep>(Duration::period::num) / - static_cast<rep>(Duration::period::den), - static_cast<rep>(60)), - num_fractional_digits); + fmt::format_to(std::back_inserter(buf), FMT_STRING("{:.{}f}"), + std::fmod(val * static_cast<rep>(Duration::period::num) / + static_cast<rep>(Duration::period::den), + static_cast<rep>(60)), + num_fractional_digits); } template <typename OutputIt, typename Char, diff --git a/include/fmt/compile.h b/include/fmt/compile.h index 067cb423..3b3f166e 100644 --- a/include/fmt/compile.h +++ b/include/fmt/compile.h @@ -492,7 +492,8 @@ auto format_to_n(OutputIt out, size_t n, const S& format_str, Args&&... args) -> format_to_n_result<OutputIt> { using traits = detail::fixed_buffer_traits; auto buf = detail::iterator_buffer<OutputIt, char, traits>(out, n); - format_to(std::back_inserter(buf), format_str, std::forward<Args>(args)...); + fmt::format_to(std::back_inserter(buf), format_str, + std::forward<Args>(args)...); return {buf.out(), buf.count()}; } diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index bb40e62c..e9a4ca45 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h @@ -58,8 +58,8 @@ FMT_FUNC void format_error_code(detail::buffer<char>& out, int error_code, error_code_size += detail::to_unsigned(detail::count_digits(abs_value)); auto it = buffer_appender<char>(out); if (message.size() <= inline_buffer_size - error_code_size) - format_to(it, FMT_STRING("{}{}"), message, SEP); - format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); + fmt::format_to(it, FMT_STRING("{}{}"), message, SEP); + fmt::format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); FMT_ASSERT(out.size() <= inline_buffer_size, ""); } @@ -1379,15 +1379,15 @@ template <> struct formatter<detail::bigint> { for (auto i = n.bigits_.size(); i > 0; --i) { auto value = n.bigits_[i - 1u]; if (first) { - out = format_to(out, FMT_STRING("{:x}"), value); + out = fmt::format_to(out, FMT_STRING("{:x}"), value); first = false; continue; } - out = format_to(out, FMT_STRING("{:08x}"), value); + out = fmt::format_to(out, FMT_STRING("{:08x}"), value); } if (n.exp_ > 0) - out = format_to(out, FMT_STRING("p{}"), - n.exp_ * detail::bigint::bigit_bits); + out = fmt::format_to(out, FMT_STRING("p{}"), + n.exp_ * detail::bigint::bigit_bits); return out; } }; diff --git a/include/fmt/format.h b/include/fmt/format.h index 3df1222e..97f0e1fb 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -867,7 +867,7 @@ enum { inline_buffer_size = 500 }; **Example**:: auto out = fmt::memory_buffer(); - format_to(std::back_inserter(out), "The answer is {}.", 42); + fmt::format_to(std::back_inserter(out), "The answer is {}.", 42); This will append the following output to the ``out`` object: diff --git a/test/xchar-test.cc b/test/xchar-test.cc index 14573a29..7f33fb27 100644 --- a/test/xchar-test.cc +++ b/test/xchar-test.cc @@ -587,9 +587,9 @@ template <class charT> struct formatter<std::complex<double>, charT> { fmt::runtime("{:" + specs + "}"), c.imag()); auto fill_align_width = std::string(); if (specs_.width > 0) fill_align_width = fmt::format(">{}", specs_.width); - return format_to(ctx.out(), runtime("{:" + fill_align_width + "}"), - c.real() != 0 ? fmt::format("({}+{}i)", real, imag) - : fmt::format("{}i", imag)); + return fmt::format_to(ctx.out(), runtime("{:" + fill_align_width + "}"), + c.real() != 0 ? fmt::format("({}+{}i)", real, imag) + : fmt::format("{}i", imag)); } }; FMT_END_NAMESPACE |