diff --git a/include/fmt/chrono.h b/include/fmt/chrono.h index 1ea9ad62..a5e1ac92 100644 --- a/include/fmt/chrono.h +++ b/include/fmt/chrono.h @@ -764,13 +764,15 @@ inline std::chrono::duration get_milliseconds( template OutputIt format_duration_value(OutputIt out, Rep val, int precision) { - const Char pr_f[] = {'{', ':', '.', '{', '}', 'f', '}', 0}; - if (precision >= 0) return format_to(out, pr_f, val, precision); - const Char fp_f[] = {'{', ':', 'g', '}', 0}; - const Char format[] = {'{', '}', 0}; - return format_to(out, std::is_floating_point::value ? fp_f : format, - val); + if (precision >= 0) + return format_to(out, FMT_STRING("{:.{}f}"), val, precision); + if (std::is_floating_point::value) { + return format_to(out, FMT_STRING("{:g}"), val); + } else { + return format_to(out, FMT_STRING("{}"), val); + } } + template OutputIt copy_unit(string_view unit, OutputIt out, Char) { return std::copy(unit.begin(), unit.end(), out); @@ -788,10 +790,9 @@ template OutputIt format_duration_unit(OutputIt out) { if (const char* unit = get_units()) return copy_unit(string_view(unit), out, Char()); - const Char num_f[] = {'[', '{', '}', ']', 's', 0}; - if (const_check(Period::den == 1)) return format_to(out, num_f, Period::num); - const Char num_def_f[] = {'[', '{', '}', '/', '{', '}', ']', 's', 0}; - return format_to(out, num_def_f, Period::num, Period::den); + if (const_check(Period::den == 1)) + return format_to(out, FMT_STRING("[{}]s"), Period::num); + return format_to(out, FMT_STRING("[{}/{}]s"), Period::num, Period::den); } template vformat( */ template > inline std::basic_string format(const text_style& ts, const S& format_str, - const Args&... args) { + Args&&... args) { return vformat(ts, to_string_view(format_str), fmt::make_args_checked(format_str, args...)); } diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index 9046de91..d1f5f395 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h @@ -145,8 +145,8 @@ FMT_FUNC void format_error_code(detail::buffer& out, int error_code, error_code_size += detail::to_unsigned(detail::count_digits(abs_value)); auto it = buffer_appender(out); if (message.size() <= inline_buffer_size - error_code_size) - format_to(it, "{}{}", message, SEP); - format_to(it, "{}{}", ERROR_STR, error_code); + format_to(it, FMT_STRING("{}{}"), message, SEP); + format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); assert(out.size() <= inline_buffer_size); } @@ -2662,14 +2662,15 @@ template <> struct formatter { for (auto i = n.bigits_.size(); i > 0; --i) { auto value = n.bigits_[i - 1u]; if (first) { - out = format_to(out, "{:x}", value); + out = format_to(out, FMT_STRING("{:x}"), value); first = false; continue; } - out = format_to(out, "{:08x}", value); + out = format_to(out, FMT_STRING("{:08x}"), value); } if (n.exp_ > 0) - out = format_to(out, "p{}", n.exp_ * detail::bigint::bigit_bits); + out = format_to(out, FMT_STRING("p{}"), + n.exp_ * detail::bigint::bigit_bits); return out; } }; @@ -2715,8 +2716,8 @@ FMT_FUNC void format_system_error(detail::buffer& out, int error_code, int result = detail::safe_strerror(error_code, system_message, buf.size()); if (result == 0) { - format_to(detail::buffer_appender(out), "{}: {}", message, - system_message); + format_to(detail::buffer_appender(out), FMT_STRING("{}: {}"), + message, system_message); return; } if (result != ERANGE)