[libc++][ranges][NFC] Test new requirements for `basic_string_view` and `span` iterators.

[var-const]

Summary

Note that most changes to strings and views.span from the One Ranges
Proposal are no longer applicable:

• free begin and end functions taking basic_string_view and span were removed by P1870;
• span::const_iterator was removed by LWG3320.

[ldionne]

libcxx/test/std/containers/views/span.iterators/iterator_concept_conformance.compile.pass.cpp

24

I don't understand why there is anything to test at all. It seems to me that those sections of the "one ranges proposal" simply don't exist anymore, so there's nothing to do, no?

[• Quuxplusone]

LGTM % LIBCPP_STATIC_ASSERT.

libcxx/test/std/containers/views/span.iterators/iterator_concept_conformance.compile.pass.cpp

24

Ditto, although this extra coverage doesn't seem harmful.
Please do change it to

LIBCPP_STATIC_ASSERT(std::__is_cpp17_random_access_iterator<iterator>::value);

though (and likewise throughout), both for clarity and because we're trying to cut down on the use of raw #if _LIBCPP_whatever macros in tests.

[var-const]

libcxx/test/std/containers/views/span.iterators/iterator_concept_conformance.compile.pass.cpp

24

(Taking basic_string_view::const_iterator as an example) The text before the <ranges> proposal said that the iterator meets the requirements of a constant random access iterator and [meets the requirements of] a contiguous iterator. After the proposal, this became meets the requirements of Cpp17RandomAccessIterator and models contiguous_iterator (this is still in the latest draft). While it's basically saying the same thing, it formalizes it by using a named requirement.

We were already testing that the iterator types model contiguous_iterator, but not the Cpp17RandomAccessIterator part. If you don't feel this adds value, or if this is already tested elsewhere, I'm very open to dropping the new tests from this patch (so that it becomes just a status update).

[var-const]

• address feedback;
• add links to the patch to the status page.

[ldionne]

libcxx/test/std/containers/views/span.iterators/iterator_concept_conformance.compile.pass.cpp

24

Thanks for clarifying. I think it does add some value then. Note that __is_cpp17_random_access_iterator doesn't check whether the concept is satisfied, though, it only checks the iterator_category if I'm not mistaken. But still better than nothing.

libcxx/docs/Status/RangesPaper.csv

 | `ranges::uninitialized_move <https://llvm.org/D116023>`_
 | `ranges::uninitialized_move_n <https://llvm.org/D116023>`_
 | `ranges::uninitialized_fill <https://llvm.org/D115626>`_
 | `ranges::uninitialized_fill_n <https://llvm.org/D115626>`_
 | `ranges::construct_at <https://llvm.org/D116078>`_
 | `ranges::destroy <https://llvm.org/D116078>`_
 | `ranges::destroy_at <https://llvm.org/D116078>`_
 | `ranges::destroy_n <https://llvm.org/D116078>`_",[special.mem.concepts],Konstantin Varlamov,✅
-`[strings] <https://wg21.link/strings>`_,Adds begin/end and updates const_iterator.,[iterator.concepts],Unassigned,Not started
-`[views.span] <https://wg21.link/views.span>`_,Same as [strings],[iterator.concepts],Unassigned,Not started
+`[strings] <https://wg21.link/strings>`_,`Adds begin/end and updates const_iterator. <https://llvm.org/D118687>`_,[iterator.concepts],Konstantin Varlamov,✅
+`[views.span] <https://wg21.link/views.span>`_,`Same as [strings] <https://llvm.org/D118687>`_,[iterator.concepts],Konstantin Varlamov,✅
 `[iterator.cust.move] <https://wg21.link/iterator.cust.move>`_,`ranges::iter_move <https://llvm.org/D99873>`_,,Zoe Carver,✅
 `[iterator.cust.swap] <https://wg21.link/iterator.cust.swap>`_,`ranges::iter_swap <https://llvm.org/D102809>`_,iter_value_t,Zoe Carver,✅
 `[iterator.concepts] <https://wg21.link/iterator.concepts>`_,"| `indirectly_readable <https://llvm.org/D100073>`_
 | `indirectly_writable <https://llvm.org/D100073>`_
 | `weakly_incrementable <https://llvm.org/D100080>`_
 | `incrementable <https://llvm.org/D100080>`_
 | `input_or_output_iterator <https://llvm.org/D100160>`_
 | `sentinel_for <https://llvm.org/D100160>`_

libcxx/test/std/containers/views/span.iterators/iterator_concept_conformance.compile.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
 // UNSUPPORTED: libcpp-no-concepts
 
 // iterator, reverse_iterator
 
 #include <span>
 
 #include <iterator>
+#include "test_macros.h"
 
 using iterator = std::span<int>::iterator;
 using reverse_iterator = std::span<int>::reverse_iterator;
 using value_type = int;
 
 static_assert(std::contiguous_iterator<iterator>);
+LIBCPP_STATIC_ASSERT(std::__is_cpp17_random_access_iterator<iterator>::value);
 static_assert(std::indirectly_writable<iterator, value_type>);
 static_assert(std::sentinel_for<iterator, iterator>);
 static_assert(!std::sentinel_for<iterator, reverse_iterator>);
 static_assert(std::sized_sentinel_for<iterator, iterator>);
 static_assert(!std::sized_sentinel_for<iterator, reverse_iterator>);
 static_assert(std::indirectly_movable<iterator, int*>);
 static_assert(std::indirectly_movable_storable<iterator, int*>);
 static_assert(std::indirectly_swappable<iterator, iterator>);

libcxx/test/std/strings/string.view/string.view.iterators/iterator_concept_conformance.compile.pass.cpp

 // UNSUPPORTED: libcpp-no-concepts
 
 // iterator, const_iterator, reverse_iterator, const_reverse_iterator
 
 #include <string_view>
 
 #include <iterator>
 
+#include "test_macros.h"
+
 using iterator = std::string_view::iterator;
 using const_iterator = std::string_view::const_iterator;
 using reverse_iterator = std::string_view::reverse_iterator;
 using const_reverse_iterator = std::string_view::const_reverse_iterator;
 
 static_assert(std::contiguous_iterator<iterator>);
+LIBCPP_STATIC_ASSERT(std::__is_cpp17_random_access_iterator<iterator>::value);
 static_assert(!std::indirectly_writable<iterator, char>);
 static_assert(std::sentinel_for<iterator, iterator>);
 static_assert(std::sentinel_for<iterator, const_iterator>);
 static_assert(!std::sentinel_for<iterator, reverse_iterator>);
 static_assert(!std::sentinel_for<iterator, const_reverse_iterator>);
 static_assert(std::sized_sentinel_for<iterator, iterator>);
 static_assert(std::sized_sentinel_for<iterator, const_iterator>);
 static_assert(!std::sized_sentinel_for<iterator, reverse_iterator>);
 static_assert(!std::sized_sentinel_for<iterator, const_reverse_iterator>);
 static_assert(std::indirectly_movable<iterator, char*>);
 static_assert(std::indirectly_movable_storable<iterator, char*>);
 static_assert(!std::indirectly_swappable<iterator, iterator>);
 
 static_assert(std::contiguous_iterator<const_iterator>);
+LIBCPP_STATIC_ASSERT(std::__is_cpp17_random_access_iterator<const_iterator>::value);
 static_assert(!std::indirectly_writable<const_iterator, char>);
 static_assert(std::sentinel_for<const_iterator, iterator>);
 static_assert(std::sentinel_for<const_iterator, const_iterator>);
 static_assert(!std::sentinel_for<const_iterator, reverse_iterator>);
 static_assert(!std::sentinel_for<const_iterator, const_reverse_iterator>);
 static_assert(std::sized_sentinel_for<const_iterator, iterator>);
 static_assert(std::sized_sentinel_for<const_iterator, const_iterator>);
 static_assert(!std::sized_sentinel_for<const_iterator, reverse_iterator>);
 static_assert(!std::sized_sentinel_for<const_iterator, const_reverse_iterator>);
 static_assert(!std::indirectly_swappable<const_iterator, const_iterator>);