Skip to content

Commit 1cdc9bf

Browse files
committed
More formatting
1 parent a5515db commit 1cdc9bf

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

libcxx/include/__algorithm/ranges_fold.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ inline constexpr auto fold_left = __fold_left();
124124

125125
struct __fold_left_first_with_iter {
126126
template <input_iterator _Ip, sentinel_for<_Ip> _Sp, __indirectly_binary_left_foldable<iter_value_t<_Ip>, _Ip> _Fp>
127-
requires constructible_from<iter_value_t<_Ip>, iter_reference_t<_Ip>>
127+
requires constructible_from<iter_value_t<_Ip>, iter_reference_t<_Ip>>
128128
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Ip __first, _Sp __last, _Fp __f) {
129129
using _Up = decltype(fold_left(std::move(__first), __last, iter_value_t<_Ip>(*__first), __f));
130130

@@ -142,26 +142,27 @@ struct __fold_left_first_with_iter {
142142
}
143143

144144
template <input_range _Rp, __indirectly_binary_left_foldable<range_value_t<_Rp>, iterator_t<_Rp>> _Fp>
145-
requires constructible_from<range_value_t<_Rp>, range_reference_t<_Rp>>
145+
requires constructible_from<range_value_t<_Rp>, range_reference_t<_Rp>>
146146
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Rp&& __r, _Fp __f) {
147147
auto __result = operator()(ranges::begin(__r), ranges::end(__r), std::ref(__f));
148148

149149
using _Up = decltype(fold_left(ranges::begin(__r), ranges::end(__r), range_value_t<_Rp>(*ranges::begin(__r)), __f));
150-
return fold_left_first_with_iter_result<borrowed_iterator_t<_Rp>, optional<_Up>>{std::move(__result.in), optional(std::move(__result.value))};
150+
return fold_left_first_with_iter_result<borrowed_iterator_t<_Rp>, optional<_Up>>{
151+
std::move(__result.in), optional(std::move(__result.value))};
151152
}
152153
};
153154

154155
inline constexpr auto fold_left_first_with_iter = __fold_left_first_with_iter();
155156

156157
struct __fold_left_first {
157158
template <input_iterator _Ip, sentinel_for<_Ip> _Sp, __indirectly_binary_left_foldable<iter_value_t<_Ip>, _Ip> _Fp>
158-
requires constructible_from<iter_value_t<_Ip>, iter_reference_t<_Ip>>
159+
requires constructible_from<iter_value_t<_Ip>, iter_reference_t<_Ip>>
159160
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Ip __first, _Sp __last, _Fp __f) {
160161
return fold_left_first_with_iter(std::move(__first), std::move(__last), std::ref(__f)).value;
161162
}
162163

163164
template <input_range _Rp, __indirectly_binary_left_foldable<range_value_t<_Rp>, iterator_t<_Rp>> _Fp>
164-
requires constructible_from<range_value_t<_Rp>, range_reference_t<_Rp>>
165+
requires constructible_from<range_value_t<_Rp>, range_reference_t<_Rp>>
165166
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Rp&& __r, _Fp __f) {
166167
return fold_left_first_with_iter(ranges::begin(__r), ranges::end(__r), std::ref(__f)).value;
167168
}

libcxx/test/std/algorithms/alg.nonmodifying/alg.fold/left_folds.pass.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252

5353
using std::ranges::fold_left;
5454
using std::ranges::fold_left_first;
55-
using std::ranges::fold_left_with_iter;
5655
using std::ranges::fold_left_first_with_iter;
56+
using std::ranges::fold_left_with_iter;
5757

5858
template <class Result, class Range, class T>
5959
concept is_in_value_result =
@@ -112,21 +112,23 @@ template <std::ranges::input_range R, class F, std::equality_comparable Expected
112112
requires std::copyable<R>
113113
constexpr void check_iterator(R& r, F f, std::optional<Expected> const& expected) {
114114
{
115-
is_in_value_result<R, std::optional<Expected>> decltype(auto) result = fold_left_first_with_iter(r.begin(), r.end(), f);
115+
is_in_value_result<R, std::optional<Expected>> decltype(auto) result =
116+
fold_left_first_with_iter(r.begin(), r.end(), f);
116117
assert(result.in == r.end());
117118
assert(result.value == expected);
118119
}
119120

120121
{
121-
auto telemetry = invocable_telemetry();
122-
auto f2 = invocable_with_telemetry(f, telemetry);
123-
is_in_value_result<R, std::optional<Expected>> decltype(auto) result = fold_left_first_with_iter(r.begin(), r.end(), f2);
122+
auto telemetry = invocable_telemetry();
123+
auto f2 = invocable_with_telemetry(f, telemetry);
124+
is_in_value_result<R, std::optional<Expected>> decltype(auto) result =
125+
fold_left_first_with_iter(r.begin(), r.end(), f2);
124126
assert(result.in == r.end());
125127
assert(result.value == expected);
126128
if (result.value.has_value()) {
127-
assert(telemetry.invocations == std::ranges::distance(r) - 1);
128-
assert(telemetry.moves == 0);
129-
assert(telemetry.copies == 1);
129+
assert(telemetry.invocations == std::ranges::distance(r) - 1);
130+
assert(telemetry.moves == 0);
131+
assert(telemetry.copies == 1);
130132
}
131133
}
132134

@@ -136,19 +138,18 @@ constexpr void check_iterator(R& r, F f, std::optional<Expected> const& expected
136138
}
137139

138140
{
139-
auto telemetry = invocable_telemetry();
140-
auto f2 = invocable_with_telemetry(f, telemetry);
141+
auto telemetry = invocable_telemetry();
142+
auto f2 = invocable_with_telemetry(f, telemetry);
141143
std::same_as<std::optional<Expected>> decltype(auto) result = fold_left_first(r.begin(), r.end(), f2);
142144
assert(result == expected);
143145
if (result.has_value()) {
144-
assert(telemetry.invocations == std::ranges::distance(r) - 1);
145-
assert(telemetry.moves == 0);
146-
assert(telemetry.copies == 1);
146+
assert(telemetry.invocations == std::ranges::distance(r) - 1);
147+
assert(telemetry.moves == 0);
148+
assert(telemetry.copies == 1);
147149
}
148150
}
149151
}
150152

151-
152153
template <std::ranges::input_range R, class T, class F, std::equality_comparable Expected>
153154
requires std::copyable<R>
154155
constexpr void check_lvalue_range(R& r, T const& init, F f, Expected const& expected) {

0 commit comments

Comments
 (0)