fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 10:47:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify format_to_result

Browse Source
This commit is contained in:
Victor Zverovich
2024-08-29 18:35:42 -07:00
parent a017bba062
commit 6dd9194abd
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/fmt/base.h
View File

@ -2969,11 +2969,6 @@ void check_format_string(S format_str) {
ignore_unused(error); ignore_unused(error);
} }
// Report truncation to prevent silent data loss.
inline void report_truncation(bool truncated) {
if (truncated) report_error("output is truncated");
}
// Use vformat_args and avoid type_identity to keep symbols short. // Use vformat_args and avoid type_identity to keep symbols short.
template <typename Char = char> struct vformat_args { template <typename Char = char> struct vformat_args {
using type = basic_format_args<buffered_context<Char>>; using type = basic_format_args<buffered_context<Char>>;
@ -3145,37 +3140,29 @@ FMT_INLINE auto format_to_n(OutputIt out, size_t n, format_string<T...> fmt,
return vformat_to_n(out, n, fmt, fmt::make_format_args(args...)); return vformat_to_n(out, n, fmt, fmt::make_format_args(args...));
} }
template <typename OutputIt, typename Sentinel = OutputIt>
struct format_to_result { struct format_to_result {
/// Iterator pointing to just after the last successful write in the range. /// Pointer to just after the last successful write in the array.
OutputIt out; char* out;
/// Specifies if the output was truncated. /// Specifies if the output was truncated.
bool truncated; bool truncated;
FMT_CONSTEXPR operator OutputIt&() & { FMT_CONSTEXPR operator char*() const {
detail::report_truncation(truncated); // Report truncation to prevent silent data loss.
if (truncated) report_error("output is truncated");
return out; return out;
} }
FMT_CONSTEXPR operator const OutputIt&() const& {
detail::report_truncation(truncated);
return out;
}
FMT_CONSTEXPR operator OutputIt&&() && {
detail::report_truncation(truncated);
return static_cast<OutputIt&&>(out);
}
}; };
template <size_t N> template <size_t N>
auto vformat_to(char (&out)[N], string_view fmt, format_args args) auto vformat_to(char (&out)[N], string_view fmt, format_args args)
-> format_to_result<char*> { -> format_to_result {
auto result = vformat_to_n(out, N, fmt, args); auto result = vformat_to_n(out, N, fmt, args);
return {result.out, result.size > N}; return {result.out, result.size > N};
} }
template <size_t N, typename... T> template <size_t N, typename... T>
FMT_INLINE auto format_to(char (&out)[N], format_string<T...> fmt, T&&... args) FMT_INLINE auto format_to(char (&out)[N], format_string<T...> fmt, T&&... args)
-> format_to_result<char*> { -> format_to_result {
auto result = fmt::format_to_n(out, N, fmt, static_cast<T&&>(args)...); auto result = fmt::format_to_n(out, N, fmt, static_cast<T&&>(args)...);
return {result.out, result.size > N}; return {result.out, result.size > N};
} }