Skip to content

Commit 81bd72f

Browse files
ldionnememfrob
ldionne
authored and
memfrob
committed
[libc++][NFC] Replace uses of stdr:: by just std::ranges::
Differential Revision: https://reviews.llvm.org/D109121
1 parent 0393ef2 commit 81bd72f

File tree

29 files changed

+490
-491
lines changed

29 files changed

+490
-491
lines changed

‎libcxx/test/std/containers/associative/map/range_concept_conformance.compile.pass.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
#include <ranges>
1919

2020
using range = std::map<int, int>;
21-
namespace stdr = std::ranges;
22-
23-
static_assert(std::same_as<stdr::iterator_t<range>, range::iterator>);
24-
static_assert(stdr::common_range<range>);
25-
static_assert(stdr::bidirectional_range<range>);
26-
static_assert(!stdr::view<range>);
27-
static_assert(!stdr::random_access_range<range>);
28-
static_assert(stdr::sized_range<range>);
29-
static_assert(!stdr::borrowed_range<range>);
30-
static_assert(!stdr::viewable_range<range>);
31-
32-
static_assert(std::same_as<stdr::iterator_t<range const>, range::const_iterator>);
33-
static_assert(stdr::common_range<range const>);
34-
static_assert(stdr::bidirectional_range<range const>);
35-
static_assert(!stdr::view<range const>);
36-
static_assert(!stdr::random_access_range<range const>);
37-
static_assert(stdr::sized_range<range const>);
38-
static_assert(!stdr::borrowed_range<range const>);
39-
static_assert(!stdr::viewable_range<range const>);
21+
22+
23+
static_assert(std::same_as<std::ranges::iterator_t<range>, range::iterator>);
24+
static_assert(std::ranges::common_range<range>);
25+
static_assert(std::ranges::bidirectional_range<range>);
26+
static_assert(!std::ranges::view<range>);
27+
static_assert(!std::ranges::random_access_range<range>);
28+
static_assert(std::ranges::sized_range<range>);
29+
static_assert(!std::ranges::borrowed_range<range>);
30+
static_assert(!std::ranges::viewable_range<range>);
31+
32+
static_assert(std::same_as<std::ranges::iterator_t<range const>, range::const_iterator>);
33+
static_assert(std::ranges::common_range<range const>);
34+
static_assert(std::ranges::bidirectional_range<range const>);
35+
static_assert(!std::ranges::view<range const>);
36+
static_assert(!std::ranges::random_access_range<range const>);
37+
static_assert(std::ranges::sized_range<range const>);
38+
static_assert(!std::ranges::borrowed_range<range const>);
39+
static_assert(!std::ranges::viewable_range<range const>);

‎libcxx/test/std/containers/associative/multimap/range_concept_conformance.compile.pass.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
#include <ranges>
1919

2020
using range = std::multimap<int, int>;
21-
namespace stdr = std::ranges;
22-
23-
static_assert(std::same_as<stdr::iterator_t<range>, range::iterator>);
24-
static_assert(stdr::common_range<range>);
25-
static_assert(stdr::bidirectional_range<range>);
26-
static_assert(!stdr::view<range>);
27-
static_assert(!stdr::random_access_range<range>);
28-
static_assert(stdr::sized_range<range>);
29-
static_assert(!stdr::borrowed_range<range>);
30-
static_assert(!stdr::viewable_range<range>);
31-
32-
static_assert(std::same_as<stdr::iterator_t<range const>, range::const_iterator>);
33-
static_assert(stdr::common_range<range const>);
34-
static_assert(stdr::bidirectional_range<range const>);
35-
static_assert(!stdr::view<range const>);
36-
static_assert(!stdr::random_access_range<range const>);
37-
static_assert(stdr::sized_range<range const>);
38-
static_assert(!stdr::borrowed_range<range const>);
39-
static_assert(!stdr::viewable_range<range const>);
21+
22+
23+
static_assert(std::same_as<std::ranges::iterator_t<range>, range::iterator>);
24+
static_assert(std::ranges::common_range<range>);
25+
static_assert(std::ranges::bidirectional_range<range>);
26+
static_assert(!std::ranges::view<range>);
27+
static_assert(!std::ranges::random_access_range<range>);
28+
static_assert(std::ranges::sized_range<range>);
29+
static_assert(!std::ranges::borrowed_range<range>);
30+
static_assert(!std::ranges::viewable_range<range>);
31+
32+
static_assert(std::same_as<std::ranges::iterator_t<range const>, range::const_iterator>);
33+
static_assert(std::ranges::common_range<range const>);
34+
static_assert(std::ranges::bidirectional_range<range const>);
35+
static_assert(!std::ranges::view<range const>);
36+
static_assert(!std::ranges::random_access_range<range const>);
37+
static_assert(std::ranges::sized_range<range const>);
38+
static_assert(!std::ranges::borrowed_range<range const>);
39+
static_assert(!std::ranges::viewable_range<range const>);

‎libcxx/test/std/containers/associative/multiset/range_concept_conformance.compile.pass.cpp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,21 @@
1818
#include <ranges>
1919

2020
using range = std::multiset<int>;
21-
namespace stdr = std::ranges;
2221

23-
static_assert(std::same_as<stdr::iterator_t<range>, range::iterator>);
24-
static_assert(stdr::common_range<range>);
25-
static_assert(stdr::bidirectional_range<range>);
26-
static_assert(!stdr::view<range>);
27-
static_assert(!stdr::random_access_range<range>);
28-
static_assert(stdr::sized_range<range>);
29-
static_assert(!stdr::borrowed_range<range>);
30-
static_assert(!stdr::viewable_range<range>);
22+
static_assert(std::same_as<std::ranges::iterator_t<range>, range::iterator>);
23+
static_assert(std::ranges::common_range<range>);
24+
static_assert(std::ranges::bidirectional_range<range>);
25+
static_assert(!std::ranges::view<range>);
26+
static_assert(!std::ranges::random_access_range<range>);
27+
static_assert(std::ranges::sized_range<range>);
28+
static_assert(!std::ranges::borrowed_range<range>);
29+
static_assert(!std::ranges::viewable_range<range>);
3130

32-
static_assert(std::same_as<stdr::iterator_t<range const>, range::const_iterator>);
33-
static_assert(stdr::common_range<range const>);
34-
static_assert(stdr::bidirectional_range<range const>);
35-
static_assert(!stdr::view<range const>);
36-
static_assert(!stdr::random_access_range<range const>);
37-
static_assert(stdr::sized_range<range const>);
38-
static_assert(!stdr::borrowed_range<range const>);
39-
static_assert(!stdr::viewable_range<range const>);
31+
static_assert(std::same_as<std::ranges::iterator_t<range const>, range::const_iterator>);
32+
static_assert(std::ranges::common_range<range const>);
33+
static_assert(std::ranges::bidirectional_range<range const>);
34+
static_assert(!std::ranges::view<range const>);
35+
static_assert(!std::ranges::random_access_range<range const>);
36+
static_assert(std::ranges::sized_range<range const>);
37+
static_assert(!std::ranges::borrowed_range<range const>);
38+
static_assert(!std::ranges::viewable_range<range const>);

‎libcxx/test/std/containers/associative/set/range_concept_conformance.compile.pass.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@
1818
#include <ranges>
1919

2020
using range = std::set<int>;
21-
namespace stdr = std::ranges;
22-
23-
static_assert(std::same_as<stdr::iterator_t<range>, range::iterator>);
24-
static_assert(stdr::bidirectional_range<range>);
25-
static_assert(!stdr::random_access_range<range>);
26-
static_assert(stdr::common_range<range>);
27-
static_assert(stdr::input_range<range>);
28-
static_assert(!stdr::view<range>);
29-
static_assert(stdr::sized_range<range>);
30-
static_assert(!stdr::borrowed_range<range>);
31-
static_assert(!stdr::viewable_range<range>);
32-
33-
static_assert(std::same_as<stdr::iterator_t<range const>, range::const_iterator>);
34-
static_assert(stdr::bidirectional_range<range const>);
35-
static_assert(!stdr::random_access_range<range const>);
36-
static_assert(stdr::common_range<range const>);
37-
static_assert(stdr::input_range<range>);
38-
static_assert(!stdr::view<range const>);
39-
static_assert(stdr::sized_range<range const>);
40-
static_assert(!stdr::borrowed_range<range const>);
41-
static_assert(!stdr::viewable_range<range const>);
21+
22+
23+
static_assert(std::same_as<std::ranges::iterator_t<range>, range::iterator>);
24+
static_assert(std::ranges::bidirectional_range<range>);
25+
static_assert(!std::ranges::random_access_range<range>);
26+
static_assert(std::ranges::common_range<range>);
27+
static_assert(std::ranges::input_range<range>);
28+
static_assert(!std::ranges::view<range>);
29+
static_assert(std::ranges::sized_range<range>);
30+
static_assert(!std::ranges::borrowed_range<range>);
31+
static_assert(!std::ranges::viewable_range<range>);
32+
33+
static_assert(std::same_as<std::ranges::iterator_t<range const>, range::const_iterator>);
34+
static_assert(std::ranges::bidirectional_range<range const>);
35+
static_assert(!std::ranges::random_access_range<range const>);
36+
static_assert(std::ranges::common_range<range const>);
37+
static_assert(std::ranges::input_range<range>);
38+
static_assert(!std::ranges::view<range const>);
39+
static_assert(std::ranges::sized_range<range const>);
40+
static_assert(!std::ranges::borrowed_range<range const>);
41+
static_assert(!std::ranges::viewable_range<range const>);

‎libcxx/test/std/containers/sequences/array/range_concept_conformance.compile.pass.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
#include <ranges>
1919

2020
using range = std::array<int, 10>;
21-
namespace stdr = std::ranges;
22-
23-
static_assert(!stdr::view<range>);
24-
static_assert(std::same_as<stdr::iterator_t<range>, range::iterator>);
25-
static_assert(stdr::common_range<range>);
26-
static_assert(stdr::random_access_range<range>);
27-
static_assert(stdr::contiguous_range<range>);
28-
static_assert(stdr::sized_range<range>);
29-
static_assert(!stdr::borrowed_range<range>);
30-
static_assert(!stdr::viewable_range<range>);
31-
32-
static_assert(!stdr::view<range const>);
33-
static_assert(std::same_as<stdr::iterator_t<range const>, range::const_iterator>);
34-
static_assert(stdr::common_range<range const>);
35-
static_assert(stdr::random_access_range<range const>);
36-
static_assert(stdr::contiguous_range<range const>);
37-
static_assert(stdr::sized_range<range const>);
38-
static_assert(!stdr::borrowed_range<range const>);
39-
static_assert(!stdr::viewable_range<range const>);
21+
22+
23+
static_assert(!std::ranges::view<range>);
24+
static_assert(std::same_as<std::ranges::iterator_t<range>, range::iterator>);
25+
static_assert(std::ranges::common_range<range>);
26+
static_assert(std::ranges::random_access_range<range>);
27+
static_assert(std::ranges::contiguous_range<range>);
28+
static_assert(std::ranges::sized_range<range>);
29+
static_assert(!std::ranges::borrowed_range<range>);
30+
static_assert(!std::ranges::viewable_range<range>);
31+
32+
static_assert(!std::ranges::view<range const>);
33+
static_assert(std::same_as<std::ranges::iterator_t<range const>, range::const_iterator>);
34+
static_assert(std::ranges::common_range<range const>);
35+
static_assert(std::ranges::random_access_range<range const>);
36+
static_assert(std::ranges::contiguous_range<range const>);
37+
static_assert(std::ranges::sized_range<range const>);
38+
static_assert(!std::ranges::borrowed_range<range const>);
39+
static_assert(!std::ranges::viewable_range<range const>);

‎libcxx/test/std/containers/sequences/deque/range_concept_conformance.compile.pass.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
#include <ranges>
1919

2020
using range = std::deque<int>;
21-
namespace stdr = std::ranges;
22-
23-
static_assert(std::same_as<stdr::iterator_t<range>, range::iterator>);
24-
static_assert(stdr::common_range<range>);
25-
static_assert(stdr::random_access_range<range>);
26-
static_assert(!stdr::contiguous_range<range>);
27-
static_assert(!stdr::view<range>);
28-
static_assert(stdr::sized_range<range>);
29-
static_assert(!stdr::borrowed_range<range>);
30-
static_assert(!stdr::viewable_range<range>);
31-
32-
static_assert(std::same_as<stdr::iterator_t<range const>, range::const_iterator>);
33-
static_assert(stdr::common_range<range const>);
34-
static_assert(stdr::random_access_range<range const>);
35-
static_assert(!stdr::contiguous_range<range const>);
36-
static_assert(!stdr::view<range const>);
37-
static_assert(stdr::sized_range<range const>);
38-
static_assert(!stdr::borrowed_range<range const>);
39-
static_assert(!stdr::viewable_range<range const>);
21+
22+
23+
static_assert(std::same_as<std::ranges::iterator_t<range>, range::iterator>);
24+
static_assert(std::ranges::common_range<range>);
25+
static_assert(std::ranges::random_access_range<range>);
26+
static_assert(!std::ranges::contiguous_range<range>);
27+
static_assert(!std::ranges::view<range>);
28+
static_assert(std::ranges::sized_range<range>);
29+
static_assert(!std::ranges::borrowed_range<range>);
30+
static_assert(!std::ranges::viewable_range<range>);
31+
32+
static_assert(std::same_as<std::ranges::iterator_t<range const>, range::const_iterator>);
33+
static_assert(std::ranges::common_range<range const>);
34+
static_assert(std::ranges::random_access_range<range const>);
35+
static_assert(!std::ranges::contiguous_range<range const>);
36+
static_assert(!std::ranges::view<range const>);
37+
static_assert(std::ranges::sized_range<range const>);
38+
static_assert(!std::ranges::borrowed_range<range const>);
39+
static_assert(!std::ranges::viewable_range<range const>);

‎libcxx/test/std/containers/sequences/forwardlist/range_concept_conformance.compile.pass.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
#include <ranges>
1919

2020
using range = std::forward_list<int>;
21-
namespace stdr = std::ranges;
22-
23-
static_assert(std::same_as<stdr::iterator_t<range>, range::iterator>);
24-
static_assert(stdr::common_range<range>);
25-
static_assert(stdr::forward_range<range>);
26-
static_assert(!stdr::bidirectional_range<range>);
27-
static_assert(!stdr::view<range>);
28-
static_assert(!stdr::sized_range<range>);
29-
static_assert(!stdr::borrowed_range<range>);
30-
static_assert(!stdr::viewable_range<range>);
31-
32-
static_assert(std::same_as<stdr::iterator_t<range const>, range::const_iterator>);
33-
static_assert(stdr::common_range<range const>);
34-
static_assert(stdr::forward_range<range const>);
35-
static_assert(!stdr::bidirectional_range<range const>);
36-
static_assert(!stdr::view<range const>);
37-
static_assert(!stdr::sized_range<range const>);
38-
static_assert(!stdr::borrowed_range<range const>);
39-
static_assert(!stdr::viewable_range<range const>);
21+
22+
23+
static_assert(std::same_as<std::ranges::iterator_t<range>, range::iterator>);
24+
static_assert(std::ranges::common_range<range>);
25+
static_assert(std::ranges::forward_range<range>);
26+
static_assert(!std::ranges::bidirectional_range<range>);
27+
static_assert(!std::ranges::view<range>);
28+
static_assert(!std::ranges::sized_range<range>);
29+
static_assert(!std::ranges::borrowed_range<range>);
30+
static_assert(!std::ranges::viewable_range<range>);
31+
32+
static_assert(std::same_as<std::ranges::iterator_t<range const>, range::const_iterator>);
33+
static_assert(std::ranges::common_range<range const>);
34+
static_assert(std::ranges::forward_range<range const>);
35+
static_assert(!std::ranges::bidirectional_range<range const>);
36+
static_assert(!std::ranges::view<range const>);
37+
static_assert(!std::ranges::sized_range<range const>);
38+
static_assert(!std::ranges::borrowed_range<range const>);
39+
static_assert(!std::ranges::viewable_range<range const>);

‎libcxx/test/std/containers/sequences/list/range_concept_conformance.compile.pass.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
#include <ranges>
1919

2020
using range = std::list<int>;
21-
namespace stdr = std::ranges;
22-
23-
static_assert(std::same_as<stdr::iterator_t<range>, range::iterator>);
24-
static_assert(stdr::common_range<range>);
25-
static_assert(stdr::bidirectional_range<range>);
26-
static_assert(!stdr::view<range>);
27-
static_assert(!stdr::random_access_range<range>);
28-
static_assert(stdr::sized_range<range>);
29-
static_assert(!stdr::borrowed_range<range>);
30-
static_assert(!stdr::viewable_range<range>);
31-
32-
static_assert(std::same_as<stdr::iterator_t<range const>, range::const_iterator>);
33-
static_assert(stdr::common_range<range const>);
34-
static_assert(stdr::bidirectional_range<range const>);
35-
static_assert(!stdr::view<range const>);
36-
static_assert(!stdr::random_access_range<range const>);
37-
static_assert(stdr::sized_range<range const>);
38-
static_assert(!stdr::borrowed_range<range const>);
39-
static_assert(!stdr::viewable_range<range const>);
21+
22+
23+
static_assert(std::same_as<std::ranges::iterator_t<range>, range::iterator>);
24+
static_assert(std::ranges::common_range<range>);
25+
static_assert(std::ranges::bidirectional_range<range>);
26+
static_assert(!std::ranges::view<range>);
27+
static_assert(!std::ranges::random_access_range<range>);
28+
static_assert(std::ranges::sized_range<range>);
29+
static_assert(!std::ranges::borrowed_range<range>);
30+
static_assert(!std::ranges::viewable_range<range>);
31+
32+
static_assert(std::same_as<std::ranges::iterator_t<range const>, range::const_iterator>);
33+
static_assert(std::ranges::common_range<range const>);
34+
static_assert(std::ranges::bidirectional_range<range const>);
35+
static_assert(!std::ranges::view<range const>);
36+
static_assert(!std::ranges::random_access_range<range const>);
37+
static_assert(std::ranges::sized_range<range const>);
38+
static_assert(!std::ranges::borrowed_range<range const>);
39+
static_assert(!std::ranges::viewable_range<range const>);

‎libcxx/test/std/containers/sequences/vector.bool/range_concept_conformance.compile.pass.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
#include <ranges>
1919

2020
using range = std::vector<bool>;
21-
namespace stdr = std::ranges;
22-
23-
static_assert(std::same_as<stdr::iterator_t<range>, range::iterator>);
24-
static_assert(stdr::common_range<range>);
25-
static_assert(stdr::random_access_range<range>);
26-
static_assert(!stdr::contiguous_range<range>);
27-
static_assert(!stdr::view<range>);
28-
static_assert(stdr::sized_range<range>);
29-
static_assert(!stdr::borrowed_range<range>);
30-
static_assert(!stdr::viewable_range<range>);
31-
32-
static_assert(std::same_as<stdr::iterator_t<range const>, range::const_iterator>);
33-
static_assert(stdr::common_range<range const>);
34-
static_assert(stdr::random_access_range<range const>);
35-
static_assert(!stdr::contiguous_range<range const>);
36-
static_assert(!stdr::view<range const>);
37-
static_assert(stdr::sized_range<range const>);
38-
static_assert(!stdr::borrowed_range<range const>);
39-
static_assert(!stdr::viewable_range<range const>);
21+
22+
23+
static_assert(std::same_as<std::ranges::iterator_t<range>, range::iterator>);
24+
static_assert(std::ranges::common_range<range>);
25+
static_assert(std::ranges::random_access_range<range>);
26+
static_assert(!std::ranges::contiguous_range<range>);
27+
static_assert(!std::ranges::view<range>);
28+
static_assert(std::ranges::sized_range<range>);
29+
static_assert(!std::ranges::borrowed_range<range>);
30+
static_assert(!std::ranges::viewable_range<range>);
31+
32+
static_assert(std::same_as<std::ranges::iterator_t<range const>, range::const_iterator>);
33+
static_assert(std::ranges::common_range<range const>);
34+
static_assert(std::ranges::random_access_range<range const>);
35+
static_assert(!std::ranges::contiguous_range<range const>);
36+
static_assert(!std::ranges::view<range const>);
37+
static_assert(std::ranges::sized_range<range const>);
38+
static_assert(!std::ranges::borrowed_range<range const>);
39+
static_assert(!std::ranges::viewable_range<range const>);

0 commit comments

Comments
 (0)