Skip to content

Commit 416c477

Browse files
ldionnejoaosaffran
authored andcommitted
[libc++] Remove obsolete guards for join_view being experimental (llvm#126697)
These TODOs were forgotten when join_view was made non-experimental. By removing these checks, we slightly increase the coverage of the test suite.
1 parent 7d39486 commit 416c477

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,7 @@ TEST_CONSTEXPR_CXX20 bool test() {
215215
Test<TriviallyComparable<wchar_t>, TriviallyComparable<wchar_t>>().operator()<TriviallyComparable<wchar_t>*>();
216216
#endif
217217

218-
// TODO: Remove the `_LIBCPP_ENABLE_EXPERIMENTAL` check once we have the FTM guarded or views::join isn't
219-
// experimental anymore
220-
#if TEST_STD_VER >= 20 && (!defined(_LIBCPP_VERSION) || defined(_LIBCPP_ENABLE_EXPERIMENTAL))
218+
#if TEST_STD_VER >= 20
221219
{
222220
std::vector<std::vector<int>> vec = {{1, 2, 3}, {4, 5, 6}, {7, 8, 9}};
223221
auto view = vec | std::views::join;

libcxx/test/std/algorithms/alg.nonmodifying/alg.find/ranges.find.pass.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ constexpr bool test() {
131131
});
132132
});
133133

134-
// TODO: Remove the `_LIBCPP_ENABLE_EXPERIMENTAL` check once we have the FTM guarded or views::join isn't
135-
// experimental anymore
136-
#if TEST_STD_VER >= 20 && (!defined(_LIBCPP_VERSION) || defined(_LIBCPP_ENABLE_EXPERIMENTAL))
134+
#if TEST_STD_VER >= 20
137135
{
138136
std::vector<std::vector<int>> vec = {{1, 2, 3}, {4, 5, 6}, {7, 8, 9}};
139137
auto view = vec | std::views::join;

libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each.pass.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ struct Test {
5656
TEST_CONSTEXPR_CXX20 bool test() {
5757
types::for_each(types::cpp17_input_iterator_list<int*>(), Test());
5858

59-
// TODO: Remove the `_LIBCPP_ENABLE_EXPERIMENTAL` check once we have the FTM guarded or views::join isn't
60-
// experimental anymore
61-
#if TEST_STD_VER >= 20 && defined(_LIBCPP_ENABLE_EXPERIMENTAL)
59+
#if TEST_STD_VER >= 20
6260
{ // Make sure that the segmented iterator optimization works during constant evaluation
6361
std::vector<std::vector<int>> vecs = {{1, 2, 3}, {4, 5, 6}, {7, 8, 9}};
6462
auto v = std::views::join(vecs);

0 commit comments

Comments
 (0)