feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Cleanup ranges

Browse Source
This commit is contained in:
Victor Zverovich
2024-01-06 19:37:14 -08:00
parent ae9b0b521b
commit 7d73ef85f7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/ranges.h
View File

@@ -342,7 +342,7 @@ struct formatter<Tuple, Char,
FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) {
auto it = ctx.begin(); auto it = ctx.begin();
if (it != ctx.end() && *it != '}') if (it != ctx.end() && *it != '}')
FMT_THROW(format_error("invalid format specifier")); throw_format_error("invalid format specifier");
detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx}); detail::for_each(formatters_, detail::parse_empty_specs<ParseContext>{ctx});
return it; return it;
} }
@@ -451,7 +451,7 @@ struct range_formatter<
} }
if (it != end && *it != '}') { if (it != end && *it != '}') {
if (*it != ':') FMT_THROW(format_error("invalid format specifier")); if (*it != ':') throw_format_error("invalid format specifier");
++it; ++it;
} else { } else {
detail::maybe_set_debug_format(underlying_, true); detail::maybe_set_debug_format(underlying_, true);
@@ -631,7 +631,7 @@ auto join(It begin, Sentinel end, string_view sep) -> join_view<It, Sentinel> {
*/ */
template <typename Range> template <typename Range>
auto join(Range&& range, string_view sep) auto join(Range&& range, string_view sep)
-> join_view<detail::iterator_t<Range>, detail::sentinel_t<Range>> { -> join_view<decltype(std::begin(range)), decltype(std::end(range))> {
return join(std::begin(range), std::end(range), sep); return join(std::begin(range), std::end(range), sep);
} }
@@ -684,7 +684,7 @@ struct formatter<tuple_join_view<Char, T...>, Char> {
if (N > 1) { if (N > 1) {
auto end1 = do_parse(ctx, std::integral_constant<size_t, N - 1>()); auto end1 = do_parse(ctx, std::integral_constant<size_t, N - 1>());
if (end != end1) if (end != end1)
FMT_THROW(format_error("incompatible format specs for tuple elements")); throw_format_error("incompatible format specs for tuple elements");
} }
#endif #endif
return end; return end;