fixup! [libc++][NFC] Centralize test for support of == and != in ranges

Address feedback.

Author: hawkinsw

libcxx/test/std/ranges/range.adaptors/range.elements/iterator/compare.pass.cpp

@@ -140,7 +140,7 @@ constexpr bool test() {
     auto it = ev.begin();
 
     using ElemIter = decltype(it);
-    static_assert(!weakly_equality_comparable_with<ElemIter>);
+    static_assert(!weakly_equality_comparable_with<ElemIter, ElemIter>);
     inequalityOperatorsDoNotExistTest(it, it);
   }
 

libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/equality.pass.cpp

@@ -80,8 +80,8 @@ static_assert(!weakly_equality_comparable_with<iterator_t<elements_view<R, 0>>,
 static_assert(weakly_equality_comparable_with<iterator_t<const elements_view<R, 0>>, //
                                               sentinel_t<const elements_view<R, 0>>>);
 
-static_assert(weakly_equality_comparable_with<iterator_t<elements_view<R, 0>>, //
-                                              sentinel_t<elements_view<R, 0>>>);
+static_assert(weakly_equality_comparable_with<iterator_t<elements_view<CrossComparableR, 0>>, //
+                                              sentinel_t<elements_view<CrossComparableR, 0>>>);
 
 static_assert(weakly_equality_comparable_with<iterator_t<const elements_view<CrossComparableR, 0>>, //
                                               sentinel_t<elements_view<CrossComparableR, 0>>>);

libcxx/test/std/ranges/range.adaptors/range.filter/iterator/compare.pass.cpp

@@ -76,7 +76,7 @@ constexpr bool tests() {
     using Sentinel = sentinel_wrapper<Iterator>;
     using FilterView = std::ranges::filter_view<minimal_view<Iterator, Sentinel>, AlwaysTrue>;
     using FilterIterator = std::ranges::iterator_t<FilterView>;
-    static_assert(!weakly_equality_comparable_with<FilterIterator>);
+    static_assert(!weakly_equality_comparable_with<FilterIterator, FilterIterator>);
   }
 
   return true;

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/equal.pass.cpp

@@ -53,7 +53,7 @@ constexpr bool test() {
     auto b = val.begin();
     std::same_as<std::default_sentinel_t> decltype(auto) e = val.end();
 
-    static_assert(!weakly_equality_comparable_with<decltype(b)>);
+    static_assert(!weakly_equality_comparable_with<decltype(b), decltype(b)>);
 
     assert(!(b == std::default_sentinel));
     assert(b != std::default_sentinel);

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer/equal.pass.cpp

@@ -66,7 +66,7 @@ constexpr bool test() {
     auto b = v.begin();
     std::same_as<std::default_sentinel_t> decltype(auto) e = v.end();
 
-    static_assert(!weakly_equality_comparable_with<decltype(b)>);
+    static_assert(!weakly_equality_comparable_with<decltype(b), decltype(b)>);
 
     assert(!(b == std::default_sentinel));
     assert(b != std::default_sentinel);

libcxx/test/std/ranges/range.adaptors/range.take.while/sentinel/equality.pass.cpp

@@ -86,8 +86,8 @@ static_assert(!weakly_equality_comparable_with<iterator_t<take_while_view<R, Les
 static_assert(weakly_equality_comparable_with<iterator_t<const take_while_view<R, LessThan3>>, //
                                               sentinel_t<const take_while_view<R, LessThan3>>>);
 
-static_assert(weakly_equality_comparable_with<iterator_t<take_while_view<R, LessThan3>>, //
-                                              sentinel_t<take_while_view<R, LessThan3>>>);
+static_assert(weakly_equality_comparable_with<iterator_t<take_while_view<CrossComparableR, LessThan3>>, //
+                                              sentinel_t<take_while_view<CrossComparableR, LessThan3>>>);
 
 static_assert(weakly_equality_comparable_with<iterator_t<const take_while_view<CrossComparableR, LessThan3>>, //
                                               sentinel_t<take_while_view<CrossComparableR, LessThan3>>>);

libcxx/test/std/ranges/range.adaptors/range.zip/iterator/compare.pass.cpp

@@ -242,7 +242,7 @@ constexpr bool test() {
     std::ranges::zip_view r(IterNoEqualView{buffer});
     auto it = r.begin();
     using Iter = decltype(it);
-    static_assert(!weakly_equality_comparable_with<Iter>);
+    static_assert(!weakly_equality_comparable_with<Iter, Iter>);
     inequalityOperatorsDoNotExistTest(it, it);
   }
   return true;

libcxx/test/support/test_range.h

@@ -13,8 +13,8 @@
 #include <functional>
 #include <iterator>
 #include <ranges>
+#include <type_traits>
 
-#include "__concepts/invocable.h"
 #include "test_iterators.h"
 
 #if TEST_STD_VER < 17
@@ -91,8 +91,9 @@ concept simple_view =
     std::same_as<std::ranges::iterator_t<Range>, std::ranges::iterator_t<const Range>> &&
     std::same_as<std::ranges::sentinel_t<Range>, std::ranges::sentinel_t<const Range>>;
 
-template <class T, class U = T>
-concept weakly_equality_comparable_with = requires(const T& t, const U& u) {
+// See [concept.equalitycomparable]
+template <class T, class U>
+concept weakly_equality_comparable_with = requires(const std::remove_reference_t<T>& t, const std::remove_reference_t<U>& u) {
   { t == u } -> std::same_as<bool>;
   { t != u } -> std::same_as<bool>;
   { u == t } -> std::same_as<bool>;

libcxx/utils/libcxx/test/format.py

@@ -282,6 +282,7 @@ def getTestsForPath(self, testSuite, pathInSuite, litConfig, localConfig):
             for test in self._generateGenTest(testSuite, pathInSuite, litConfig, localConfig):
                 yield test
         else:
+            print(f"{localConfig.substitutions=}")
             yield lit.Test.Test(testSuite, pathInSuite, localConfig)
 
     def execute(self, test, litConfig):