Skip to content

Commit 52a93dc

Browse files
committed
get rid of auto
1 parent dad914f commit 52a93dc

File tree

10 files changed

+59
-51
lines changed

10 files changed

+59
-51
lines changed

libcxx/test/std/ranges/range.adaptors/range.chunk/adaptor.pass.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "types.h"
2424

2525
constexpr bool test() {
26-
std::array array = {1, 2, 3, 4, 5, 6, 7, 8};
27-
auto view = array | std::views::all;
26+
std::array<int,8> array = {1, 2, 3, 4, 5, 6, 7, 8};
27+
std::ranges::ref_view<std::array<int,8>> view = array | std::views::all;
2828

2929
// Test `views::chunk(view, n)`
3030
{
@@ -39,7 +39,7 @@ constexpr bool test() {
3939
// Test `views::chunk(n)(range)`
4040
{
4141
static_assert(noexcept(std::views::chunk(2)));
42-
auto adaptor = std::views::chunk(3);
42+
/*__pipable*/ auto adaptor = std::views::chunk(3);
4343
std::same_as<std::ranges::chunk_view<std::ranges::ref_view<std::array<int, 8>>>> decltype(auto) chunked =
4444
adaptor(view);
4545
assert(std::ranges::equal(*chunked.begin(), std::array{1, 2, 3}));
@@ -60,7 +60,7 @@ constexpr bool test() {
6060

6161
// Test `views::chunk | adaptor`
6262
{
63-
auto adaptors = std::views::chunk(5) | std::views::join;
63+
/*__pipable*/ auto adaptors = std::views::chunk(5) | std::views::join;
6464
std::ranges::input_range auto rejoined = view | adaptors;
6565
assert(std::ranges::equal(rejoined, view));
6666
std::ranges::input_range auto const_rejoined = std::as_const(view) | adaptors;

libcxx/test/std/ranges/range.adaptors/range.chunk/base.pass.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include "test_range.h"
2323

2424
constexpr bool test() {
25-
std::array array = {1, 2, 3, 4, 5, 6, 7, 8};
26-
auto chunked = array | std::views::chunk(3);
27-
auto const_chunked = std::as_const(array) | std::views::chunk(4);
25+
std::array<int,8> array = {1, 2, 3, 4, 5, 6, 7, 8};
26+
std::ranges::chunk_view<std::ranges::ref_view<std::array<int,8>>> chunked = array | std::views::chunk(3);
27+
std::ranges::chunk_view<std::ranges::ref_view<const std::array<int,8>>> const_chunked = std::as_const(array) | std::views::chunk(4);
2828

2929
// Test `chunk_view.base()`
3030
{

libcxx/test/std/ranges/range.adaptors/range.chunk/begin.pass.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include <algorithm>
2121
#include <cassert>
22+
#include <iterator>
2223
#include <ranges>
2324
#include <vector>
2425

@@ -27,13 +28,13 @@
2728

2829
constexpr bool test() {
2930
std::vector<int> vector = {1, 2, 3, 4, 5, 6, 7, 8};
30-
auto chunked = vector | std::views::chunk(3);
31-
auto const_chunked = std::as_const(vector) | std::views::chunk(3);
32-
auto input_chunked = input_span<int>(vector.data(), 8) | std::views::chunk(3);
31+
std::ranges::chunk_view<std::ranges::ref_view<std::vector<int>>> chunked = vector | std::views::chunk(3);
32+
std::ranges::chunk_view<std::ranges::ref_view<const std::vector<int>>> const_chunked = std::as_const(vector) | std::views::chunk(3);
33+
std::ranges::chunk_view<input_span<int>> input_chunked = input_span<int>(vector.data(), 8) | std::views::chunk(3);
3334

3435
// Test `chunk_view.begin()` when V models only input_range
3536
{
36-
auto it = input_chunked.begin();
37+
/*chunk_view::__outer_iterator*/ std::input_iterator auto it = input_chunked.begin();
3738
assert(std::ranges::equal(*it, std::vector{1, 2, 3}));
3839
assert(std::ranges::equal(*++it, std::vector{4, 5, 6}));
3940
assert(std::ranges::equal(*++it, std::vector{7, 8}));
@@ -42,12 +43,12 @@ constexpr bool test() {
4243

4344
// Test `chunk_view.begin()` when V models forward_range
4445
{
45-
auto it = chunked.begin();
46+
/*chunk_view::__iterator<false>*/ std::forward_iterator auto it = chunked.begin();
4647
assert(std::ranges::equal(*it, std::vector{1, 2, 3}));
4748
assert(std::ranges::equal(*++it, std::vector{4, 5, 6}));
4849
assert(std::ranges::equal(*++it, std::vector{7, 8}));
4950
assert(++it == chunked.end());
50-
auto const_it = const_chunked.begin();
51+
/*chunk_view::__iterator<true>*/ std::forward_iterator auto const_it = const_chunked.begin();
5152
assert(std::ranges::equal(*const_it, std::vector{1, 2, 3}));
5253
assert(std::ranges::equal(*++const_it, std::vector{4, 5, 6}));
5354
assert(std::ranges::equal(*++const_it, std::vector{7, 8}));

libcxx/test/std/ranges/range.adaptors/range.chunk/ctad.compile.pass.cpp

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,18 @@ void test_ctad() {
3838
range r;
3939
borrowed_range br;
4040

41-
static_assert(std::same_as<decltype(std::ranges::chunk_view(v, 0)), std::ranges::chunk_view<view>>);
42-
static_assert(std::same_as<decltype(std::ranges::chunk_view(std::move(v), 0)), std::ranges::chunk_view<view>>);
43-
static_assert(
44-
std::same_as< decltype(std::ranges::chunk_view(r, 0)), std::ranges::chunk_view<std::ranges::ref_view<range>>>);
41+
// clang-format off
42+
static_assert(std::same_as<decltype(std::ranges::chunk_view(v, 0)),
43+
std::ranges::chunk_view<view>>);
44+
static_assert(std::same_as<decltype(std::ranges::chunk_view(std::move(v), 0)),
45+
std::ranges::chunk_view<view>>);
46+
static_assert(std::same_as<decltype(std::ranges::chunk_view(r, 0)),
47+
std::ranges::chunk_view<std::ranges::ref_view<range>>>);
4548
static_assert(std::same_as<decltype(std::ranges::chunk_view(std::move(r), 0)),
46-
std::ranges::chunk_view<std::ranges::owning_view<range>>>);
49+
std::ranges::chunk_view<std::ranges::owning_view<range>>>);
4750
static_assert(std::same_as<decltype(std::ranges::chunk_view(br, 0)),
48-
std::ranges::chunk_view<std::ranges::ref_view<borrowed_range>>>);
51+
std::ranges::chunk_view<std::ranges::ref_view<borrowed_range>>>);
4952
static_assert(std::same_as<decltype(std::ranges::chunk_view(std::move(br), 0)),
50-
std::ranges::chunk_view<std::ranges::owning_view<borrowed_range>>>);
53+
std::ranges::chunk_view<std::ranges::owning_view<borrowed_range>>>);
54+
// clang-format on
5155
}

libcxx/test/std/ranges/range.adaptors/range.chunk/end.pass.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929

3030
constexpr bool test() {
3131
std::vector<int> vector = {1, 2, 3, 4, 5, 6, 7, 8};
32-
auto chunked = vector | std::views::chunk(3);
33-
auto const_chunked = std::as_const(vector) | std::views::chunk(3);
34-
auto input_chunked = input_span<int>(vector.data(), 8) | std::views::chunk(3);
32+
std::ranges::chunk_view<std::ranges::ref_view<std::vector<int>>> chunked = vector | std::views::chunk(3);
33+
std::ranges::chunk_view<std::ranges::ref_view<const std::vector<int>>> const_chunked = std::as_const(vector) | std::views::chunk(3);
34+
std::ranges::chunk_view<input_span<int>> input_chunked = input_span<int>(vector.data(), 8) | std::views::chunk(3);
3535

3636
// Test `chunk_view.end()` when V models only input_range
3737
{
@@ -41,12 +41,12 @@ constexpr bool test() {
4141

4242
// Test `chunk_view.end()` when V models forward_range
4343
{
44-
std::random_access_iterator auto it = chunked.end();
44+
/*chunk_view::__iterator<false>*/ std::forward_iterator auto it = chunked.end();
4545
assert(std::ranges::equal(*--it, std::vector{7, 8}));
4646
assert(std::ranges::equal(*--it, std::vector{4, 5, 6}));
4747
assert(std::ranges::equal(*--it, std::vector{1, 2, 3}));
4848
assert(it == chunked.begin());
49-
std::random_access_iterator auto const_it = const_chunked.end();
49+
/*chunk_view::__iterator<true>*/ std::forward_iterator auto const_it = const_chunked.end();
5050
assert(std::ranges::equal(*--const_it, std::vector{7, 8}));
5151
assert(std::ranges::equal(*--const_it, std::vector{4, 5, 6}));
5252
assert(std::ranges::equal(*--const_it, std::vector{1, 2, 3}));

libcxx/test/std/ranges/range.adaptors/range.chunk/general.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "test_range.h"
2121

2222
constexpr bool test() {
23-
auto str = std::string_view("Cheese the chicken chunk by chunk on truck by truck");
23+
std::string_view str = "Cheese with chicken chunk by chunk on truck with my trick";
2424
// clang-format off
2525
auto str2 = str
2626
| std::views::chunk(4)

libcxx/test/std/ranges/range.adaptors/range.chunk/range.chunk.iter/compare.pass.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343

4444
constexpr bool test() {
4545
std::vector<int> vector = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
46-
auto chunked = vector | std::views::chunk(3);
47-
auto input_chunked = input_span<int>(vector) | std::views::chunk(3);
46+
std::ranges::chunk_view<std::ranges::ref_view<std::vector<int>>> chunked = vector | std::views::chunk(3);
47+
std::ranges::chunk_view<input_span<int>> input_chunked = input_span<int>(vector) | std::views::chunk(3);
4848

4949
// Test `friend constexpr bool opreator==(const outer_iterator& x, default_sentinel_t)`
5050
{
51-
auto it = input_chunked.begin();
51+
/*chunk_view::__outer_iterator*/ std::input_iterator auto it = input_chunked.begin();
5252
std::ranges::advance(it, 4);
5353
assert(it == std::default_sentinel);
5454
}

libcxx/test/std/ranges/range.adaptors/range.chunk/range.chunk.iter/decrement.pass.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,32 @@
1919

2020
#include <algorithm>
2121
#include <cassert>
22+
#include <iterator>
2223
#include <ranges>
2324
#include <vector>
2425

2526
#include "test_range.h"
2627

2728
constexpr bool test() {
2829
std::vector<int> vector = {1, 2, 3, 4, 5, 6, 7, 8};
29-
auto chunked = vector | std::views::chunk(2);
30+
std::ranges::chunk_view<std::ranges::ref_view<std::vector<int>>> chunked = vector | std::views::chunk(2);
3031

3132
// Test `constexpr iterator& operator--();`
3233
{
33-
auto it = chunked.end();
34+
/*chunk_view::__outer_iterator*/ std::bidirectional_iterator auto it = chunked.end();
3435
assert(std::ranges::equal(*--it, std::vector{7, 8}));
3536
}
3637

3738
// Test `constexpr iterator operator--(int)`
3839
{
39-
auto it = chunked.end();
40+
/*chunk_view::__outer_iterator*/ std::bidirectional_iterator auto it = chunked.end();
4041
it--;
4142
assert(std::ranges::equal(*it, std::vector{7, 8}));
4243
}
4344

4445
// Test `constexpr iterator& operator-=(difference_type)`
4546
{
46-
auto it = chunked.end();
47+
/*chunk_view::__iterator*/ std::random_access_iterator auto it = chunked.end();
4748
it -= 3;
4849
assert(std::ranges::equal(*it, std::vector{3, 4}));
4950
}

libcxx/test/std/ranges/range.adaptors/range.chunk/range.chunk.iter/deref.pass.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
constexpr bool test() {
3333
std::vector<int> vector = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
34-
auto chunked = vector | std::views::chunk(3);
35-
auto input_chunked = input_span<int>(vector) | std::views::chunk(3);
34+
std::ranges::chunk_view<std::ranges::ref_view<std::vector<int>>> chunked = vector | std::views::chunk(3);
35+
std::ranges::chunk_view<input_span<int>> input_chunked = input_span<int>(vector) | std::views::chunk(3);
3636

3737
// Test `constexpr value_type outer_iterator::operator*() const`
3838
{
@@ -41,28 +41,29 @@ constexpr bool test() {
4141

4242
// Test `constexpr inner_iterator outer_iterator::value_type::begin() const noexcept`
4343
{
44-
auto inner = *input_chunked.begin();
44+
/*chunk_view::__outer_iterator::value_type*/ std::ranges::input_range auto inner = *input_chunked.begin();
4545
assert(*inner.begin() == *vector.begin());
4646
static_assert(noexcept(inner.begin()));
4747
}
4848

4949
// Test `constexpr default_sentinel_t outer_iterator::value_type::end() const noexcept`
5050
{
51-
auto inner = *input_chunked.begin();
51+
/*chunk_view::__outer_iterator::value_type*/ std::ranges::input_range auto inner = *input_chunked.begin();
5252
[[maybe_unused]] std::same_as<std::default_sentinel_t> auto it = inner.end();
5353
static_assert(noexcept((inner.end())));
5454
}
5555

56-
// Test `constexpr range_reference_v<V> inner_iterator::operator*() const`
56+
// Test `constexpr value_type iterator::operator*() const`
5757
{
58-
std::same_as<int&> decltype(auto) v = *(*chunked.begin()).begin();
58+
/*chunk_view::__inner_iterator*/ std::input_iterator auto it = (*input_chunked.begin()).begin();
59+
std::same_as<int> decltype(auto) v = *it;
5960
assert(v == 1);
6061
}
6162

62-
// Test `constexpr value_type iterator::operator*() const`
63+
// Test `constexpr range_reference_v<V> inner_iterator::operator*() const`
6364
{
64-
auto inner = *input_chunked.begin();
65-
assert(*inner.begin() == *vector.begin());
65+
std::same_as<int&> decltype(auto) v = *(*chunked.begin()).begin();
66+
assert(v == 1);
6667
}
6768

6869
return true;

libcxx/test/std/ranges/range.adaptors/range.chunk/range.chunk.iter/increment.pass.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
#include <algorithm>
2626
#include <cassert>
27+
#include <iterator>
2728
#include <ranges>
2829
#include <vector>
2930

@@ -32,53 +33,53 @@
3233

3334
constexpr bool test() {
3435
std::vector<int> vector = {1, 2, 3, 4, 5, 6, 7, 8};
35-
auto chunked = vector | std::views::chunk(2);
36-
auto input_chunked = input_span<int>(vector) | std::views::chunk(2);
36+
std::ranges::chunk_view<std::ranges::ref_view<std::vector<int>>> chunked = vector | std::views::chunk(2);
37+
std::ranges::chunk_view<input_span<int>> input_chunked = input_span<int>(vector) | std::views::chunk(2);
3738

3839
// Test `constexpr outer_iterator& operator++();`
3940
{
40-
auto it = input_chunked.begin();
41+
/*chunk_view::__outer_iterator*/ std::input_iterator auto it = input_chunked.begin();
4142
assert(std::ranges::equal(*++it, std::vector{3, 4}));
4243
}
4344

4445
// Test `constexpr void operator++(int);`
4546
{
46-
auto it = input_chunked.begin();
47+
/*chunk_view::__outer_iterator*/ std::input_iterator auto it = input_chunked.begin();
4748
static_assert(std::same_as<decltype(it++), void>);
4849
it++;
4950
assert(std::ranges::equal(*it, std::vector{3, 4}));
5051
}
5152

5253
// Test `constexpr inner_iterator& operator++();`
5354
{
54-
auto it = (*input_chunked.begin()).begin();
55+
/*chunk_view::__inner_iterator*/ std::input_iterator auto it = (*input_chunked.begin()).begin();
5556
assert(*++it == 2);
5657
}
5758

5859
// Test `constexpr inner_iterator& operator++();`
5960
{
60-
auto it = (*input_chunked.begin()).begin();
61+
/*chunk_view::__inner_iterator*/ std::input_iterator auto it = (*input_chunked.begin()).begin();
6162
static_assert(std::same_as<decltype(it++), void>);
6263
it++;
6364
assert(*it == 2);
6465
}
6566

6667
// Test `constexpr iterator& operator++();`
6768
{
68-
auto it = chunked.begin();
69+
/*chunk_view::__iterator*/ std::forward_iterator auto it = chunked.begin();
6970
assert(std::ranges::equal(*++it, std::vector{3, 4}));
7071
}
7172

7273
// Test `constexpr iterator operator++(int)`
7374
{
74-
auto it = chunked.begin();
75+
/*chunk_view::__iterator*/ std::forward_iterator auto it = chunked.begin();
7576
it++;
7677
assert(std::ranges::equal(*it, std::vector{3, 4}));
7778
}
7879

7980
// Test `constexpr iterator& operator+=(difference_type)`
8081
{
81-
auto it = chunked.begin();
82+
/*chunk_view::__iterator*/ std::random_access_iterator auto it = chunked.begin();
8283
it += 3;
8384
assert(std::ranges::equal(*it, std::vector{7, 8}));
8485
}

0 commit comments

Comments
 (0)