[libcxx-commits] [libcxx] [libc++][test] Fix assumptions that `std::array` iterators are pointers (PR #74430)
Stephan T. Lavavej via libcxx-commits
libcxx-commits at lists.llvm.org
Tue Dec 5 00:05:42 PST 2023
https://github.com/StephanTLavavej updated https://github.com/llvm/llvm-project/pull/74430
>From 9242320ce601da4125d9dee6dee5afe17be9ca33 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl at nuwen.net>
Date: Sat, 2 Dec 2023 22:14:17 -0800
Subject: [PATCH 1/7] Fix errors caused by throw_operator_minus assuming that
array iterators are pointers.
The error was pretty complicated, caused by the concepts machinery noticing that value_type and element_type were inconsistent:
D:\GitHub\STL\llvm-project\libcxx\test\std\containers\views\views.span\span.cons\iterator_sentinel.pass.cpp(128,8): error: no matching constructor for initialization of 'std::span<int>'
(std::span<int>{throw_operator_minus{a.begin()}, throw_operator_minus{a.end()}}));
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
D:\GitHub\STL\llvm-project\libcxx\test\support\assert_macros.h(129,27): note: expanded from macro 'TEST_VALIDATE_EXCEPTION'
static_cast<void>(EXPR); \
^~~~
D:\GitHub\STL\out\x64\out\inc\span(328,51): note: candidate constructor template not viable: no known conversion from 'throw_operator_minus<_Array_iterator<int, 1>>' (aka 'throw_operator_minus<std::_Array_iterator<int, 1>>') to 'size_type' (aka 'unsigned long long') for 2nd argument
constexpr explicit(_Extent != dynamic_extent) span(_It _First, size_type _Count) noexcept // strengthened
^
D:\GitHub\STL\out\x64\out\inc\span(339,51): note: candidate template ignored: constraints not satisfied [with _It = throw_operator_minus<_Array_iterator<int, 1>>, _Sentinel = throw_operator_minus<_Array_iterator<int, 1>>]
constexpr explicit(_Extent != dynamic_extent) span(_It _First, _Sentinel _Last)
^
D:\GitHub\STL\out\x64\out\inc\span(338,15): note: because '_Span_compatible_iterator<throw_operator_minus<std::_Array_iterator<int, 1> >, element_type>' evaluated to false
template <_Span_compatible_iterator<element_type> _It, _Span_compatible_sentinel<_It> _Sentinel>
^
D:\GitHub\STL\out\x64\out\inc\span(243,37): note: because 'throw_operator_minus<std::_Array_iterator<int, 1>>' does not satisfy 'contiguous_iterator'
concept _Span_compatible_iterator = contiguous_iterator<_It>
^
D:\GitHub\STL\out\x64\out\inc\xutility(815,31): note: because 'throw_operator_minus<std::_Array_iterator<int, 1>>' does not satisfy 'random_access_iterator'
concept contiguous_iterator = random_access_iterator<_It>
^
D:\GitHub\STL\out\x64\out\inc\xutility(803,34): note: because 'throw_operator_minus<std::_Array_iterator<int, 1>>' does not satisfy 'bidirectional_iterator'
concept random_access_iterator = bidirectional_iterator<_It>
^
D:\GitHub\STL\out\x64\out\inc\xutility(796,34): note: because 'throw_operator_minus<std::_Array_iterator<int, 1>>' does not satisfy 'forward_iterator'
concept bidirectional_iterator = forward_iterator<_It> && derived_from<_Iter_concept<_It>, bidirectional_iterator_tag>
^
D:\GitHub\STL\out\x64\out\inc\xutility(792,28): note: because 'throw_operator_minus<std::_Array_iterator<int, 1>>' does not satisfy 'input_iterator'
concept forward_iterator = input_iterator<_It> && derived_from<_Iter_concept<_It>, forward_iterator_tag>
^
D:\GitHub\STL\out\x64\out\inc\xutility(781,59): note: because 'throw_operator_minus<std::_Array_iterator<int, 1>>' does not satisfy 'indirectly_readable'
concept input_iterator = input_or_output_iterator<_It> && indirectly_readable<_It>
^
D:\GitHub\STL\out\x64\out\inc\xutility(694,31): note: because 'remove_cvref_t<throw_operator_minus<_Array_iterator<int, 1>>>' (aka 'throw_operator_minus<std::_Array_iterator<int, 1>>') does not satisfy '_Indirectly_readable_impl'
concept indirectly_readable = _Indirectly_readable_impl<remove_cvref_t<_It>>;
^
D:\GitHub\STL\out\x64\out\inc\__msvc_iter_core.hpp(163,1): note: because 'typename iter_value_t<_It>' would be invalid: no type named 'value_type' in 'std::indirectly_readable_traits<throw_operator_minus<std::_Array_iterator<int, 1>>>'
using iter_value_t = conditional_t<_Is_from_primary<iterator_traits<remove_cvref_t<_Ty>>>,
^
D:\GitHub\STL\out\x64\out\inc\span(353,15): note: candidate constructor template not viable: requires single argument '_Arr', but 2 arguments were provided
constexpr span(type_identity_t<element_type> (&_Arr)[_Size]) noexcept : _Mybase(_Arr, _Size) {}
^
D:\GitHub\STL\out\x64\out\inc\span(358,15): note: candidate constructor template not viable: requires single argument '_Arr', but 2 arguments were provided
constexpr span(array<_OtherTy, _Size>& _Arr) noexcept : _Mybase(_Arr.data(), _Size) {}
^
D:\GitHub\STL\out\x64\out\inc\span(363,15): note: candidate constructor template not viable: requires single argument '_Arr', but 2 arguments were provided
constexpr span(const array<_OtherTy, _Size>& _Arr) noexcept : _Mybase(_Arr.data(), _Size) {}
^
D:\GitHub\STL\out\x64\out\inc\span(366,51): note: candidate constructor template not viable: requires single argument '_Range', but 2 arguments were provided
constexpr explicit(_Extent != dynamic_extent) span(_Rng&& _Range)
^
D:\GitHub\STL\out\x64\out\inc\span(380,5): note: candidate constructor template not viable: requires single argument '_Other', but 2 arguments were provided
span(const span<_OtherTy, _OtherExtent>& _Other) noexcept
^
D:\GitHub\STL\out\x64\out\inc\span(297,7): note: candidate constructor (the implicit copy constructor) not viable: requires 1 argument, but 2 were provided
class span : private _Span_extent_type<_Ty, _Extent> {
^
D:\GitHub\STL\out\x64\out\inc\span(297,7): note: candidate constructor (the implicit move constructor) not viable: requires 1 argument, but 2 were provided
D:\GitHub\STL\out\x64\out\inc\span(325,15): note: candidate constructor not viable: requires 0 arguments, but 2 were provided
constexpr span() noexcept requires (_Extent == 0 || _Extent == dynamic_extent) = default;
^
---
.../views/views.span/span.cons/iterator_sentinel.pass.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libcxx/test/std/containers/views/views.span/span.cons/iterator_sentinel.pass.cpp b/libcxx/test/std/containers/views/views.span/span.cons/iterator_sentinel.pass.cpp
index 4e1db3df5b83b..73b13ccc34cf8 100644
--- a/libcxx/test/std/containers/views/views.span/span.cons/iterator_sentinel.pass.cpp
+++ b/libcxx/test/std/containers/views/views.span/span.cons/iterator_sentinel.pass.cpp
@@ -71,7 +71,7 @@ class throw_operator_minus {
typedef typename std::iterator_traits<It>::difference_type difference_type;
typedef It pointer;
typedef typename std::iterator_traits<It>::reference reference;
- typedef typename std::remove_pointer<It>::type element_type;
+ typedef std::remove_reference_t<reference> element_type;
throw_operator_minus() : it_() {}
explicit throw_operator_minus(It it) : it_(it) {}
>From 6ee0fd9fcf5e94e0d36a7cf053ba0be1b414f15f Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl at nuwen.net>
Date: Sun, 3 Dec 2023 02:04:19 -0800
Subject: [PATCH 2/7] Fix from_range tests assuming that array iterators are
pointers.
wrap_input() is called with Iter types that are constructible from raw pointers. It's also sometimes called with an `array` as the `input`, so the first overload was implicitly assuming that array iterators are pointers.
We can fix this assumption by providing a dedicated overload for `array`, just like the one for `vector` immediately below.
Finally, from_range_helpers.h should explicitly include both `<array>` and `<vector>`, even though they were apparently being dragged in already.
---
libcxx/test/std/containers/from_range_helpers.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/libcxx/test/std/containers/from_range_helpers.h b/libcxx/test/std/containers/from_range_helpers.h
index 7fff99da1e15e..e17ea247618bc 100644
--- a/libcxx/test/std/containers/from_range_helpers.h
+++ b/libcxx/test/std/containers/from_range_helpers.h
@@ -9,9 +9,11 @@
#ifndef SUPPORT_FROM_RANGE_HELPERS_H
#define SUPPORT_FROM_RANGE_HELPERS_H
+#include <array>
#include <cstddef>
#include <iterator>
#include <type_traits>
+#include <vector>
#include "min_allocator.h"
#include "test_allocator.h"
@@ -34,6 +36,13 @@ constexpr auto wrap_input(Range&& input) {
return std::ranges::subrange(std::move(b), std::move(e));
}
+template <class Iter, class Sent, class T, std::size_t N>
+constexpr auto wrap_input(std::array<T, N>& input) {
+ auto b = Iter(input.data());
+ auto e = Sent(Iter(input.data() + input.size()));
+ return std::ranges::subrange(std::move(b), std::move(e));
+}
+
template <class Iter, class Sent, class T>
constexpr auto wrap_input(std::vector<T>& input) {
auto b = Iter(input.data());
>From 1637e0efe0c65ac4e7e54cf1ea0e059da6b04ee7 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl at nuwen.net>
Date: Mon, 4 Dec 2023 21:03:37 -0800
Subject: [PATCH 3/7] Fix alg.three.way tests assuming that array iterators are
pointers.
This is called immediately below with arrays and pointer types.
---
.../alg.three.way/lexicographical_compare_three_way.pass.cpp | 2 +-
.../lexicographical_compare_three_way_comp.pass.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way.pass.cpp
index 0bd1d74529530..17db46edfb218 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way.pass.cpp
@@ -28,7 +28,7 @@
template <typename Iter1, typename Iter2, typename C1, typename C2, typename Order>
constexpr void test_lexicographical_compare(C1 a, C2 b, Order expected) {
std::same_as<Order> decltype(auto) result =
- std::lexicographical_compare_three_way(Iter1{a.begin()}, Iter1{a.end()}, Iter2{b.begin()}, Iter2{b.end()});
+ std::lexicographical_compare_three_way(Iter1{a.data()}, Iter1{a.data() + a.size()}, Iter2{b.data()}, Iter2{b.data() + b.size()});
assert(expected == result);
}
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way_comp.pass.cpp
index d3c2814d642a7..1f8b18737ada8 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way_comp.pass.cpp
@@ -57,7 +57,7 @@ static_assert(has_lexicographical_compare<decltype(compare_int_result)>);
template <typename Iter1, typename Iter2, typename C1, typename C2, typename Order, typename Comparator>
constexpr void test_lexicographical_compare(C1 a, C2 b, Comparator comp, Order expected) {
std::same_as<Order> decltype(auto) result =
- std::lexicographical_compare_three_way(Iter1{a.begin()}, Iter1{a.end()}, Iter2{b.begin()}, Iter2{b.end()}, comp);
+ std::lexicographical_compare_three_way(Iter1{a.data()}, Iter1{a.data() + a.size()}, Iter2{b.data()}, Iter2{b.data() + b.size()}, comp);
assert(expected == result);
}
>From 5b26d844f1c7a3494f5214aed3741c1840da661f Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl at nuwen.net>
Date: Mon, 4 Dec 2023 21:08:29 -0800
Subject: [PATCH 4/7] Fix range.chunk.by.iter tests assuming that array
iterators are pointers.
---
.../range.chunk.by.iter/compare.pass.cpp | 12 ++--
.../range.chunk.by.iter/decrement.pass.cpp | 60 +++++++++----------
.../range.chunk.by.iter/deref.pass.cpp | 2 +-
.../range.chunk.by.iter/increment.pass.cpp | 50 ++++++++--------
4 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/compare.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/compare.pass.cpp
index 38b6346e0061f..a3a51c79ccd12 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/compare.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/compare.pass.cpp
@@ -31,15 +31,15 @@ constexpr void test() {
using ChunkByView = std::ranges::chunk_by_view<Underlying, std::ranges::less_equal>;
using ChunkByIterator = std::ranges::iterator_t<ChunkByView>;
- auto make_chunk_by_view = [](auto begin, auto end) {
- View view{Iterator(begin), Sentinel(Iterator(end))};
+ auto make_chunk_by_view = [](auto& arr) {
+ View view{Iterator(arr.data()), Sentinel(Iterator(arr.data() + arr.size()))};
return ChunkByView(std::move(view), std::ranges::less_equal{});
};
// Test operator==
{
std::array array{0, 1, 2};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator i = view.begin();
ChunkByIterator j = view.begin();
@@ -52,7 +52,7 @@ constexpr void test() {
// Test synthesized operator!=
{
std::array array{0, 1, 2};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator i = view.begin();
ChunkByIterator j = view.begin();
@@ -65,7 +65,7 @@ constexpr void test() {
// Test operator== with std::default_sentinel_t
{
std::array array{0, 1, 2};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator i = view.begin();
std::same_as<bool> decltype(auto) result = (i == std::default_sentinel);
@@ -77,7 +77,7 @@ constexpr void test() {
// Test synthesized operator!= with std::default_sentinel_t
{
std::array array{0, 1, 2};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator i = view.begin();
std::same_as<bool> decltype(auto) result = (i != std::default_sentinel);
diff --git a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/decrement.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/decrement.pass.cpp
index 167f3f753bfae..a331c794c8815 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/decrement.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/decrement.pass.cpp
@@ -51,107 +51,107 @@ constexpr void test() {
static_assert(HasPostDecrement<ChunkByIterator>);
static_assert(HasPreDecrement<ChunkByIterator>);
- auto make_chunk_by_view = [](auto begin, auto end) {
- View view{Iterator{begin}, Sentinel{Iterator{end}}};
+ auto make_chunk_by_view = [](auto& arr) {
+ View view{Iterator{arr.data()}, Sentinel{Iterator{arr.data() + arr.size()}}};
return ChunkByView{std::move(view), std::ranges::less_equal{}};
};
// Test with a single chunk
{
std::array array{0, 1, 2, 3, 4};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator it = std::ranges::next(view.begin(), view.end());
std::same_as<ChunkByIterator&> decltype(auto) result = --it;
assert(&result == &it);
- assert(base((*result).begin()) == array.begin());
+ assert(base((*result).begin()) == array.data());
}
// Test with two chunks
{
std::array array{0, 1, 2, 0, 1, 2};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator it = std::ranges::next(view.begin(), view.end());
std::same_as<ChunkByIterator&> decltype(auto) result = --it;
assert(&result == &it);
- assert(base((*result).begin()) == array.begin() + 3);
+ assert(base((*result).begin()) == array.data() + 3);
--it;
- assert(base((*result).begin()) == array.begin());
+ assert(base((*result).begin()) == array.data());
}
// Test going forward and then backward on the same iterator
{
std::array array{7, 8, 9, 4, 5, 6, 1, 2, 3, 0};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator it = view.begin();
++it;
--it;
- assert(base((*it).begin()) == array.begin());
- assert(base((*it).end()) == array.begin() + 3);
+ assert(base((*it).begin()) == array.data());
+ assert(base((*it).end()) == array.data() + 3);
++it;
++it;
--it;
- assert(base((*it).begin()) == array.begin() + 3);
- assert(base((*it).end()) == array.begin() + 6);
+ assert(base((*it).begin()) == array.data() + 3);
+ assert(base((*it).end()) == array.data() + 6);
++it;
++it;
--it;
- assert(base((*it).begin()) == array.begin() + 6);
- assert(base((*it).end()) == array.begin() + 9);
+ assert(base((*it).begin()) == array.data() + 6);
+ assert(base((*it).end()) == array.data() + 9);
++it;
++it;
--it;
- assert(base((*it).begin()) == array.begin() + 9);
+ assert(base((*it).begin()) == array.data() + 9);
}
// Decrement an iterator multiple times
if constexpr (std::ranges::common_range<Underlying>) {
std::array array{1, 2, 1, 2, 1};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator it = view.end();
--it;
--it;
--it;
- assert(base((*it).begin()) == array.begin());
+ assert(base((*it).begin()) == array.data());
}
// Test with a predicate that takes by non-const reference
if constexpr (!std::to_underlying(Constant)) {
std::array array{1, 2, 3, -3, -2, -1};
- View v{Iterator{array.begin()}, Sentinel{Iterator{array.end()}}};
+ View v{Iterator{array.data()}, Sentinel{Iterator{array.data() + array.size()}}};
auto view = std::views::chunk_by(std::move(v), [](int& x, int& y) { return x <= y; });
auto it = std::ranges::next(view.begin());
- assert(base((*it).begin()) == array.begin() + 3);
+ assert(base((*it).begin()) == array.data() + 3);
--it;
- assert(base((*it).begin()) == array.begin());
+ assert(base((*it).begin()) == array.data());
}
// Test with a predicate that is invocable but not callable (i.e. cannot be called like regular function 'f()')
{
std::array array = {1, 2, 3, -3, -2, -1};
- auto v = View{Iterator{array.begin()}, Sentinel{Iterator{array.end()}}}
+ auto v = View{Iterator{array.data()}, Sentinel{Iterator{array.data() + array.size()}}}
| std::views::transform([](int x) { return IntWrapper{x}; });
auto view = std::views::chunk_by(std::move(v), &IntWrapper::lessEqual);
auto it = std::ranges::next(view.begin());
- assert(base((*it).begin().base()) == array.begin() + 3);
+ assert(base((*it).begin().base()) == array.data() + 3);
--it;
- assert(base((*it).begin().base()) == array.begin());
+ assert(base((*it).begin().base()) == array.data());
}
// Make sure we do not make a copy of the predicate when we decrement
if constexpr (std::ranges::common_range<Underlying>) {
bool moved = false, copied = false;
std::array array{1, 2, 1, 3};
- View v{Iterator(array.begin()), Sentinel(Iterator(array.end()))};
+ View v{Iterator(array.data()), Sentinel(Iterator(array.data() + array.size()))};
auto view = std::views::chunk_by(std::move(v), TrackingPred(&moved, &copied));
assert(std::exchange(moved, false));
auto it = view.end();
@@ -164,21 +164,21 @@ constexpr void test() {
// Check post-decrement
{
std::array array{0, 1, 2, -3, -2, -1, -6, -5, -4};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator it = std::ranges::next(view.begin(), view.end());
std::same_as<ChunkByIterator> decltype(auto) result = it--;
assert(result != it);
assert(result == std::default_sentinel);
- assert(base((*it).begin()) == array.begin() + 6);
+ assert(base((*it).begin()) == array.data() + 6);
result = it--;
- assert(base((*it).begin()) == array.begin() + 3);
- assert(base((*result).begin()) == array.begin() + 6);
+ assert(base((*it).begin()) == array.data() + 3);
+ assert(base((*result).begin()) == array.data() + 6);
result = it--;
- assert(base((*it).begin()) == array.begin());
- assert(base((*result).begin()) == array.begin() + 3);
+ assert(base((*it).begin()) == array.data());
+ assert(base((*result).begin()) == array.data() + 3);
}
}
diff --git a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/deref.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/deref.pass.cpp
index 3f8c073e7b3b0..8cc9bdac0b1d8 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/deref.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/deref.pass.cpp
@@ -33,7 +33,7 @@ constexpr void test() {
std::array array{0, 1, 2, 3, -1, 0, 1, 2, -2, 3, 4, 5};
std::array expected{std::array{0, 1, 2, 3}, std::array{-1, 0, 1, 2}, std::array{-2, 3, 4, 5}};
- Underlying underlying{Iter{array.begin()}, Sent{Iter{array.end()}}};
+ Underlying underlying{Iter{array.data()}, Sent{Iter{array.data() + array.size()}}};
ChunkByView view{underlying, std::ranges::less_equal{}};
size_t idx = 0;
diff --git a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/increment.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/increment.pass.cpp
index 454e9e7503a5b..8a7ff4e385f21 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/increment.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/increment.pass.cpp
@@ -39,15 +39,15 @@ constexpr void test() {
using ChunkByView = std::ranges::chunk_by_view<Underlying, std::ranges::less_equal>;
using ChunkByIterator = std::ranges::iterator_t<ChunkByView>;
- auto make_chunk_by_view = [](auto begin, auto end) {
- View view{Iterator{begin}, Sentinel{Iterator{end}}};
+ auto make_chunk_by_view = [](auto& arr) {
+ View view{Iterator{arr.data()}, Sentinel{Iterator{arr.data() + arr.size()}}};
return ChunkByView{std::move(view), std::ranges::less_equal{}};
};
// Increment the iterator when it won't find another satisfied value after begin()
{
std::array array{0, 1, 2, 3, 4};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator it = view.begin();
std::same_as<ChunkByIterator&> decltype(auto) result = ++it;
@@ -59,8 +59,8 @@ constexpr void test() {
// Increment the iterator and it finds another value after begin()
{
std::array array{1, 2, 3, -1, -2, -3};
- int const* second_chunk = array.begin() + 3;
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ int const* second_chunk = array.data() + 3;
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator it = view.begin();
++it;
@@ -70,26 +70,26 @@ constexpr void test() {
// Increment advances all the way to the end of the range
{
std::array array{1, 2, 3, 4, 1};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator it = view.begin();
++it;
- assert(base((*it).begin()) == array.begin() + 4);
+ assert(base((*it).begin()) == array.data() + 4);
}
// Increment an iterator multiple times
{
std::array array{0, 1, 0, 2, 0, 3, 0, 4};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator it = view.begin();
- assert(base((*it).begin()) == array.begin());
+ assert(base((*it).begin()) == array.data());
++it;
- assert(base((*it).begin()) == array.begin() + 2);
+ assert(base((*it).begin()) == array.data() + 2);
++it;
- assert(base((*it).begin()) == array.begin() + 4);
+ assert(base((*it).begin()) == array.data() + 4);
++it;
- assert(base((*it).begin()) == array.begin() + 6);
+ assert(base((*it).begin()) == array.data() + 6);
++it;
assert(it == std::default_sentinel);
}
@@ -97,26 +97,26 @@ constexpr void test() {
// Test with a predicate that takes by non-const reference
if constexpr (!std::to_underlying(Constant)) {
std::array array{1, 2, 3, -3, -2, -1};
- View v{Iterator{array.begin()}, Sentinel{Iterator{array.end()}}};
+ View v{Iterator{array.data()}, Sentinel{Iterator{array.data() + array.size()}}};
auto view = std::views::chunk_by(std::move(v), [](int& x, int& y) { return x <= y; });
auto it = view.begin();
- assert(base((*it).begin()) == array.begin());
+ assert(base((*it).begin()) == array.data());
++it;
- assert(base((*it).begin()) == array.begin() + 3);
+ assert(base((*it).begin()) == array.data() + 3);
}
// Test with a predicate that is invocable but not callable (i.e. cannot be called like regular function 'f()')
{
std::array array = {1, 2, 3, -3, -2, -1};
- auto v = View{Iterator{array.begin()}, Sentinel{Iterator{array.end()}}}
+ auto v = View{Iterator{array.data()}, Sentinel{Iterator{array.data() + array.size()}}}
| std::views::transform([](int x) { return IntWrapper{x}; });
auto view = std::views::chunk_by(std::move(v), &IntWrapper::lessEqual);
auto it = view.begin();
- assert(base((*it).begin().base()) == array.begin());
+ assert(base((*it).begin().base()) == array.data());
++it;
- assert(base((*it).begin().base()) == array.begin() + 3);
+ assert(base((*it).begin().base()) == array.data() + 3);
}
// Make sure we do not make a copy of the predicate when we increment
@@ -124,7 +124,7 @@ constexpr void test() {
{
bool moved = false, copied = false;
std::array array{1, 2, 1, 3};
- View v{Iterator(array.begin()), Sentinel(Iterator(array.end()))};
+ View v{Iterator(array.data()), Sentinel(Iterator(array.data() + array.size()))};
auto view = std::views::chunk_by(std::move(v), TrackingPred(&moved, &copied));
assert(std::exchange(moved, false));
auto it = view.begin();
@@ -137,20 +137,20 @@ constexpr void test() {
// Check post-increment
{
std::array array{0, 1, 2, -3, -2, -1, -6, -5, -4};
- ChunkByView view = make_chunk_by_view(array.begin(), array.end());
+ ChunkByView view = make_chunk_by_view(array);
ChunkByIterator it = view.begin();
std::same_as<ChunkByIterator> decltype(auto) result = it++;
assert(result != it);
- assert(base((*result).begin()) == array.begin());
- assert(base((*it).begin()) == array.begin() + 3);
+ assert(base((*result).begin()) == array.data());
+ assert(base((*it).begin()) == array.data() + 3);
result = it++;
- assert(base((*result).begin()) == array.begin() + 3);
- assert(base((*it).begin()) == array.begin() + 6);
+ assert(base((*result).begin()) == array.data() + 3);
+ assert(base((*it).begin()) == array.data() + 6);
result = it++;
- assert(base((*result).begin()) == array.begin() + 6);
+ assert(base((*result).begin()) == array.data() + 6);
assert(it == std::default_sentinel);
}
}
>From 8efc40e81feab4e0d57f5f8bf3c84faf19b4311a Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl at nuwen.net>
Date: Mon, 4 Dec 2023 21:32:22 -0800
Subject: [PATCH 5/7] Fix alg.merge tests assuming that array iterators are
pointers.
---
.../algorithms/alg.sorting/alg.merge/pstl.merge.pass.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/pstl.merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/pstl.merge.pass.cpp
index 1feadfb377a68..c685bff8f4e9b 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/pstl.merge.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/pstl.merge.pass.cpp
@@ -54,14 +54,14 @@ struct Test {
std::array<int, 0> b;
std::array<int, std::size(a) + std::size(b)> out;
std::merge(
- policy, Iter1(std::begin(a)), Iter1(std::end(a)), Iter2(std::begin(b)), Iter2(std::end(b)), std::begin(out));
+ policy, Iter1(std::data(a)), Iter1(std::data(a) + std::size(a)), Iter2(std::data(b)), Iter2(std::data(b) + std::size(b)), std::begin(out));
}
{ // check that it works with the first range being empty
std::array<int, 0> a;
int b[] = {2, 4, 6, 8, 10};
std::array<int, std::size(a) + std::size(b)> out;
std::merge(
- policy, Iter1(std::begin(a)), Iter1(std::end(a)), Iter2(std::begin(b)), Iter2(std::end(b)), std::begin(out));
+ policy, Iter1(std::data(a)), Iter1(std::data(a) + std::size(a)), Iter2(std::begin(b)), Iter2(std::end(b)), std::begin(out));
assert((out == std::array{2, 4, 6, 8, 10}));
}
@@ -70,7 +70,7 @@ struct Test {
std::array<int, 0> b;
std::array<int, std::size(a) + std::size(b)> out;
std::merge(
- policy, Iter1(std::begin(a)), Iter1(std::end(a)), Iter2(std::begin(b)), Iter2(std::end(b)), std::begin(out));
+ policy, Iter1(std::begin(a)), Iter1(std::end(a)), Iter2(std::data(b)), Iter2(std::data(b) + std::size(b)), std::begin(out));
assert((out == std::array{2, 4, 6, 8, 10}));
}
>From e0ee3276150372d8d22860f70f2f5031df7a3c32 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl at nuwen.net>
Date: Mon, 4 Dec 2023 21:47:02 -0800
Subject: [PATCH 6/7] Fix alg.replace tests assuming that array iterators are
pointers.
---
.../alg.replace/pstl.replace.pass.cpp | 12 ++++++------
.../alg.replace/pstl.replace_copy.pass.cpp | 12 ++++++------
.../alg.replace/pstl.replace_copy_if.pass.cpp | 12 ++++++------
.../alg.replace/pstl.replace_if.pass.cpp | 12 ++++++------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace.pass.cpp
index 751d6b74b0128..833d5b0f6b2bf 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace.pass.cpp
@@ -29,35 +29,35 @@ struct Test {
void operator()(ExecutionPolicy&& policy) {
{ // simple test
std::array a = {1, 2, 3, 4, 5, 6, 7, 8};
- std::replace(policy, Iter(std::begin(a)), Iter(std::end(a)), 3, 6);
+ std::replace(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), 3, 6);
assert((a == std::array{1, 2, 6, 4, 5, 6, 7, 8}));
}
{ // empty range works
std::array<int, 0> a = {};
- std::replace(policy, Iter(std::begin(a)), Iter(std::end(a)), 3, 6);
+ std::replace(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), 3, 6);
}
{ // non-empty range without a match works
std::array a = {1, 2};
- std::replace(policy, Iter(std::begin(a)), Iter(std::end(a)), 3, 6);
+ std::replace(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), 3, 6);
}
{ // single element range works
std::array a = {3};
- std::replace(policy, Iter(std::begin(a)), Iter(std::end(a)), 3, 6);
+ std::replace(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), 3, 6);
assert((a == std::array{6}));
}
{ // two element range works
std::array a = {3, 4};
- std::replace(policy, Iter(std::begin(a)), Iter(std::end(a)), 3, 6);
+ std::replace(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), 3, 6);
assert((a == std::array{6, 4}));
}
{ // multiple matching elements work
std::array a = {1, 2, 3, 4, 3, 3, 5, 6, 3};
- std::replace(policy, Iter(std::begin(a)), Iter(std::end(a)), 3, 9);
+ std::replace(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), 3, 9);
assert((a == std::array{1, 2, 9, 4, 9, 9, 5, 6, 9}));
}
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy.pass.cpp
index f24bedabebccd..18d4446f5d2a9 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy.pass.cpp
@@ -32,40 +32,40 @@ struct Test {
{ // simple test
std::array a = {1, 2, 3, 4, 5, 6, 7, 8};
std::array<int, a.size()> out;
- std::replace_copy(policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(std::begin(out)), 3, 6);
+ std::replace_copy(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), 3, 6);
assert((out == std::array{1, 2, 6, 4, 5, 6, 7, 8}));
}
{ // empty range works
std::array<int, 0> a = {};
- std::replace_copy(policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(std::begin(a)), 3, 6);
+ std::replace_copy(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(a)), 3, 6);
}
{ // non-empty range without a match works
std::array a = {1, 2};
std::array<int, a.size()> out;
- std::replace_copy(policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(out.data()), 3, 6);
+ std::replace_copy(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(out.data()), 3, 6);
assert((out == std::array{1, 2}));
}
{ // single element range works
std::array a = {3};
std::array<int, a.size()> out;
- std::replace_copy(policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(std::begin(out)), 3, 6);
+ std::replace_copy(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), 3, 6);
assert((out == std::array{6}));
}
{ // two element range works
std::array a = {3, 4};
std::array<int, a.size()> out;
- std::replace_copy(policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(std::begin(out)), 3, 6);
+ std::replace_copy(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), 3, 6);
assert((out == std::array{6, 4}));
}
{ // multiple matching elements work
std::array a = {1, 2, 3, 4, 3, 3, 5, 6, 3};
std::array<int, a.size()> out;
- std::replace_copy(policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(std::begin(out)), 3, 9);
+ std::replace_copy(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), 3, 9);
assert((out == std::array{1, 2, 9, 4, 9, 9, 5, 6, 9}));
}
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy_if.pass.cpp
index f7c746f382d11..89ea1652eb896 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy_if.pass.cpp
@@ -34,21 +34,21 @@ struct Test {
std::array a = {1, 2, 3, 4, 5, 6, 7, 8};
std::array<int, a.size()> out;
std::replace_copy_if(
- policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(std::begin(out)), [](int i) { return i == 3; }, 6);
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), [](int i) { return i == 3; }, 6);
assert((out == std::array{1, 2, 6, 4, 5, 6, 7, 8}));
}
{ // empty range works
std::array<int, 0> a = {};
std::replace_copy_if(
- policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(std::begin(a)), [](int i) { return i == 3; }, 6);
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(a)), [](int i) { return i == 3; }, 6);
}
{ // non-empty range without a match works
std::array a = {1, 2};
std::array<int, a.size()> out;
std::replace_copy_if(
- policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(out.data()), [](int i) { return i == 3; }, 6);
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(out.data()), [](int i) { return i == 3; }, 6);
assert((out == std::array{1, 2}));
}
@@ -56,7 +56,7 @@ struct Test {
std::array a = {3};
std::array<int, a.size()> out;
std::replace_copy_if(
- policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(std::begin(out)), [](int i) { return i == 3; }, 6);
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), [](int i) { return i == 3; }, 6);
assert((out == std::array{6}));
}
@@ -64,7 +64,7 @@ struct Test {
std::array a = {3, 4};
std::array<int, a.size()> out;
std::replace_copy_if(
- policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(std::begin(out)), [](int i) { return i == 3; }, 6);
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), [](int i) { return i == 3; }, 6);
assert((out == std::array{6, 4}));
}
@@ -72,7 +72,7 @@ struct Test {
std::array a = {1, 2, 3, 4, 3, 3, 5, 6, 3};
std::array<int, a.size()> out;
std::replace_copy_if(
- policy, Iter(std::begin(a)), Iter(std::end(a)), Iter(std::begin(out)), [](int i) { return i == 3; }, 9);
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), [](int i) { return i == 3; }, 9);
assert((out == std::array{1, 2, 9, 4, 9, 9, 5, 6, 9}));
}
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_if.pass.cpp
index 3ffc1c021bb9c..99ea5e230835f 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_if.pass.cpp
@@ -30,38 +30,38 @@ struct Test {
{ // simple test
std::array a = {1, 2, 3, 4, 5, 6, 7, 8};
std::replace_if(
- policy, Iter(std::begin(a)), Iter(std::end(a)), [](int i) { return i == 3 || i == 7; }, 6);
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), [](int i) { return i == 3 || i == 7; }, 6);
assert((a == std::array{1, 2, 6, 4, 5, 6, 6, 8}));
}
{ // empty range works
std::array<int, 0> a = {};
std::replace_if(
- policy, Iter(std::begin(a)), Iter(std::end(a)), [](int) { return false; }, 6);
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), [](int) { return false; }, 6);
}
{ // non-empty range without a match works
std::array a = {1, 2};
- std::replace_if(policy, Iter(std::begin(a)), Iter(std::end(a)), [](int) { return false; }, 6);
+ std::replace_if(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), [](int) { return false; }, 6);
}
{ // single element range works
std::array a = {3};
std::replace_if(
- policy, Iter(std::begin(a)), Iter(std::end(a)), [](int i) { return i == 3; }, 6);
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), [](int i) { return i == 3; }, 6);
assert((a == std::array{6}));
}
{ // two element range works
std::array a = {3, 4};
std::replace_if(
- policy, Iter(std::begin(a)), Iter(std::end(a)), [](int i) { return i == 3; }, 6);
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), [](int i) { return i == 3; }, 6);
assert((a == std::array{6, 4}));
}
{ // multiple matching elements work
std::array a = {1, 2, 3, 4, 3, 3, 5, 6, 3};
- std::replace_if(policy, Iter(std::begin(a)), Iter(std::end(a)), [](int i) { return i == 3; }, 9);
+ std::replace_if(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), [](int i) { return i == 3; }, 9);
assert((a == std::array{1, 2, 9, 4, 9, 9, 5, 6, 9}));
}
>From 2aba7e6161bc4ac66dd165ed964cea44c550afaa Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl at nuwen.net>
Date: Tue, 5 Dec 2023 00:04:49 -0800
Subject: [PATCH 7/7] Apply clang-format from CI.
---
.../alg.replace/pstl.replace_copy_if.pass.cpp | 42 ++++++++++++++++---
.../alg.replace/pstl.replace_if.pass.cpp | 6 ++-
.../alg.sorting/alg.merge/pstl.merge.pass.cpp | 24 ++++++++---
...lexicographical_compare_three_way.pass.cpp | 4 +-
...ographical_compare_three_way_comp.pass.cpp | 4 +-
.../range.chunk.by.iter/decrement.pass.cpp | 4 +-
.../range.chunk.by.iter/increment.pass.cpp | 4 +-
7 files changed, 66 insertions(+), 22 deletions(-)
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy_if.pass.cpp
index 89ea1652eb896..00b40a4e159ac 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_copy_if.pass.cpp
@@ -34,21 +34,36 @@ struct Test {
std::array a = {1, 2, 3, 4, 5, 6, 7, 8};
std::array<int, a.size()> out;
std::replace_copy_if(
- policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), [](int i) { return i == 3; }, 6);
+ policy,
+ Iter(std::data(a)),
+ Iter(std::data(a) + std::size(a)),
+ Iter(std::data(out)),
+ [](int i) { return i == 3; },
+ 6);
assert((out == std::array{1, 2, 6, 4, 5, 6, 7, 8}));
}
{ // empty range works
std::array<int, 0> a = {};
std::replace_copy_if(
- policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(a)), [](int i) { return i == 3; }, 6);
+ policy,
+ Iter(std::data(a)),
+ Iter(std::data(a) + std::size(a)),
+ Iter(std::data(a)),
+ [](int i) { return i == 3; },
+ 6);
}
{ // non-empty range without a match works
std::array a = {1, 2};
std::array<int, a.size()> out;
std::replace_copy_if(
- policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(out.data()), [](int i) { return i == 3; }, 6);
+ policy,
+ Iter(std::data(a)),
+ Iter(std::data(a) + std::size(a)),
+ Iter(out.data()),
+ [](int i) { return i == 3; },
+ 6);
assert((out == std::array{1, 2}));
}
@@ -56,7 +71,12 @@ struct Test {
std::array a = {3};
std::array<int, a.size()> out;
std::replace_copy_if(
- policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), [](int i) { return i == 3; }, 6);
+ policy,
+ Iter(std::data(a)),
+ Iter(std::data(a) + std::size(a)),
+ Iter(std::data(out)),
+ [](int i) { return i == 3; },
+ 6);
assert((out == std::array{6}));
}
@@ -64,7 +84,12 @@ struct Test {
std::array a = {3, 4};
std::array<int, a.size()> out;
std::replace_copy_if(
- policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), [](int i) { return i == 3; }, 6);
+ policy,
+ Iter(std::data(a)),
+ Iter(std::data(a) + std::size(a)),
+ Iter(std::data(out)),
+ [](int i) { return i == 3; },
+ 6);
assert((out == std::array{6, 4}));
}
@@ -72,7 +97,12 @@ struct Test {
std::array a = {1, 2, 3, 4, 3, 3, 5, 6, 3};
std::array<int, a.size()> out;
std::replace_copy_if(
- policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), Iter(std::data(out)), [](int i) { return i == 3; }, 9);
+ policy,
+ Iter(std::data(a)),
+ Iter(std::data(a) + std::size(a)),
+ Iter(std::data(out)),
+ [](int i) { return i == 3; },
+ 9);
assert((out == std::array{1, 2, 9, 4, 9, 9, 5, 6, 9}));
}
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_if.pass.cpp
index 99ea5e230835f..9e4f4d3f03450 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/pstl.replace_if.pass.cpp
@@ -42,7 +42,8 @@ struct Test {
{ // non-empty range without a match works
std::array a = {1, 2};
- std::replace_if(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), [](int) { return false; }, 6);
+ std::replace_if(
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), [](int) { return false; }, 6);
}
{ // single element range works
@@ -61,7 +62,8 @@ struct Test {
{ // multiple matching elements work
std::array a = {1, 2, 3, 4, 3, 3, 5, 6, 3};
- std::replace_if(policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), [](int i) { return i == 3; }, 9);
+ std::replace_if(
+ policy, Iter(std::data(a)), Iter(std::data(a) + std::size(a)), [](int i) { return i == 3; }, 9);
assert((a == std::array{1, 2, 9, 4, 9, 9, 5, 6, 9}));
}
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/pstl.merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/pstl.merge.pass.cpp
index c685bff8f4e9b..ade15ce0b7085 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/pstl.merge.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/pstl.merge.pass.cpp
@@ -53,15 +53,23 @@ struct Test {
std::array<int, 0> a;
std::array<int, 0> b;
std::array<int, std::size(a) + std::size(b)> out;
- std::merge(
- policy, Iter1(std::data(a)), Iter1(std::data(a) + std::size(a)), Iter2(std::data(b)), Iter2(std::data(b) + std::size(b)), std::begin(out));
+ std::merge(policy,
+ Iter1(std::data(a)),
+ Iter1(std::data(a) + std::size(a)),
+ Iter2(std::data(b)),
+ Iter2(std::data(b) + std::size(b)),
+ std::begin(out));
}
{ // check that it works with the first range being empty
std::array<int, 0> a;
int b[] = {2, 4, 6, 8, 10};
std::array<int, std::size(a) + std::size(b)> out;
- std::merge(
- policy, Iter1(std::data(a)), Iter1(std::data(a) + std::size(a)), Iter2(std::begin(b)), Iter2(std::end(b)), std::begin(out));
+ std::merge(policy,
+ Iter1(std::data(a)),
+ Iter1(std::data(a) + std::size(a)),
+ Iter2(std::begin(b)),
+ Iter2(std::end(b)),
+ std::begin(out));
assert((out == std::array{2, 4, 6, 8, 10}));
}
@@ -69,8 +77,12 @@ struct Test {
int a[] = {2, 4, 6, 8, 10};
std::array<int, 0> b;
std::array<int, std::size(a) + std::size(b)> out;
- std::merge(
- policy, Iter1(std::begin(a)), Iter1(std::end(a)), Iter2(std::data(b)), Iter2(std::data(b) + std::size(b)), std::begin(out));
+ std::merge(policy,
+ Iter1(std::begin(a)),
+ Iter1(std::end(a)),
+ Iter2(std::data(b)),
+ Iter2(std::data(b) + std::size(b)),
+ std::begin(out));
assert((out == std::array{2, 4, 6, 8, 10}));
}
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way.pass.cpp
index 17db46edfb218..d7cd49987689d 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way.pass.cpp
@@ -27,8 +27,8 @@
template <typename Iter1, typename Iter2, typename C1, typename C2, typename Order>
constexpr void test_lexicographical_compare(C1 a, C2 b, Order expected) {
- std::same_as<Order> decltype(auto) result =
- std::lexicographical_compare_three_way(Iter1{a.data()}, Iter1{a.data() + a.size()}, Iter2{b.data()}, Iter2{b.data() + b.size()});
+ std::same_as<Order> decltype(auto) result = std::lexicographical_compare_three_way(
+ Iter1{a.data()}, Iter1{a.data() + a.size()}, Iter2{b.data()}, Iter2{b.data() + b.size()});
assert(expected == result);
}
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way_comp.pass.cpp
index 1f8b18737ada8..f2f7d538d773f 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way_comp.pass.cpp
@@ -56,8 +56,8 @@ static_assert(has_lexicographical_compare<decltype(compare_int_result)>);
template <typename Iter1, typename Iter2, typename C1, typename C2, typename Order, typename Comparator>
constexpr void test_lexicographical_compare(C1 a, C2 b, Comparator comp, Order expected) {
- std::same_as<Order> decltype(auto) result =
- std::lexicographical_compare_three_way(Iter1{a.data()}, Iter1{a.data() + a.size()}, Iter2{b.data()}, Iter2{b.data() + b.size()}, comp);
+ std::same_as<Order> decltype(auto) result = std::lexicographical_compare_three_way(
+ Iter1{a.data()}, Iter1{a.data() + a.size()}, Iter2{b.data()}, Iter2{b.data() + b.size()}, comp);
assert(expected == result);
}
diff --git a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/decrement.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/decrement.pass.cpp
index a331c794c8815..c6c036363d3df 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/decrement.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/decrement.pass.cpp
@@ -137,8 +137,8 @@ constexpr void test() {
// Test with a predicate that is invocable but not callable (i.e. cannot be called like regular function 'f()')
{
std::array array = {1, 2, 3, -3, -2, -1};
- auto v = View{Iterator{array.data()}, Sentinel{Iterator{array.data() + array.size()}}}
- | std::views::transform([](int x) { return IntWrapper{x}; });
+ auto v = View{Iterator{array.data()}, Sentinel{Iterator{array.data() + array.size()}}} |
+ std::views::transform([](int x) { return IntWrapper{x}; });
auto view = std::views::chunk_by(std::move(v), &IntWrapper::lessEqual);
auto it = std::ranges::next(view.begin());
diff --git a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/increment.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/increment.pass.cpp
index 8a7ff4e385f21..3a9262cb2ad71 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/increment.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/increment.pass.cpp
@@ -109,8 +109,8 @@ constexpr void test() {
// Test with a predicate that is invocable but not callable (i.e. cannot be called like regular function 'f()')
{
std::array array = {1, 2, 3, -3, -2, -1};
- auto v = View{Iterator{array.data()}, Sentinel{Iterator{array.data() + array.size()}}}
- | std::views::transform([](int x) { return IntWrapper{x}; });
+ auto v = View{Iterator{array.data()}, Sentinel{Iterator{array.data() + array.size()}}} |
+ std::views::transform([](int x) { return IntWrapper{x}; });
auto view = std::views::chunk_by(std::move(v), &IntWrapper::lessEqual);
auto it = view.begin();
More information about the libcxx-commits
mailing list