Skip to content

Commit b7e3e7d

Browse files
CaseyCarterCaseyCarter
committed
Remove extraneous std::-qualifications
1 parent de0c756 commit b7e3e7d

File tree

1 file changed

+79
-79
lines changed
  • tests/std/tests/P2278R4_views_as_const

1 file changed

+79
-79
lines changed

‎tests/std/tests/P2278R4_views_as_const/test.cpp‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
6767
if constexpr (CanViewAsConst<Rng&>) {
6868
constexpr bool is_noexcept = !is_view || is_nothrow_copy_constructible_v<V>;
6969

70-
STATIC_ASSERT(same_as<decltype(views::as_const(std::forward<Rng>(rng))), V>);
71-
STATIC_ASSERT(noexcept(views::as_const(std::forward<Rng>(rng))) == is_noexcept);
70+
STATIC_ASSERT(same_as<decltype(views::as_const(forward<Rng>(rng))), V>);
71+
STATIC_ASSERT(noexcept(views::as_const(forward<Rng>(rng))) == is_noexcept);
7272

73-
STATIC_ASSERT(same_as<decltype(std::forward<Rng>(rng) | views::as_const), V>);
74-
STATIC_ASSERT(noexcept(std::forward<Rng>(rng) | views::as_const) == is_noexcept);
73+
STATIC_ASSERT(same_as<decltype(forward<Rng>(rng) | views::as_const), V>);
74+
STATIC_ASSERT(noexcept(forward<Rng>(rng) | views::as_const) == is_noexcept);
7575
}
7676

7777
// ... with const lvalue argument
@@ -93,34 +93,34 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
9393
using VS = views::all_t<remove_reference_t<Rng>>;
9494
constexpr bool is_noexcept = is_nothrow_move_constructible_v<V>;
9595

96-
STATIC_ASSERT(same_as<decltype(views::as_const(std::move(rng))), VS>);
97-
STATIC_ASSERT(noexcept(views::as_const(std::move(rng))) == is_noexcept);
96+
STATIC_ASSERT(same_as<decltype(views::as_const(move(rng))), VS>);
97+
STATIC_ASSERT(noexcept(views::as_const(move(rng))) == is_noexcept);
9898

99-
STATIC_ASSERT(same_as<decltype(std::move(rng) | views::as_const), VS>);
100-
STATIC_ASSERT(noexcept(std::move(rng) | views::as_const) == is_noexcept);
99+
STATIC_ASSERT(same_as<decltype(move(rng) | views::as_const), VS>);
100+
STATIC_ASSERT(noexcept(move(rng) | views::as_const) == is_noexcept);
101101
}
102102

103103
// ... with const rvalue argument
104104
STATIC_ASSERT(CanViewAsConst<const remove_reference_t<Rng>> == (is_view && copy_constructible<V>) );
105105
if constexpr (CanViewAsConst<const remove_reference_t<Rng>>) {
106106
constexpr bool is_noexcept = is_nothrow_copy_constructible_v<V>;
107107

108-
STATIC_ASSERT(same_as<decltype(views::as_const(std::move(as_const(rng)))), V>);
109-
STATIC_ASSERT(noexcept(views::as_const(std::move(as_const(rng)))) == is_noexcept);
108+
STATIC_ASSERT(same_as<decltype(views::as_const(move(as_const(rng)))), V>);
109+
STATIC_ASSERT(noexcept(views::as_const(move(as_const(rng)))) == is_noexcept);
110110

111-
STATIC_ASSERT(same_as<decltype(std::move(as_const(rng)) | views::as_const), V>);
112-
STATIC_ASSERT(noexcept(std::move(as_const(rng)) | views::as_const) == is_noexcept);
111+
STATIC_ASSERT(same_as<decltype(move(as_const(rng)) | views::as_const), V>);
112+
STATIC_ASSERT(noexcept(move(as_const(rng)) | views::as_const) == is_noexcept);
113113
}
114114
} else if constexpr (_Is_specialization_v<remove_cvref_t<Rng>, ranges::empty_view>) {
115115
// range adaptor results in empty_view<const X> reconstructed from empty_view<X>
116116
using ConstEmpty = ranges::empty_view<const ranges::range_value_t<Rng>>;
117117

118118
{ // ... with lvalue argument
119-
STATIC_ASSERT(same_as<decltype(views::as_const(std::forward<Rng>(rng))), ConstEmpty>);
120-
STATIC_ASSERT(noexcept(views::as_const(std::forward<Rng>(rng))));
119+
STATIC_ASSERT(same_as<decltype(views::as_const(forward<Rng>(rng))), ConstEmpty>);
120+
STATIC_ASSERT(noexcept(views::as_const(forward<Rng>(rng))));
121121

122-
STATIC_ASSERT(same_as<decltype(std::forward<Rng>(rng) | views::as_const), ConstEmpty>);
123-
STATIC_ASSERT(noexcept(std::forward<Rng>(rng) | views::as_const));
122+
STATIC_ASSERT(same_as<decltype(forward<Rng>(rng) | views::as_const), ConstEmpty>);
123+
STATIC_ASSERT(noexcept(forward<Rng>(rng) | views::as_const));
124124
}
125125

126126
{ // ... with const lvalue argument
@@ -132,88 +132,88 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
132132
}
133133

134134
{ // ... with rvalue argument
135-
STATIC_ASSERT(same_as<decltype(views::as_const(std::move(rng))), ConstEmpty>);
136-
STATIC_ASSERT(noexcept(views::as_const(std::move(rng))));
135+
STATIC_ASSERT(same_as<decltype(views::as_const(move(rng))), ConstEmpty>);
136+
STATIC_ASSERT(noexcept(views::as_const(move(rng))));
137137

138-
STATIC_ASSERT(same_as<decltype(std::move(rng) | views::as_const), ConstEmpty>);
139-
STATIC_ASSERT(noexcept(std::move(rng) | views::as_const));
138+
STATIC_ASSERT(same_as<decltype(move(rng) | views::as_const), ConstEmpty>);
139+
STATIC_ASSERT(noexcept(move(rng) | views::as_const));
140140
}
141141

142142
{ // ... with const rvalue argument
143-
STATIC_ASSERT(same_as<decltype(views::as_const(std::move(as_const(rng)))), ConstEmpty>);
144-
STATIC_ASSERT(noexcept(views::as_const(std::move(as_const(rng)))));
143+
STATIC_ASSERT(same_as<decltype(views::as_const(move(as_const(rng)))), ConstEmpty>);
144+
STATIC_ASSERT(noexcept(views::as_const(move(as_const(rng)))));
145145

146-
STATIC_ASSERT(same_as<decltype(std::move(as_const(rng)) | views::as_const), ConstEmpty>);
147-
STATIC_ASSERT(noexcept(std::move(as_const(rng)) | views::as_const));
146+
STATIC_ASSERT(same_as<decltype(move(as_const(rng)) | views::as_const), ConstEmpty>);
147+
STATIC_ASSERT(noexcept(move(as_const(rng)) | views::as_const));
148148
}
149149
} else if constexpr (_Is_span_v<Rng>) { // range adaptor results in span<const X, E> reconstructed from span<X, E>
150150
using ConstSpan = span<const typename V::element_type, V::extent>;
151151

152152
{ // ... with lvalue argument
153-
STATIC_ASSERT(same_as<decltype(views::as_const(std::forward<Rng>(rng))), ConstSpan>);
154-
STATIC_ASSERT(noexcept(views::as_const(std::forward<Rng>(rng))));
153+
STATIC_ASSERT(same_as<decltype(views::as_const(forward<Rng>(rng))), ConstSpan>);
154+
STATIC_ASSERT(noexcept(views::as_const(forward<Rng>(rng))));
155155

156-
STATIC_ASSERT(same_as<decltype(std::forward<Rng>(rng) | views::as_const), ConstSpan>);
157-
STATIC_ASSERT(noexcept(std::forward<Rng>(rng) | views::as_const));
156+
STATIC_ASSERT(same_as<decltype(forward<Rng>(rng) | views::as_const), ConstSpan>);
157+
STATIC_ASSERT(noexcept(forward<Rng>(rng) | views::as_const));
158158
}
159159

160160
{ // ... with const lvalue argument
161-
STATIC_ASSERT(same_as<decltype(views::as_const(std::as_const(rng))), ConstSpan>);
162-
STATIC_ASSERT(noexcept(views::as_const(std::as_const(rng))));
161+
STATIC_ASSERT(same_as<decltype(views::as_const(as_const(rng))), ConstSpan>);
162+
STATIC_ASSERT(noexcept(views::as_const(as_const(rng))));
163163

164-
STATIC_ASSERT(same_as<decltype(std::as_const(rng) | views::as_const), ConstSpan>);
165-
STATIC_ASSERT(noexcept(std::as_const(rng) | views::as_const));
164+
STATIC_ASSERT(same_as<decltype(as_const(rng) | views::as_const), ConstSpan>);
165+
STATIC_ASSERT(noexcept(as_const(rng) | views::as_const));
166166
}
167167

168168
{ // ... with rvalue argument
169-
STATIC_ASSERT(same_as<decltype(views::as_const(std::move(rng))), ConstSpan>);
170-
STATIC_ASSERT(noexcept(views::as_const(std::move(rng))));
169+
STATIC_ASSERT(same_as<decltype(views::as_const(move(rng))), ConstSpan>);
170+
STATIC_ASSERT(noexcept(views::as_const(move(rng))));
171171

172-
STATIC_ASSERT(same_as<decltype(std::move(rng) | views::as_const), ConstSpan>);
173-
STATIC_ASSERT(noexcept(std::move(rng) | views::as_const));
172+
STATIC_ASSERT(same_as<decltype(move(rng) | views::as_const), ConstSpan>);
173+
STATIC_ASSERT(noexcept(move(rng) | views::as_const));
174174
}
175175

176176
{ // ... with const rvalue argument
177-
STATIC_ASSERT(same_as<decltype(views::as_const(std::move(std::as_const(rng)))), ConstSpan>);
178-
STATIC_ASSERT(noexcept(views::as_const(std::move(std::as_const(rng)))));
177+
STATIC_ASSERT(same_as<decltype(views::as_const(move(as_const(rng)))), ConstSpan>);
178+
STATIC_ASSERT(noexcept(views::as_const(move(as_const(rng)))));
179179

180-
STATIC_ASSERT(same_as<decltype(std::move(std::as_const(rng)) | views::as_const), ConstSpan>);
181-
STATIC_ASSERT(noexcept(std::move(std::as_const(rng)) | views::as_const));
180+
STATIC_ASSERT(same_as<decltype(move(as_const(rng)) | views::as_const), ConstSpan>);
181+
STATIC_ASSERT(noexcept(move(as_const(rng)) | views::as_const));
182182
}
183183
} else if constexpr (CanReconstructRefView<Rng>) {
184184
// range adaptor results in ref_view<const X> reconstructed from ref_view<X>
185185
using ReconstructedRefView = ref_view<const typename RefViewUnderlyingType<V>::type>;
186186

187187
{ // ... with lvalue argument
188-
STATIC_ASSERT(same_as<decltype(views::as_const(std::forward<Rng>(rng))), ReconstructedRefView>);
189-
STATIC_ASSERT(noexcept(views::as_const(std::forward<Rng>(rng))));
188+
STATIC_ASSERT(same_as<decltype(views::as_const(forward<Rng>(rng))), ReconstructedRefView>);
189+
STATIC_ASSERT(noexcept(views::as_const(forward<Rng>(rng))));
190190

191-
STATIC_ASSERT(same_as<decltype(std::forward<Rng>(rng) | views::as_const), ReconstructedRefView>);
192-
STATIC_ASSERT(noexcept(std::forward<Rng>(rng) | views::as_const));
191+
STATIC_ASSERT(same_as<decltype(forward<Rng>(rng) | views::as_const), ReconstructedRefView>);
192+
STATIC_ASSERT(noexcept(forward<Rng>(rng) | views::as_const));
193193
}
194194

195195
{ // ... with const lvalue argument
196-
STATIC_ASSERT(same_as<decltype(views::as_const(std::as_const(rng))), ReconstructedRefView>);
197-
STATIC_ASSERT(noexcept(views::as_const(std::as_const(rng))));
196+
STATIC_ASSERT(same_as<decltype(views::as_const(as_const(rng))), ReconstructedRefView>);
197+
STATIC_ASSERT(noexcept(views::as_const(as_const(rng))));
198198

199-
STATIC_ASSERT(same_as<decltype(std::as_const(rng) | views::as_const), ReconstructedRefView>);
200-
STATIC_ASSERT(noexcept(std::as_const(rng) | views::as_const));
199+
STATIC_ASSERT(same_as<decltype(as_const(rng) | views::as_const), ReconstructedRefView>);
200+
STATIC_ASSERT(noexcept(as_const(rng) | views::as_const));
201201
}
202202

203203
{ //... with rvalue argument
204-
STATIC_ASSERT(same_as<decltype(views::as_const(std::move(rng))), ReconstructedRefView>);
205-
STATIC_ASSERT(noexcept(views::as_const(std::move(rng))));
204+
STATIC_ASSERT(same_as<decltype(views::as_const(move(rng))), ReconstructedRefView>);
205+
STATIC_ASSERT(noexcept(views::as_const(move(rng))));
206206

207-
STATIC_ASSERT(same_as<decltype(std::move(rng) | views::as_const), ReconstructedRefView>);
208-
STATIC_ASSERT(noexcept(std::move(rng) | views::as_const));
207+
STATIC_ASSERT(same_as<decltype(move(rng) | views::as_const), ReconstructedRefView>);
208+
STATIC_ASSERT(noexcept(move(rng) | views::as_const));
209209
}
210210

211211
{ // ... with const rvalue argument
212-
STATIC_ASSERT(same_as<decltype(views::as_const(std::move(std::as_const(rng)))), ReconstructedRefView>);
213-
STATIC_ASSERT(noexcept(views::as_const(std::move(std::as_const(rng)))));
212+
STATIC_ASSERT(same_as<decltype(views::as_const(move(as_const(rng)))), ReconstructedRefView>);
213+
STATIC_ASSERT(noexcept(views::as_const(move(as_const(rng)))));
214214

215-
STATIC_ASSERT(same_as<decltype(std::move(std::as_const(rng)) | views::as_const), ReconstructedRefView>);
216-
STATIC_ASSERT(noexcept(std::move(std::as_const(rng)) | views::as_const));
215+
STATIC_ASSERT(same_as<decltype(move(as_const(rng)) | views::as_const), ReconstructedRefView>);
216+
STATIC_ASSERT(noexcept(move(as_const(rng)) | views::as_const));
217217
}
218218
} else if constexpr (is_lvalue_reference_v<Rng> && constant_range<const remove_cvref_t<Rng>>
219219
&& !is_view) { // range adaptor results in ref_view<const X>
@@ -222,11 +222,11 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
222222
// ... with lvalue argument
223223
STATIC_ASSERT(CanViewAsConst<Rng&> == copy_constructible<V>);
224224
if constexpr (CanViewAsConst<Rng&>) {
225-
STATIC_ASSERT(same_as<decltype(views::as_const(std::forward<Rng>(rng))), ConstRefView>);
226-
STATIC_ASSERT(noexcept(views::as_const(std::forward<Rng>(rng))));
225+
STATIC_ASSERT(same_as<decltype(views::as_const(forward<Rng>(rng))), ConstRefView>);
226+
STATIC_ASSERT(noexcept(views::as_const(forward<Rng>(rng))));
227227

228-
STATIC_ASSERT(same_as<decltype(std::forward<Rng>(rng) | views::as_const), ConstRefView>);
229-
STATIC_ASSERT(noexcept(std::forward<Rng>(rng) | views::as_const));
228+
STATIC_ASSERT(same_as<decltype(forward<Rng>(rng) | views::as_const), ConstRefView>);
229+
STATIC_ASSERT(noexcept(forward<Rng>(rng) | views::as_const));
230230
}
231231

232232
// ... with const lvalue argument
@@ -244,11 +244,11 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
244244
if constexpr (CanViewAsConst<Rng&>) {
245245
constexpr bool is_noexcept = !is_view || is_nothrow_copy_constructible_v<V>;
246246

247-
STATIC_ASSERT(same_as<decltype(views::as_const(std::forward<Rng>(rng))), R>);
248-
STATIC_ASSERT(noexcept(views::as_const(std::forward<Rng>(rng))) == is_noexcept);
247+
STATIC_ASSERT(same_as<decltype(views::as_const(forward<Rng>(rng))), R>);
248+
STATIC_ASSERT(noexcept(views::as_const(forward<Rng>(rng))) == is_noexcept);
249249

250-
STATIC_ASSERT(same_as<decltype(std::forward<Rng>(rng) | views::as_const), R>);
251-
STATIC_ASSERT(noexcept(std::forward<Rng>(rng) | views::as_const) == is_noexcept);
250+
STATIC_ASSERT(same_as<decltype(forward<Rng>(rng) | views::as_const), R>);
251+
STATIC_ASSERT(noexcept(forward<Rng>(rng) | views::as_const) == is_noexcept);
252252
}
253253

254254
// ... with const lvalue argument
@@ -258,11 +258,11 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
258258
using RC = as_const_view<views::all_t<const remove_reference_t<Rng>&>>;
259259
constexpr bool is_noexcept = !is_view || is_nothrow_copy_constructible_v<V>;
260260

261-
STATIC_ASSERT(same_as<decltype(views::as_const(std::as_const(rng))), RC>);
262-
STATIC_ASSERT(noexcept(views::as_const(std::as_const(rng))) == is_noexcept);
261+
STATIC_ASSERT(same_as<decltype(views::as_const(as_const(rng))), RC>);
262+
STATIC_ASSERT(noexcept(views::as_const(as_const(rng))) == is_noexcept);
263263

264-
STATIC_ASSERT(same_as<decltype(std::as_const(rng) | views::as_const), RC>);
265-
STATIC_ASSERT(noexcept(std::as_const(rng) | views::as_const) == is_noexcept);
264+
STATIC_ASSERT(same_as<decltype(as_const(rng) | views::as_const), RC>);
265+
STATIC_ASSERT(noexcept(as_const(rng) | views::as_const) == is_noexcept);
266266
}
267267

268268
// ... with rvalue argument
@@ -271,28 +271,28 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
271271
using RS = as_const_view<views::all_t<remove_reference_t<Rng>>>;
272272
constexpr bool is_noexcept = is_nothrow_move_constructible_v<V>;
273273

274-
STATIC_ASSERT(same_as<decltype(views::as_const(std::move(rng))), RS>);
275-
STATIC_ASSERT(noexcept(views::as_const(std::move(rng))) == is_noexcept);
274+
STATIC_ASSERT(same_as<decltype(views::as_const(move(rng))), RS>);
275+
STATIC_ASSERT(noexcept(views::as_const(move(rng))) == is_noexcept);
276276

277-
STATIC_ASSERT(same_as<decltype(std::move(rng) | views::as_const), RS>);
278-
STATIC_ASSERT(noexcept(std::move(rng) | views::as_const) == is_noexcept);
277+
STATIC_ASSERT(same_as<decltype(move(rng) | views::as_const), RS>);
278+
STATIC_ASSERT(noexcept(move(rng) | views::as_const) == is_noexcept);
279279
}
280280

281281
// ... with const rvalue argument
282282
STATIC_ASSERT(CanViewAsConst<const remove_reference_t<Rng>> == (is_view && copy_constructible<V>) );
283283
if constexpr (CanViewAsConst<const remove_reference_t<Rng>>) {
284284
constexpr bool is_noexcept = is_nothrow_copy_constructible_v<V>;
285285

286-
STATIC_ASSERT(same_as<decltype(views::as_const(std::move(std::as_const(rng)))), R>);
287-
STATIC_ASSERT(noexcept(views::as_const(std::move(std::as_const(rng)))) == is_noexcept);
286+
STATIC_ASSERT(same_as<decltype(views::as_const(move(as_const(rng)))), R>);
287+
STATIC_ASSERT(noexcept(views::as_const(move(as_const(rng)))) == is_noexcept);
288288

289-
STATIC_ASSERT(same_as<decltype(std::move(std::as_const(rng)) | views::as_const), R>);
290-
STATIC_ASSERT(noexcept(std::move(std::as_const(rng)) | views::as_const) == is_noexcept);
289+
STATIC_ASSERT(same_as<decltype(move(as_const(rng)) | views::as_const), R>);
290+
STATIC_ASSERT(noexcept(move(as_const(rng)) | views::as_const) == is_noexcept);
291291
}
292292
}
293293

294294
// Validate deduction guide
295-
same_as<R> auto r = as_const_view{std::forward<Rng>(rng)};
295+
same_as<R> auto r = as_const_view{forward<Rng>(rng)};
296296

297297
// Validate as_const_view::size
298298
STATIC_ASSERT(CanMemberSize<R> == sized_range<V>);
@@ -472,8 +472,8 @@ constexpr bool test_one(Rng&& rng, Expected&& expected) {
472472
}
473473

474474
// Validate as_const_view::base() &&
475-
same_as<V> auto b2 = std::move(r).base();
476-
STATIC_ASSERT(noexcept(std::move(r).base()) == is_nothrow_move_constructible_v<V>);
475+
same_as<V> auto b2 = move(r).base();
476+
STATIC_ASSERT(noexcept(move(r).base()) == is_nothrow_move_constructible_v<V>);
477477
if (!is_empty) {
478478
assert(*b2.begin() == *begin(expected));
479479
}

0 commit comments

Comments
 (0)