Apply ldionne suggestions

Author: winner245

libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/ranges.rotate_copy.pass.cpp

@@ -73,7 +73,7 @@ constexpr void test(std::array<int, N> value, std::size_t middle, std::array<int
   }
 }
 
-template <class Iter, class OutIter, class Sent = Iter>
+template <class Iter, class OutIter, class Sent>
 constexpr void test_iterators() {
   // simple test
   test<Iter, OutIter, Sent, 4>({1, 2, 3, 4}, 2, {3, 4, 1, 2});
@@ -101,10 +101,10 @@ constexpr void test_iterators() {
 }
 
 constexpr bool test() {
-  types::for_each(types::forward_iterator_list<int*>(), []<class Iter>() {
-    types::for_each(types::cpp20_output_iterator_list<int*>(), []<class OutIter>() {
-      test_iterators<Iter, OutIter>();
-    });
+  types::for_each(types::forward_iterator_list<const int*>(), []<class Iter>() {
+    types::for_each(
+        types::concatenate_t<types::forward_iterator_list<int*>, types::type_list<cpp20_output_iterator<int*> > >(),
+        []<class OutIter>() { test_iterators<Iter, OutIter, Iter>(); });
   });
 
   {

libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp

@@ -423,13 +423,9 @@ struct TestUniquePtr {
 TEST_CONSTEXPR_CXX20 bool test() {
   types::for_each(types::forward_iterator_list<int*>(), TestIter());
 
-#if TEST_STD_VER >= 11 && TEST_STD_VER <= 17
-  types::for_each(types::forward_iterator_list<std::unique_ptr<int>*>(), TestUniquePtr());
-#elif TEST_STD_VER == 20
-  if (!std::is_constant_evaluated())
+#if TEST_STD_VER >= 11
+  if (TEST_STD_VER >= 23 || !TEST_IS_CONSTANT_EVALUATED)
     types::for_each(types::forward_iterator_list<std::unique_ptr<int>*>(), TestUniquePtr());
-#elif TEST_STD_VER >= 23
-  types::for_each(types::forward_iterator_list<std::unique_ptr<int>*>(), TestUniquePtr());
 #endif
 
   return true;

libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp

@@ -22,7 +22,9 @@
 struct TestIter {
   template <class InIter>
   TEST_CONSTEXPR_CXX20 void operator()() const {
-    types::for_each(types::cpp17_output_iterator_list<int*>(), TestImpl<InIter>());
+    types::for_each(
+        types::concatenate_t<types::forward_iterator_list<int*>, types::type_list<cpp17_output_iterator<int*> > >(),
+        TestImpl<InIter>());
   }
 
   template <class InIter>

libcxx/test/support/test_iterators.h

@@ -1664,17 +1664,10 @@ using forward_iterator_list = concatenate_t<bidirectional_iterator_list<Ptr>, ty
 template <class Ptr>
 using cpp17_input_iterator_list = concatenate_t<forward_iterator_list<Ptr>, type_list<cpp17_input_iterator<Ptr> > >;
 
-template <class Ptr>
-using cpp17_output_iterator_list = concatenate_t<forward_iterator_list<Ptr>, type_list<cpp17_output_iterator<Ptr> > >;
-
 #if TEST_STD_VER >= 20
 template <class Ptr>
 using cpp20_input_iterator_list =
     concatenate_t<forward_iterator_list<Ptr>, type_list<cpp20_input_iterator<Ptr>, cpp17_input_iterator<Ptr>>>;
-
-template <class Ptr>
-using cpp20_output_iterator_list =
-    concatenate_t<forward_iterator_list<Ptr>, type_list<cpp20_output_iterator<Ptr>, cpp17_output_iterator<Ptr>>>;
 #endif
 } // namespace types