Skip to content

Commit 967dee5

Browse files
ldionneldionne
committed
Fix test that got broken by clang-format
1 parent 1ad77df commit 967dee5

File tree

1 file changed

+30
-48
lines changed

1 file changed

+30
-48
lines changed

‎libcxx/test/libcxx/algorithms/cpp17_iterator_concepts.verify.cpp

Lines changed: 30 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,13 @@ bool operator==(not_unequality_comparable, not_unequality_comparable);
114114
bool operator!=(not_unequality_comparable, not_unequality_comparable) = delete;
115115

116116
void check_input_iterator_requirements() {
117+
// clang-format off
117118
_LIBCPP_REQUIRE_CPP17_INPUT_ITERATOR(not_equality_comparable, ""); // expected-error {{static assertion failed}}
118119
// expected-note@*:* {{'__lhs == __rhs' would be invalid: overload resolution selected deleted operator '=='}}
119120

120121
_LIBCPP_REQUIRE_CPP17_INPUT_ITERATOR(not_unequality_comparable, ""); // expected-error {{static assertion failed}}
121122
// expected-note@*:* {{'__lhs != __rhs' would be invalid: overload resolution selected deleted operator '!='}}
123+
// clang-format on
122124
}
123125

124126
template <class Derived>
@@ -165,13 +167,14 @@ struct not_returning_iter_reference : valid_forward_iterator<not_returning_iter_
165167
};
166168

167169
void check_bidirectional_iterator_requirements() {
170+
// clang-format off
168171
_LIBCPP_REQUIRE_CPP17_BIDIRECTIONAL_ITERATOR(missing_predecrement, ""); // expected-error {{static assertion failed}}
169172
// expected-note@*:* {{cannot decrement value of type 'missing_predecrement'}}
170173
_LIBCPP_REQUIRE_CPP17_BIDIRECTIONAL_ITERATOR(missing_postdecrement, ""); // expected-error {{static assertion failed}}
171174
// expected-note@*:* {{cannot decrement value of type 'missing_postdecrement'}}
172-
_LIBCPP_REQUIRE_CPP17_BIDIRECTIONAL_ITERATOR(
173-
not_returning_iter_reference, ""); // expected-error {{static assertion failed}}
175+
_LIBCPP_REQUIRE_CPP17_BIDIRECTIONAL_ITERATOR(not_returning_iter_reference, ""); // expected-error {{static assertion failed}}
174176
// expected-note@*:* {{because type constraint 'same_as<int, __iter_reference<not_returning_iter_reference> >' was not satisfied}}
177+
// clang-format on
175178
}
176179

177180
template <class Derived>
@@ -359,85 +362,64 @@ struct missing_const_const_greater_eq : valid_random_access_iterator<missing_con
359362
};
360363

361364
void check_random_access_iterator() {
365+
// clang-format off
362366
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_plus_equals, ""); // expected-error {{static assertion failed}}
363367
// expected-note@*:* {{because '__iter += __n' would be invalid: overload resolution selected deleted operator '+='}}
364368
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_minus_equals, ""); // expected-error {{static assertion failed}}
365369
// expected-note@*:* {{because '__iter -= __n' would be invalid: overload resolution selected deleted operator '-='}}
366-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
367-
missing_plus_iter_diff, ""); // expected-error {{static assertion failed}}
370+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_plus_iter_diff, ""); // expected-error {{static assertion failed}}
368371
// expected-note@*:* {{because '__iter + __n' would be invalid: overload resolution selected deleted operator '+'}}
369-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
370-
missing_plus_diff_iter, ""); // expected-error {{static assertion failed}}
372+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_plus_diff_iter, ""); // expected-error {{static assertion failed}}
371373
// expected-note@*:* {{because '__n + __iter' would be invalid: overload resolution selected deleted operator '+'}}
372-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
373-
missing_plus_iter_diff_const_mut, ""); // expected-error {{static assertion failed}}
374+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_plus_iter_diff_const_mut, ""); // expected-error {{static assertion failed}}
374375
// expected-note@*:* {{because 'std::as_const(__iter) + __n' would be invalid: overload resolution selected deleted operator '+'}}
375-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
376-
missing_plus_iter_diff_mut_const, ""); // expected-error {{static assertion failed}}
376+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_plus_iter_diff_mut_const, ""); // expected-error {{static assertion failed}}
377377
// expected-note@*:* {{because '__n + std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '+'}}
378-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
379-
missing_minus_iter_diff_const, ""); // expected-error {{static assertion failed}}
378+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_minus_iter_diff_const, ""); // expected-error {{static assertion failed}}
380379
// expected-note@*:* {{because 'std::as_const(__iter) - __n' would be invalid: overload resolution selected deleted operator '-'}}
381-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
382-
missing_minus_iter_iter, ""); // expected-error {{static assertion failed}}
380+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_minus_iter_iter, ""); // expected-error {{static assertion failed}}
383381
// expected-note@*:* {{because '__iter - __iter' would be invalid: overload resolution selected deleted operator '-'}}
384-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
385-
missing_minus_const_iter_iter, ""); // expected-error {{static assertion failed}}
382+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_minus_const_iter_iter, ""); // expected-error {{static assertion failed}}
386383
// expected-note@*:* {{because 'std::as_const(__iter) - __iter' would be invalid: overload resolution selected deleted operator '-'}}
387-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
388-
missing_minus_iter_const_iter, ""); // expected-error {{static assertion failed}}
384+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_minus_iter_const_iter, ""); // expected-error {{static assertion failed}}
389385
// expected-note@*:* {{because '__iter - std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '-'}}
390-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
391-
missing_minus_const_iter_const_iter, ""); // expected-error {{static assertion failed}}
386+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_minus_const_iter_const_iter, ""); // expected-error {{static assertion failed}}
392387
// expected-note@*:* {{because 'std::as_const(__iter) - std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '-'}}
393-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
394-
missing_subscript_operator, ""); // expected-error {{static assertion failed}}
388+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_subscript_operator, ""); // expected-error {{static assertion failed}}
395389
// expected-note@*:* {{because '__iter[__n]' would be invalid: overload resolution selected deleted operator '[]'}}
396-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
397-
missing_const_subscript_operator, ""); // expected-error {{static assertion failed}}
390+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_const_subscript_operator, ""); // expected-error {{static assertion failed}}
398391
// expected-note@*:* {{because 'std::as_const(__iter)[__n]' would be invalid: overload resolution selected deleted operator '[]'}}
399392
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_less, ""); // expected-error {{static assertion failed}}
400393
// expected-note@*:* {{because '__iter < __iter' would be invalid: overload resolution selected deleted operator '<'}}
401-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
402-
missing_const_mut_less, ""); // expected-error {{static assertion failed}}
394+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_const_mut_less, ""); // expected-error {{static assertion failed}}
403395
// expected-note@*:* {{because 'std::as_const(__iter) < __iter' would be invalid: overload resolution selected deleted operator '<'}}
404-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
405-
missing_mut_const_less, ""); // expected-error {{static assertion failed}}
396+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_mut_const_less, ""); // expected-error {{static assertion failed}}
406397
// expected-note@*:* {{because '__iter < std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '<'}}
407-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
408-
missing_const_const_less, ""); // expected-error {{static assertion failed}}
398+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_const_const_less, ""); // expected-error {{static assertion failed}}
409399
// expected-note@*:* {{because 'std::as_const(__iter) < std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '<'}}
410400
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_greater, ""); // expected-error {{static assertion failed}}
411401
// expected-note@*:* {{because '__iter > __iter' would be invalid: overload resolution selected deleted operator '>'}}
412-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
413-
missing_const_mut_greater, ""); // expected-error {{static assertion failed}}
402+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_const_mut_greater, ""); // expected-error {{static assertion failed}}
414403
// expected-note@*:* {{because 'std::as_const(__iter) > __iter' would be invalid: overload resolution selected deleted operator '>'}}
415-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
416-
missing_mut_const_greater, ""); // expected-error {{static assertion failed}}
404+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_mut_const_greater, ""); // expected-error {{static assertion failed}}
417405
// expected-note@*:* {{because '__iter > std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '>'}}
418-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
419-
missing_const_const_greater, ""); // expected-error {{static assertion failed}}
406+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_const_const_greater, ""); // expected-error {{static assertion failed}}
420407
// expected-note@*:* {{because 'std::as_const(__iter) > std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '>'}}
421408
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_less_eq, ""); // expected-error {{static assertion failed}}
422409
// expected-note@*:* {{because '__iter <= __iter' would be invalid: overload resolution selected deleted operator '<='}}
423-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
424-
missing_const_mut_less_eq, ""); // expected-error {{static assertion failed}}
410+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_const_mut_less_eq, ""); // expected-error {{static assertion failed}}
425411
// expected-note@*:* {{because 'std::as_const(__iter) <= __iter' would be invalid: overload resolution selected deleted operator '<='}}
426-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
427-
missing_mut_const_less_eq, ""); // expected-error {{static assertion failed}}
412+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_mut_const_less_eq, ""); // expected-error {{static assertion failed}}
428413
// expected-note@*:* {{because '__iter <= std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '<='}}
429-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
430-
missing_const_const_less_eq, ""); // expected-error {{static assertion failed}}
414+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_const_const_less_eq, ""); // expected-error {{static assertion failed}}
431415
// expected-note@*:* {{because 'std::as_const(__iter) <= std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '<='}}
432416
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_greater_eq, ""); // expected-error {{static assertion failed}}
433417
// expected-note@*:* {{because '__iter >= __iter' would be invalid: overload resolution selected deleted operator '>='}}
434-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
435-
missing_const_mut_greater_eq, ""); // expected-error {{static assertion failed}}
418+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_const_mut_greater_eq, ""); // expected-error {{static assertion failed}}
436419
// expected-note@*:* {{because 'std::as_const(__iter) >= __iter' would be invalid: overload resolution selected deleted operator '>='}}
437-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
438-
missing_mut_const_greater_eq, ""); // expected-error {{static assertion failed}}
420+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_mut_const_greater_eq, ""); // expected-error {{static assertion failed}}
439421
// expected-note@*:* {{because '__iter >= std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '>='}}
440-
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(
441-
missing_const_const_greater_eq, ""); // expected-error {{static assertion failed}}
422+
_LIBCPP_REQUIRE_CPP17_RANDOM_ACCESS_ITERATOR(missing_const_const_greater_eq, ""); // expected-error {{static assertion failed}}
442423
// expected-note@*:* {{because 'std::as_const(__iter) >= std::as_const(__iter)' would be invalid: overload resolution selected deleted operator '>='}}
424+
// clang-format on
443425
}

0 commit comments

Comments
 (0)