mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-19 11:14:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage with std::generator (#4057)

Browse Source 
Fixes #4053
This commit is contained in:
Justin Riddell 2024-07-09 16:46:34 +01:00 committed by GitHub
parent ccea338070
commit e60ff504ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/ranges.h
View File

@ -490,7 +490,7 @@ struct range_formatter<
auto out = ctx.out(); auto out = ctx.out();
auto it = detail::range_begin(range); auto it = detail::range_begin(range);
auto end = detail::range_end(range); auto end = detail::range_end(range);
if (is_debug) return write_debug_string(out, it, end); if (is_debug) return write_debug_string(out, std::move(it), end);
out = detail::copy<Char>(opening_bracket_, out); out = detail::copy<Char>(opening_bracket_, out);
int i = 0; int i = 0;

32
test/ranges-test.cc
View File

@ -752,17 +752,17 @@ TEST(ranges_test, std_istream_iterator_join) {
EXPECT_EQ("1, 2, 3, 4, 5", fmt::format("{}", fmt::join(first, last, ", "))); EXPECT_EQ("1, 2, 3, 4, 5", fmt::format("{}", fmt::join(first, last, ", ")));
} }
TEST(ranges_test, movable_only_istream_iter_join) { // Mirrors C++20 std::ranges::basic_istream_view::iterator.
// Mirrors C++20 std::ranges::basic_istream_view::iterator. struct noncopyable_istream_iterator : std::istream_iterator<int> {
struct noncopyable_istream_iterator : std::istream_iterator<int> { using base = std::istream_iterator<int>;
explicit noncopyable_istream_iterator(std::istringstream& iss) explicit noncopyable_istream_iterator(std::istringstream& iss) : base{iss} {}
: std::istream_iterator<int>{iss} {} noncopyable_istream_iterator(const noncopyable_istream_iterator&) = delete;
noncopyable_istream_iterator(const noncopyable_istream_iterator&) = delete; noncopyable_istream_iterator(noncopyable_istream_iterator&&) = default;
noncopyable_istream_iterator(noncopyable_istream_iterator&&) = default; };
}; static_assert(!std::is_copy_constructible<noncopyable_istream_iterator>::value,
static_assert( "");
!std::is_copy_constructible<noncopyable_istream_iterator>::value, "");
TEST(ranges_test, movable_only_istream_iter_join) {
auto&& iss = std::istringstream("1 2 3 4 5"); auto&& iss = std::istringstream("1 2 3 4 5");
auto first = noncopyable_istream_iterator(iss); auto first = noncopyable_istream_iterator(iss);
auto last = std::istream_iterator<int>(); auto last = std::istream_iterator<int>();
@ -770,6 +770,18 @@ TEST(ranges_test, movable_only_istream_iter_join) {
fmt::format("{}", fmt::join(std::move(first), last, ", "))); fmt::format("{}", fmt::join(std::move(first), last, ", ")));
} }
struct movable_iter_range {
std::istringstream iss{"1 2 3 4 5"};
noncopyable_istream_iterator begin() {
return noncopyable_istream_iterator{iss};
}
std::istream_iterator<int> end() { return {}; }
};
TEST(ranges_test, movable_only_istream_iter_join2) {
EXPECT_EQ("[1, 2, 3, 4, 5]", fmt::format("{}", movable_iter_range{}));
}
struct not_range { struct not_range {
void begin() const {} void begin() const {}
void end() const {} void end() const {}