Fixing whitespace problems

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@111753 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
index d61a461..41b5ab9 100644
--- a/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter> 
+// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter>
 //   OutIter
 //   copy(InIter first, InIter last, OutIter result);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp b/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
index 3454220..761502b 100644
--- a/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator InIter, BidirectionalIterator OutIter> 
-//   requires OutputIterator<OutIter, InIter::reference> 
+// template<BidirectionalIterator InIter, BidirectionalIterator OutIter>
+//   requires OutputIterator<OutIter, InIter::reference>
 //   OutIter
 //   copy_backward(InIter first, InIter last, OutIter result);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
index ec228f5..83c55e3 100644
--- a/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter, 
-//          Predicate<auto, InIter::value_type> Pred> 
-//   requires CopyConstructible<Pred> 
+// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter,
+//          Predicate<auto, InIter::value_type> Pred>
+//   requires CopyConstructible<Pred>
 //   OutIter
 //   copy_if(InIter first, InIter last, OutIter result, Pred pred);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp b/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
index 9d8a527..5d95c33 100644
--- a/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter> 
+// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter>
 //   OutIter
 //   copy_n(InIter first, InIter::difference_type n, OutIter result);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp b/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
index 4112911..7db8009 100644
--- a/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T> 
-//   requires OutputIterator<Iter, const T&> 
+// template<ForwardIterator Iter, class T>
+//   requires OutputIterator<Iter, const T&>
 //   void
 //   fill(Iter first, Iter last, const T& value);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp b/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
index a528ae5..095f9c7 100644
--- a/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<class Iter, IntegralLike Size, class T> 
-//   requires OutputIterator<Iter, const T&> 
+// template<class Iter, IntegralLike Size, class T>
+//   requires OutputIterator<Iter, const T&>
 //   OutputIterator
 //   fill_n(Iter first, Size n, const T& value);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp b/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp
index 6042af0..3b009d7 100644
--- a/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.generate/generate.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, Callable Generator> 
-//   requires OutputIterator<Iter, Generator::result_type> 
-//         && CopyConstructible<Generator> 
+// template<ForwardIterator Iter, Callable Generator>
+//   requires OutputIterator<Iter, Generator::result_type>
+//         && CopyConstructible<Generator>
 //   void
 //   generate(Iter first, Iter last, Generator gen);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp b/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
index 58f2862..07aee18 100644
--- a/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp
@@ -10,8 +10,8 @@
 // <algorithm>
 
 // template<class Iter, IntegralLike Size, Callable Generator>
-//   requires OutputIterator<Iter, Generator::result_type> 
-//         && CopyConstructible<Generator> 
+//   requires OutputIterator<Iter, Generator::result_type>
+//         && CopyConstructible<Generator>
 //   void
 //   generate_n(Iter first, Size n, Generator gen);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp b/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
index 38795ae..80c50ab 100644
--- a/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, typename OutIter> 
-//   requires OutputIterator<OutIter, RvalueOf<InIter::reference>::type> 
+// template<InputIterator InIter, typename OutIter>
+//   requires OutputIterator<OutIter, RvalueOf<InIter::reference>::type>
 //   OutIter
 //   move(InIter first, InIter last, OutIter result);
 
@@ -56,7 +56,7 @@
         assert(*ib[i] == i);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -130,5 +130,5 @@
     test1<std::unique_ptr<int>*, bidirectional_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*, random_access_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*, std::unique_ptr<int>*>();
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp b/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
index 1291ee4..349f13e 100644
--- a/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator InIter, BidirectionalIterator OutIter> 
-//   requires OutputIterator<OutIter, RvalueOf<InIter::reference>::type> 
+// template<BidirectionalIterator InIter, BidirectionalIterator OutIter>
+//   requires OutputIterator<OutIter, RvalueOf<InIter::reference>::type>
 //   OutIter
 //   move_backward(InIter first, InIter last, OutIter result);
 
@@ -56,7 +56,7 @@
         assert(*ib[i] == i);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -84,5 +84,5 @@
     test1<std::unique_ptr<int>*, bidirectional_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*, random_access_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*, std::unique_ptr<int>*>();
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp b/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
index 0a1c60f..5bc177d 100644
--- a/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
@@ -13,7 +13,6 @@
 //     bool
 //     is_partitioned(InputIterator first, InputIterator last, Predicate pred);
 
-
 #include <algorithm>
 #include <cassert>
 
diff --git a/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp b/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
index 43190d0..9e7c14b 100644
--- a/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator Iter, Predicate<auto, Iter::value_type> Pred> 
-//   requires ShuffleIterator<Iter> 
-//         && CopyConstructible<Pred> 
+// template<BidirectionalIterator Iter, Predicate<auto, Iter::value_type> Pred>
+//   requires ShuffleIterator<Iter>
+//         && CopyConstructible<Pred>
 //   Iter
 //   partition(Iter first, Iter last, Pred pred);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp b/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp
index e589e7b..bdb579e 100644
--- a/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.partitions/stable_partition.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator Iter, Predicate<auto, Iter::value_type> Pred> 
-//   requires ShuffleIterator<Iter> 
-//         && CopyConstructible<Pred> 
+// template<BidirectionalIterator Iter, Predicate<auto, Iter::value_type> Pred>
+//   requires ShuffleIterator<Iter>
+//         && CopyConstructible<Pred>
 //   Iter
 //   stable_partition(Iter first, Iter last, Pred pred);
 
@@ -300,7 +300,7 @@
     Iter r = std::stable_partition(Iter(array), Iter(array+size), is_null());
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
diff --git a/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.pass.cpp b/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.pass.cpp
index ca4a2bd..76bfdbf 100644
--- a/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires ShuffleIterator<Iter> 
+// template<RandomAccessIterator Iter>
+//   requires ShuffleIterator<Iter>
 //   void
 //   random_shuffle(Iter first, Iter last);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_rand.pass.cpp b/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_rand.pass.cpp
index 6a17521..be67adf 100644
--- a/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_rand.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.random.shuffle/random_shuffle_rand.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter, Callable<auto, Iter::difference_type> Rand> 
-//   requires ShuffleIterator<Iter> 
-//         && Convertible<Rand::result_type, Iter::difference_type> 
+// template<RandomAccessIterator Iter, Callable<auto, Iter::difference_type> Rand>
+//   requires ShuffleIterator<Iter>
+//         && Convertible<Rand::result_type, Iter::difference_type>
 //   void
 //   random_shuffle(Iter first, Iter last, Rand&& rand);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp b/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
index 2524b33..44ef8e3 100644
--- a/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T> 
-//   requires OutputIterator<Iter, RvalueOf<Iter::reference>::type> 
-//         && HasEqualTo<Iter::value_type, T> 
+// template<ForwardIterator Iter, class T>
+//   requires OutputIterator<Iter, RvalueOf<Iter::reference>::type>
+//         && HasEqualTo<Iter::value_type, T>
 //   Iter
 //   remove(Iter first, Iter last, const T& value);
 
@@ -63,7 +63,7 @@
     assert(*ia[5] == 4);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -79,5 +79,5 @@
     test1<random_access_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*>();
 
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
index 71774f4..f225e0b 100644
--- a/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter, class T> 
-//   requires HasEqualTo<InIter::value_type, T> 
+// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter, class T>
+//   requires HasEqualTo<InIter::value_type, T>
 //   OutIter
 //   remove_copy(InIter first, InIter last, OutIter result, const T& value);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
index 46fff38..3b7fb61 100644
--- a/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter, 
-//          Predicate<auto, InIter::value_type> Pred> 
-//   requires CopyConstructible<Pred> 
+// template<InputIterator InIter, OutputIterator<auto, InIter::reference> OutIter,
+//          Predicate<auto, InIter::value_type> Pred>
+//   requires CopyConstructible<Pred>
 //   OutIter
 //   remove_copy_if(InIter first, InIter last, OutIter result, Pred pred);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
index e196d03..df8996c 100644
--- a/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, Predicate<auto, Iter::value_type> Pred> 
-//   requires OutputIterator<Iter, RvalueOf<Iter::reference>::type> 
-//         && CopyConstructible<Pred> 
+// template<ForwardIterator Iter, Predicate<auto, Iter::value_type> Pred>
+//   requires OutputIterator<Iter, RvalueOf<Iter::reference>::type>
+//         && CopyConstructible<Pred>
 //   Iter
 //   remove_if(Iter first, Iter last, Pred pred);
 
@@ -72,7 +72,7 @@
     assert(*ia[5] == 4);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -88,5 +88,5 @@
     test1<random_access_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*>();
 
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp b/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
index 031e5f9..ed58692 100644
--- a/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
@@ -9,10 +9,10 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T> 
+// template<ForwardIterator Iter, class T>
 //   requires OutputIterator<Iter, Iter::reference>
 //         && OutputIterator<Iter, const T&>
-//         && HasEqualTo<Iter::value_type, T> 
+//         && HasEqualTo<Iter::value_type, T>
 //   void
 //   replace(Iter first, Iter last, const T& old_value, const T& new_value);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
index c75bbbb..5d43300 100644
--- a/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
@@ -9,10 +9,10 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, typename OutIter, class T> 
-//   requires OutputIterator<OutIter, InIter::reference> 
-//         && OutputIterator<OutIter, const T&> 
-//         && HasEqualTo<InIter::value_type, T> 
+// template<InputIterator InIter, typename OutIter, class T>
+//   requires OutputIterator<OutIter, InIter::reference>
+//         && OutputIterator<OutIter, const T&>
+//         && HasEqualTo<InIter::value_type, T>
 //   OutIter
 //   replace_copy(InIter first, InIter last, OutIter result, const T& old_value,
 //                                                           const T& new_value);
diff --git a/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
index 68e6797..9a0efbd 100644
--- a/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
@@ -9,11 +9,11 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, typename OutIter, 
-//          Predicate<auto, InIter::value_type> Pred, class T> 
-//   requires OutputIterator<OutIter, InIter::reference> 
-//         && OutputIterator<OutIter, const T&> 
-//         && CopyConstructible<Pred> 
+// template<InputIterator InIter, typename OutIter,
+//          Predicate<auto, InIter::value_type> Pred, class T>
+//   requires OutputIterator<OutIter, InIter::reference>
+//         && OutputIterator<OutIter, const T&>
+//         && CopyConstructible<Pred>
 //   OutIter
 //   replace_copy_if(InIter first, InIter last, OutIter result, Pred pred, const T& new_value);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp b/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
index 47a8982..564c1d3 100644
--- a/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
@@ -9,10 +9,10 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, Predicate<auto, Iter::value_type> Pred, class T> 
-//   requires OutputIterator<Iter, Iter::reference> 
-//         && OutputIterator<Iter, const T&> 
-//         && CopyConstructible<Pred> 
+// template<ForwardIterator Iter, Predicate<auto, Iter::value_type> Pred, class T>
+//   requires OutputIterator<Iter, Iter::reference>
+//         && OutputIterator<Iter, const T&>
+//         && CopyConstructible<Pred>
 //   void
 //   replace_if(Iter first, Iter last, Pred pred, const T& new_value);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp b/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
index 34e9563..27f92bc 100644
--- a/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator Iter> 
-//   requires HasSwap<Iter::reference, Iter::reference> 
+// template<BidirectionalIterator Iter>
+//   requires HasSwap<Iter::reference, Iter::reference>
 //   void
 //   reverse(Iter first, Iter last);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
index c11dacd..be90461 100644
--- a/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator InIter, OutputIterator<auto, InIter::reference> OutIter> 
+// template<BidirectionalIterator InIter, OutputIterator<auto, InIter::reference> OutIter>
 //   OutIter
 //   reverse_copy(InIter first, InIter last, OutIter result);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp b/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp
index 3e61b1c..9116411 100644
--- a/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.rotate/rotate.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template<ShuffleIterator Iter> 
+// template<ShuffleIterator Iter>
 //   Iter
 //   rotate(Iter first, Iter middle, Iter last);
 
@@ -419,7 +419,7 @@
     assert(*ig[5] == 2);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -435,5 +435,5 @@
     test1<random_access_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*>();
 
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
index 6459e99..465fbd0 100644
--- a/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template<ForwardIterator InIter, OutputIterator<auto, InIter::reference> OutIter> 
+// template<ForwardIterator InIter, OutputIterator<auto, InIter::reference> OutIter>
 //   OutIter
 //   rotate_copy(InIter first, InIter middle, InIter last, OutIter result);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.swap/iter_swap.pass.cpp b/test/algorithms/alg.modifying.operations/alg.swap/iter_swap.pass.cpp
index eacc5dc..6357717 100644
--- a/test/algorithms/alg.modifying.operations/alg.swap/iter_swap.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.swap/iter_swap.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<Iterator Iter1, Iterator Iter2> 
-//   requires HasSwap<Iter1::reference, Iter2::reference> 
+// template<Iterator Iter1, Iterator Iter2>
+//   requires HasSwap<Iter1::reference, Iter2::reference>
 //   void
 //   iter_swap(Iter1 a, Iter2 b);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp b/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp
index f44cd91..f150d2f 100644
--- a/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.swap/swap_ranges.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter1, ForwardIterator Iter2> 
-//   requires HasSwap<Iter1::reference, Iter2::reference> 
+// template<ForwardIterator Iter1, ForwardIterator Iter2>
+//   requires HasSwap<Iter1::reference, Iter2::reference>
 //   Iter2
 //   swap_ranges(Iter1 first1, Iter1 last1, Iter2 first2);
 
@@ -60,7 +60,7 @@
     assert(*j[2] == 3);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -106,5 +106,5 @@
     test1<std::unique_ptr<int>*, random_access_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*, std::unique_ptr<int>*>();
 
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp b/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
index bfed398..e417683 100644
--- a/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<InputIterator InIter1, InputIterator InIter2, class OutIter, 
-//          Callable<auto, const InIter1::value_type&, const InIter2::value_type&> BinaryOp> 
-//   requires OutputIterator<OutIter, BinaryOp::result_type> && CopyConstructible<BinaryOp> 
+// template<InputIterator InIter1, InputIterator InIter2, class OutIter,
+//          Callable<auto, const InIter1::value_type&, const InIter2::value_type&> BinaryOp>
+//   requires OutputIterator<OutIter, BinaryOp::result_type> && CopyConstructible<BinaryOp>
 // OutIter
 // transform(InIter1 first1, InIter1 last1, InIter2 first2, OutIter result, BinaryOp binary_op);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp b/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
index 47674ff..91b31fb 100644
--- a/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, class OutIter, 
-//          Callable<auto, const InIter::value_type&> Op> 
-//   requires OutputIterator<OutIter, Op::result_type> && CopyConstructible<Op> 
+// template<InputIterator InIter, class OutIter,
+//          Callable<auto, const InIter::value_type&> Op>
+//   requires OutputIterator<OutIter, Op::result_type> && CopyConstructible<Op>
 //   OutIter
 //   transform(InIter first, InIter last, OutIter result, Op op);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp b/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
index 8582ddb..f31c73f 100644
--- a/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter> 
+// template<ForwardIterator Iter>
 //   requires OutputIterator<Iter, Iter::reference>
-//         && EqualityComparable<Iter::value_type> 
+//         && EqualityComparable<Iter::value_type>
 //   Iter
 //   unique(Iter first, Iter last);
 
@@ -169,7 +169,7 @@
     assert(*ii[2] == 2);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -185,5 +185,5 @@
     test1<random_access_iterator<Ptr*> >();
     test1<Ptr*>();
 
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp b/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
index 25d061d..13cf4ef 100644
--- a/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
@@ -9,11 +9,11 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, class OutIter> 
-//   requires OutputIterator<OutIter, RvalueOf<InIter::value_type>::type> 
-//         && EqualityComparable<InIter::value_type> 
-//         && HasAssign<InIter::value_type, InIter::reference> 
-//         && Constructible<InIter::value_type, InIter::reference> 
+// template<InputIterator InIter, class OutIter>
+//   requires OutputIterator<OutIter, RvalueOf<InIter::value_type>::type>
+//         && EqualityComparable<InIter::value_type>
+//         && HasAssign<InIter::value_type, InIter::reference>
+//         && Constructible<InIter::value_type, InIter::reference>
 //   OutIter
 //   unique_copy(InIter first, InIter last, OutIter result);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp b/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
index 5acd5f4..873a5e8 100644
--- a/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
@@ -9,12 +9,12 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, class OutIter, 
-//          EquivalenceRelation<auto, InIter::value_type> Pred> 
-//   requires OutputIterator<OutIter, RvalueOf<InIter::value_type>::type> 
-//         && HasAssign<InIter::value_type, InIter::reference> 
-//         && Constructible<InIter::value_type, InIter::reference> 
-//         && CopyConstructible<Pred> 
+// template<InputIterator InIter, class OutIter,
+//          EquivalenceRelation<auto, InIter::value_type> Pred>
+//   requires OutputIterator<OutIter, RvalueOf<InIter::value_type>::type>
+//         && HasAssign<InIter::value_type, InIter::reference>
+//         && Constructible<InIter::value_type, InIter::reference>
+//         && CopyConstructible<Pred>
 //   OutIter
 //   unique_copy(InIter first, InIter last, OutIter result, Pred pred);
 
diff --git a/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp b/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
index 8d45691..0b921e0 100644
--- a/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
+++ b/test/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, EquivalenceRelation<auto, Iter::value_type> Pred> 
-//   requires OutputIterator<Iter, RvalueOf<Iter::reference>::type> 
-//         && CopyConstructible<Pred> 
+// template<ForwardIterator Iter, EquivalenceRelation<auto, Iter::value_type> Pred>
+//   requires OutputIterator<Iter, RvalueOf<Iter::reference>::type>
+//         && CopyConstructible<Pred>
 //   Iter
 //   unique(Iter first, Iter last, Pred pred);
 
@@ -211,7 +211,7 @@
     assert(count_equal::count == si-1);
 }
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -227,5 +227,5 @@
     test1<random_access_iterator<Ptr*> >();
     test1<Ptr*>();
 
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp b/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp
index 985d6c8..ad60cc5 100644
--- a/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter> 
-//   requires EqualityComparable<Iter::value_type> 
+// template<ForwardIterator Iter>
+//   requires EqualityComparable<Iter::value_type>
 //   Iter
 //   adjacent_find(Iter first, Iter last);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp
index d27ee2c..751ca24 100644
--- a/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, EquivalenceRelation<auto, Iter::value_type> Pred> 
-//   requires CopyConstructible<Pred> 
+// template<ForwardIterator Iter, EquivalenceRelation<auto, Iter::value_type> Pred>
+//   requires CopyConstructible<Pred>
 //   Iter
 //   adjacent_find(Iter first, Iter last, Pred pred);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp b/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
index e314753..332a3e2 100644
--- a/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.count/count.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator Iter, class T> 
-//   requires HasEqualTo<Iter::value_type, T> 
+// template<InputIterator Iter, class T>
+//   requires HasEqualTo<Iter::value_type, T>
 //   Iter::difference_type
 //   count(Iter first, Iter last, const T& value);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp b/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
index fc02b9f..48ef013 100644
--- a/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator Iter, Predicate<auto, Iter::value_type> Pred> 
-//   requires CopyConstructible<Pred> 
+// template<InputIterator Iter, Predicate<auto, Iter::value_type> Pred>
+//   requires CopyConstructible<Pred>
 //   Iter::difference_type
 //   count_if(Iter first, Iter last, Pred pred);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp b/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
index 0eb2ff5..e36076e 100644
--- a/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator Iter1, InputIterator Iter2> 
-//   requires HasEqualTo<Iter1::value_type, Iter2::value_type> 
+// template<InputIterator Iter1, InputIterator Iter2>
+//   requires HasEqualTo<Iter1::value_type, Iter2::value_type>
 //   bool
 //   equal(Iter1 first1, Iter1 last1, Iter2 first2);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
index 5f11049..6b856e6 100644
--- a/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<InputIterator Iter1, InputIterator Iter2, 
-//          Predicate<auto, Iter1::value_type, Iter2::value_type> Pred> 
-//   requires CopyConstructible<Pred> 
+// template<InputIterator Iter1, InputIterator Iter2,
+//          Predicate<auto, Iter1::value_type, Iter2::value_type> Pred>
+//   requires CopyConstructible<Pred>
 //   bool
 //   equal(Iter1 first1, Iter1 last1, Iter2 first2, Pred pred);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp
index a099d96..0684e22 100644
--- a/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter1, ForwardIterator Iter2> 
-//   requires HasEqualTo<Iter1::value_type, Iter2::value_type> 
+// template<ForwardIterator Iter1, ForwardIterator Iter2>
+//   requires HasEqualTo<Iter1::value_type, Iter2::value_type>
 //   Iter1
 //   find_end(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp
index d077789..873930c 100644
--- a/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter1, ForwardIterator Iter2, 
-//          Predicate<auto, Iter1::value_type, Iter2::value_type> Pred> 
-//   requires CopyConstructible<Pred> 
+// template<ForwardIterator Iter1, ForwardIterator Iter2,
+//          Predicate<auto, Iter1::value_type, Iter2::value_type> Pred>
+//   requires CopyConstructible<Pred>
 //   Iter1
 //   find_end(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2, Pred pred);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
index 8087aba..a64eb22 100644
--- a/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator Iter1, ForwardIterator Iter2> 
-//   requires HasEqualTo<Iter1::value_type, Iter2::value_type> 
+// template<InputIterator Iter1, ForwardIterator Iter2>
+//   requires HasEqualTo<Iter1::value_type, Iter2::value_type>
 //   Iter1
 //   find_first_of(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
index f9bbf79..5cd5e3b 100644
--- a/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<InputIterator Iter1, ForwardIterator Iter2, 
-//          Predicate<auto, Iter1::value_type, Iter2::value_type> Pred> 
-//   requires CopyConstructible<Pred> 
+// template<InputIterator Iter1, ForwardIterator Iter2,
+//          Predicate<auto, Iter1::value_type, Iter2::value_type> Pred>
+//   requires CopyConstructible<Pred>
 //   Iter1
 //   find_first_of(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2, Pred pred);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
index 0ef3a7b..6d0aa47 100644
--- a/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator Iter, class T> 
-//   requires HasEqualTo<Iter::value_type, T> 
+// template<InputIterator Iter, class T>
+//   requires HasEqualTo<Iter::value_type, T>
 //   Iter
 //   find(Iter first, Iter last, const T& value);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
index a0aa528..94f877e 100644
--- a/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator Iter, Predicate<auto, Iter::value_type> Pred> 
-//   requires CopyConstructible<Pred> 
+// template<InputIterator Iter, Predicate<auto, Iter::value_type> Pred>
+//   requires CopyConstructible<Pred>
 //   Iter
 //   find_if(Iter first, Iter last, Pred pred);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp b/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
index 29dd03f..c912e4b 100644
--- a/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator Iter, Predicate<auto, Iter::value_type> Pred> 
-//   requires CopyConstructible<Pred> 
+// template<InputIterator Iter, Predicate<auto, Iter::value_type> Pred>
+//   requires CopyConstructible<Pred>
 //   Iter
 //   find_if_not(Iter first, Iter last, Pred pred);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp b/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
index 351cccf..6d67a6c 100644
--- a/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator Iter, Callable<auto, Iter::reference> Function> 
-//   requires CopyConstructible<Function> 
+// template<InputIterator Iter, Callable<auto, Iter::reference> Function>
+//   requires CopyConstructible<Function>
 //   Function
 //   for_each(Iter first, Iter last, Function f);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp b/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
index ba85c64..764d0c7 100644
--- a/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter1, ForwardIterator Iter2> 
-//   requires HasEqualTo<Iter1::value_type, Iter2::value_type> 
+// template<ForwardIterator Iter1, ForwardIterator Iter2>
+//   requires HasEqualTo<Iter1::value_type, Iter2::value_type>
 //   Iter1
 //   search(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2);
 
diff --git a/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp b/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
index ea53bcc..e35ab1e 100644
--- a/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter1, ForwardIterator Iter2> 
-//   requires HasEqualTo<Iter1::value_type, Iter2::value_type> 
+// template<ForwardIterator Iter1, ForwardIterator Iter2>
+//   requires HasEqualTo<Iter1::value_type, Iter2::value_type>
 //   Iter1
 //   search(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2);
 
diff --git a/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp b/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
index 2b3159b..e668694 100644
--- a/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/mismatch/mismatch.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator Iter1, InputIterator Iter2> 
-//   requires HasEqualTo<Iter1::value_type, Iter2::value_type> 
+// template<InputIterator Iter1, InputIterator Iter2>
+//   requires HasEqualTo<Iter1::value_type, Iter2::value_type>
 //   pair<Iter1, Iter2>
 //   mismatch(Iter1 first1, Iter1 last1, Iter2 first2);
 
diff --git a/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp b/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
index c8f2ee1..e611935 100644
--- a/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
+++ b/test/algorithms/alg.nonmodifying/mismatch/mismatch_pred.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<InputIterator Iter1, InputIterator Iter2, 
-//          Predicate<auto, Iter1::value_type, Iter2::value_type> Pred> 
-//   requires CopyConstructible<Pred> 
+// template<InputIterator Iter1, InputIterator Iter2,
+//          Predicate<auto, Iter1::value_type, Iter2::value_type> Pred>
+//   requires CopyConstructible<Pred>
 //   pair<Iter1, Iter2>
 //   mismatch(Iter1 first1, Iter1 last1, Iter2 first2, Pred pred);
 
diff --git a/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
index 041e9ba..34d49d3 100644
--- a/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T> 
-//   requires HasLess<T, Iter::value_type> 
-//         && HasLess<Iter::value_type, T> 
+// template<ForwardIterator Iter, class T>
+//   requires HasLess<T, Iter::value_type>
+//         && HasLess<Iter::value_type, T>
 //   bool
 //   binary_search(Iter first, Iter last, const T& value);
 
diff --git a/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
index 25ca075..f1e8954 100644
--- a/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.binary.search/binary.search/binary_search_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T, CopyConstructible Compare> 
-//   requires Predicate<Compare, T, Iter::value_type> 
-//         && Predicate<Compare, Iter::value_type, T> 
+// template<ForwardIterator Iter, class T, CopyConstructible Compare>
+//   requires Predicate<Compare, T, Iter::value_type>
+//         && Predicate<Compare, Iter::value_type, T>
 //   bool
 //   binary_search(Iter first, Iter last, const T& value, Compare comp);
 
diff --git a/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
index 0a91406..247039a 100644
--- a/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range.pass.cpp
@@ -9,10 +9,10 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T> 
-//   requires HasLess<T, Iter::value_type> 
-//         && HasLess<Iter::value_type, T> 
-//   pair<Iter, Iter> 
+// template<ForwardIterator Iter, class T>
+//   requires HasLess<T, Iter::value_type>
+//         && HasLess<Iter::value_type, T>
+//   pair<Iter, Iter>
 //   equal_range(Iter first, Iter last, const T& value);
 
 #include <algorithm>
diff --git a/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
index 6b910cc..38254b5 100644
--- a/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.binary.search/equal.range/equal_range_comp.pass.cpp
@@ -9,10 +9,10 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T, CopyConstructible Compare> 
-//   requires Predicate<Compare, T, Iter::value_type> 
-//         && Predicate<Compare, Iter::value_type, T> 
-//   pair<Iter, Iter> 
+// template<ForwardIterator Iter, class T, CopyConstructible Compare>
+//   requires Predicate<Compare, T, Iter::value_type>
+//         && Predicate<Compare, Iter::value_type, T>
+//   pair<Iter, Iter>
 //   equal_range(Iter first, Iter last, const T& value, Compare comp);
 
 #include <algorithm>
diff --git a/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
index 0f727c5..84090e8 100644
--- a/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T> 
-//   requires HasLess<Iter::value_type, T> 
+// template<ForwardIterator Iter, class T>
+//   requires HasLess<Iter::value_type, T>
 //   Iter
 //   lower_bound(Iter first, Iter last, const T& value);
 
diff --git a/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
index a7a307a..0674da8 100644
--- a/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.binary.search/lower.bound/lower_bound_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T> 
-//   requires HasLess<Iter::value_type, T> 
+// template<ForwardIterator Iter, class T>
+//   requires HasLess<Iter::value_type, T>
 //   Iter
 //   lower_bound(Iter first, Iter last, const T& value);
 
diff --git a/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
index 8d5b055..c80e452 100644
--- a/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T> 
-//   requires HasLess<T, Iter::value_type> 
+// template<ForwardIterator Iter, class T>
+//   requires HasLess<T, Iter::value_type>
 //   Iter
 //   upper_bound(Iter first, Iter last, const T& value);
 
diff --git a/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp b/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
index d5325d6..b57928c 100644
--- a/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.binary.search/upper.bound/upper_bound_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, class T, Predicate<auto, T, Iter::value_type> Compare> 
-//   requires CopyConstructible<Compare> 
+// template<ForwardIterator Iter, class T, Predicate<auto, T, Iter::value_type> Compare>
+//   requires CopyConstructible<Compare>
 //   Iter
 //   upper_bound(Iter first, Iter last, const T& value, Compare comp);
 
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
index 7761114..0e7a19c 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
@@ -9,15 +9,14 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires LessThanComparable<Iter::value_type>
 //   bool
 //   is_heap(Iter first, Iter last);
 
 #include <algorithm>
 #include <cassert>
 
-
 void test()
 {
     int i1[] = {0, 0};
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
index a671984..631d7a8 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires LessThanComparable<Iter::value_type>
 //   bool
 //   is_heap(Iter first, Iter last);
 
@@ -18,7 +18,6 @@
 #include <functional>
 #include <cassert>
 
-
 void test()
 {
     int i1[] = {0, 0};
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
index 4807b1f..1908d70 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
@@ -17,7 +17,6 @@
 #include <algorithm>
 #include <cassert>
 
-
 void test()
 {
     int i1[] = {0, 0};
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
index 42d3191..960d60e 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires CopyConstructible<Compare> 
+// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires CopyConstructible<Compare>
 //   Iter
 //   is_heap_until(Iter first, Iter last, Compare comp);
 
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp
index 9a4b84f..611583a 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp
@@ -9,15 +9,14 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires ShuffleIterator<Iter> && LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires ShuffleIterator<Iter> && LessThanComparable<Iter::value_type>
 //   void
 //   make_heap(Iter first, Iter last);
 
 #include <algorithm>
 #include <cassert>
 
-
 void test(unsigned N)
 {
     int* ia = new int [N];
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp
index d8dbdfb..70b1b81 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires ShuffleIterator<Iter> && CopyConstructible<Compare> 
+// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires ShuffleIterator<Iter> && CopyConstructible<Compare>
 //   void
 //   make_heap(Iter first, Iter last, Compare comp);
 
@@ -27,7 +27,7 @@
         {return *x < *y;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 void test(unsigned N)
 {
@@ -60,5 +60,5 @@
     assert(std::is_heap(ia, ia+N, indirect_less()));
     delete [] ia;
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp
index 849be36..96e6a64 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp
@@ -9,15 +9,14 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires ShuffleIterator<Iter> && LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires ShuffleIterator<Iter> && LessThanComparable<Iter::value_type>
 //   void
 //   pop_heap(Iter first, Iter last);
 
 #include <algorithm>
 #include <cassert>
 
-
 void test(unsigned N)
 {
     int* ia = new int [N];
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp
index 9c06650..cc093a5 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires ShuffleIterator<Iter> && CopyConstructible<Compare> 
+// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires ShuffleIterator<Iter> && CopyConstructible<Compare>
 //   void
 //   pop_heap(Iter first, Iter last, Compare comp);
 
@@ -27,7 +27,7 @@
         {return *x < *y;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 void test(unsigned N)
 {
@@ -64,5 +64,5 @@
     }
     delete [] ia;
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp
index fe9876b..5e845aa 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp
@@ -9,16 +9,15 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires ShuffleIterator<Iter> 
-//         && LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires ShuffleIterator<Iter>
+//         && LessThanComparable<Iter::value_type>
 //   void
 //   push_heap(Iter first, Iter last);
 
 #include <algorithm>
 #include <cassert>
 
-
 void test(unsigned N)
 {
     int* ia = new int [N];
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp
index e60f077..8712629 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires ShuffleIterator<Iter> 
-//         && LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires ShuffleIterator<Iter>
+//         && LessThanComparable<Iter::value_type>
 //   void
 //   push_heap(Iter first, Iter last);
 
@@ -28,7 +28,7 @@
         {return *x < *y;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 void test(unsigned N)
 {
@@ -62,5 +62,5 @@
     }
     delete [] ia;
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp
index 2e91333..303c8b0 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp
@@ -9,15 +9,14 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires ShuffleIterator<Iter> && LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires ShuffleIterator<Iter> && LessThanComparable<Iter::value_type>
 //   void
 //   sort_heap(Iter first, Iter last);
 
 #include <algorithm>
 #include <cassert>
 
-
 void test(unsigned N)
 {
     int* ia = new int [N];
diff --git a/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp b/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp
index 882a624..8cac3b6 100644
--- a/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires ShuffleIterator<Iter> && CopyConstructible<Compare> 
+// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires ShuffleIterator<Iter> && CopyConstructible<Compare>
 //   void
 //   sort_heap(Iter first, Iter last, Compare comp);
 
@@ -27,7 +27,7 @@
         {return *x < *y;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 void test(unsigned N)
 {
@@ -62,5 +62,5 @@
     assert(std::is_sorted(ia, ia+N, indirect_less()));
     delete [] ia;
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
index 30c654d..544e807 100644
--- a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<InputIterator Iter1, InputIterator Iter2> 
-//   requires HasLess<Iter1::value_type, Iter2::value_type> 
-//         && HasLess<Iter2::value_type, Iter1::value_type> 
+// template<InputIterator Iter1, InputIterator Iter2>
+//   requires HasLess<Iter1::value_type, Iter2::value_type>
+//         && HasLess<Iter2::value_type, Iter1::value_type>
 //   bool
 //   lexicographical_compare(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2);
 
diff --git a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
index bcc0d23..e9448e5 100644
--- a/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<InputIterator Iter1, InputIterator Iter2, CopyConstructible Compare> 
-//   requires Predicate<Compare, Iter1::value_type, Iter2::value_type> 
-//         && Predicate<Compare, Iter2::value_type, Iter1::value_type> 
+// template<InputIterator Iter1, InputIterator Iter2, CopyConstructible Compare>
+//   requires Predicate<Compare, Iter1::value_type, Iter2::value_type>
+//         && Predicate<Compare, Iter2::value_type, Iter1::value_type>
 //   bool
 //   lexicographical_compare(Iter1 first1, Iter1 last1,
 //                           Iter2 first2, Iter2 last2, Compare comp);
diff --git a/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp b/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
index 94ce4a2..4703e60 100644
--- a/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator Iter> 
-//   requires ShuffleIterator<Iter> 
-//         && LessThanComparable<Iter::value_type> 
+// template<BidirectionalIterator Iter>
+//   requires ShuffleIterator<Iter>
+//         && LessThanComparable<Iter::value_type>
 //   void
 //   inplace_merge(Iter first, Iter middle, Iter last);
 
diff --git a/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp b/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
index b222bba..56f4628 100644
--- a/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.merge/inplace_merge_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires ShuffleIterator<Iter> 
-//         && CopyConstructible<Compare> 
+// template<BidirectionalIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires ShuffleIterator<Iter>
+//         && CopyConstructible<Compare>
 //   void
 //   inplace_merge(Iter first, Iter middle, Iter last, Compare comp);
 
@@ -28,7 +28,7 @@
         {return *x < *y;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 #include "../../iterators.h"
 
@@ -108,5 +108,5 @@
     }
     delete [] ia;
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp b/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
index c811aca..79d3d79 100644
--- a/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.merge/merge.pass.cpp
@@ -9,10 +9,10 @@
 
 // <algorithm>
 
-// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> 
-//   requires OutputIterator<OutIter, InIter1::reference> 
-//         && OutputIterator<OutIter, InIter2::reference> 
-//         && HasLess<InIter2::value_type, InIter1::value_type> 
+// template<InputIterator InIter1, InputIterator InIter2, typename OutIter>
+//   requires OutputIterator<OutIter, InIter1::reference>
+//         && OutputIterator<OutIter, InIter2::reference>
+//         && HasLess<InIter2::value_type, InIter1::value_type>
 //   OutIter
 //   merge(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2, OutIter result);
 
diff --git a/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp b/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
index ecd0442..d3a3c2d 100644
--- a/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
@@ -9,11 +9,11 @@
 
 // <algorithm>
 
-// template<InputIterator InIter1, InputIterator InIter2, typename OutIter, 
-//          Predicate<auto, InIter2::value_type, InIter1::value_type> Compare> 
+// template<InputIterator InIter1, InputIterator InIter2, typename OutIter,
+//          Predicate<auto, InIter2::value_type, InIter1::value_type> Compare>
 //   requires OutputIterator<OutIter, InIter1::reference>
-//         && OutputIterator<OutIter, InIter2::reference> 
-//         && CopyConstructible<Compare> 
+//         && OutputIterator<OutIter, InIter2::reference>
+//         && CopyConstructible<Compare>
 //   OutIter
 //   merge(InIter1 first1, InIter1 last1,
 //         InIter2 first2, InIter2 last2, OutIter result, Compare comp);
diff --git a/test/algorithms/alg.sorting/alg.min.max/max_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/max_comp.pass.cpp
index 885382d..15285ef 100644
--- a/test/algorithms/alg.sorting/alg.min.max/max_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/max_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<class T, StrictWeakOrder<auto, T> Compare> 
-//   requires !SameType<T, Compare> && CopyConstructible<Compare> 
+// template<class T, StrictWeakOrder<auto, T> Compare>
+//   requires !SameType<T, Compare> && CopyConstructible<Compare>
 //   const T&
 //   max(const T& a, const T& b, Compare comp);
 
diff --git a/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
index 444fd56..427e5e3 100644
--- a/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter> 
-//   requires LessThanComparable<Iter::value_type> 
+// template<ForwardIterator Iter>
+//   requires LessThanComparable<Iter::value_type>
 //   Iter
 //   max_element(Iter first, Iter last);
 
@@ -41,7 +41,7 @@
     for (int i = 0; i < N; ++i)
         a[i] = i;
     std::random_shuffle(a, a+N);
-    test(Iter(a), Iter(a+N)); 
+    test(Iter(a), Iter(a+N));
     delete [] a;
 }
 
diff --git a/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
index f50fa71..5d18611 100644
--- a/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires CopyConstructible<Compare> 
+// template<ForwardIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires CopyConstructible<Compare>
 //   Iter
 //   max_element(Iter first, Iter last, Compare comp);
 
@@ -42,7 +42,7 @@
     for (int i = 0; i < N; ++i)
         a[i] = i;
     std::random_shuffle(a, a+N);
-    test(Iter(a), Iter(a+N)); 
+    test(Iter(a), Iter(a+N));
     delete [] a;
 }
 
diff --git a/test/algorithms/alg.sorting/alg.min.max/max_init_list.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/max_init_list.pass.cpp
index 124ca61..d79ddde 100644
--- a/test/algorithms/alg.sorting/alg.min.max/max_init_list.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/max_init_list.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template <class T> 
+// template <class T>
 //   T
 //   max(initializer_list<T> t);
 
@@ -31,5 +31,5 @@
     assert(i == 3);
     i = std::max({1, 3, 2});
     assert(i == 3);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.min.max/max_init_list_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/max_init_list_comp.pass.cpp
index 8c78fbd..c31a9f8 100644
--- a/test/algorithms/alg.sorting/alg.min.max/max_init_list_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/max_init_list_comp.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template<class T, class Compare> 
+// template<class T, class Compare>
 //   T
 //   max(initializer_list<T> t, Compare comp);
 
@@ -32,5 +32,5 @@
     assert(i == 1);
     i = std::max({1, 3, 2}, std::greater<int>());
     assert(i == 1);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.min.max/min_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/min_comp.pass.cpp
index d88c21d..7decb02 100644
--- a/test/algorithms/alg.sorting/alg.min.max/min_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/min_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<class T, StrictWeakOrder<auto, T> Compare> 
-//   requires !SameType<T, Compare> && CopyConstructible<Compare> 
+// template<class T, StrictWeakOrder<auto, T> Compare>
+//   requires !SameType<T, Compare> && CopyConstructible<Compare>
 //   const T&
 //   min(const T& a, const T& b, Compare comp);
 
diff --git a/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
index 67eafad..bb1bdf6 100644
--- a/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter> 
-//   requires LessThanComparable<Iter::value_type> 
+// template<ForwardIterator Iter>
+//   requires LessThanComparable<Iter::value_type>
 //   Iter
 //   min_element(Iter first, Iter last);
 
@@ -41,7 +41,7 @@
     for (int i = 0; i < N; ++i)
         a[i] = i;
     std::random_shuffle(a, a+N);
-    test(Iter(a), Iter(a+N)); 
+    test(Iter(a), Iter(a+N));
     delete [] a;
 }
 
diff --git a/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
index f0291ff..529cf54 100644
--- a/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires CopyConstructible<Compare> 
+// template<ForwardIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires CopyConstructible<Compare>
 //   Iter
 //   min_element(Iter first, Iter last, Compare comp);
 
@@ -42,7 +42,7 @@
     for (int i = 0; i < N; ++i)
         a[i] = i;
     std::random_shuffle(a, a+N);
-    test(Iter(a), Iter(a+N)); 
+    test(Iter(a), Iter(a+N));
     delete [] a;
 }
 
diff --git a/test/algorithms/alg.sorting/alg.min.max/min_init_list.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/min_init_list.pass.cpp
index bb19d4f..62c4206 100644
--- a/test/algorithms/alg.sorting/alg.min.max/min_init_list.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/min_init_list.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template<class T> 
+// template<class T>
 //   T
 //   min(initializer_list<T> t);
 
@@ -31,5 +31,5 @@
     assert(i == 1);
     i = std::min({1, 3, 2});
     assert(i == 1);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.min.max/min_init_list_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/min_init_list_comp.pass.cpp
index 161d682..2b9499b 100644
--- a/test/algorithms/alg.sorting/alg.min.max/min_init_list_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/min_init_list_comp.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template<class T, class Compare> 
+// template<class T, class Compare>
 //   T
 //   min(initializer_list<T> t, Compare comp);
 
@@ -32,5 +32,5 @@
     assert(i == 3);
     i = std::min({1, 3, 2}, std::greater<int>());
     assert(i == 3);
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp
index 83fa53c..91fb16d 100644
--- a/test/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/minmax_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<class T, StrictWeakOrder<auto, T> Compare> 
-//   requires !SameType<T, Compare> && CopyConstructible<Compare> 
+// template<class T, StrictWeakOrder<auto, T> Compare>
+//   requires !SameType<T, Compare> && CopyConstructible<Compare>
 //   pair<const T&, const T&>
 //   minmax(const T& a, const T& b, Compare comp);
 
diff --git a/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
index eda36f9..2eb99c3 100644
--- a/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter> 
-//   requires LessThanComparable<Iter::value_type> 
-//   pair<Iter, Iter> 
+// template<ForwardIterator Iter>
+//   requires LessThanComparable<Iter::value_type>
+//   pair<Iter, Iter>
 //   minmax_element(Iter first, Iter last);
 
 #include <algorithm>
@@ -47,7 +47,7 @@
     for (int i = 0; i < N; ++i)
         a[i] = i;
     std::random_shuffle(a, a+N);
-    test(Iter(a), Iter(a+N)); 
+    test(Iter(a), Iter(a+N));
     delete [] a;
 }
 
diff --git a/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
index 482126e..427b8d5 100644
--- a/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires CopyConstructible<Compare> 
+// template<ForwardIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires CopyConstructible<Compare>
 //   pair<Iter, Iter>
 //   minmax_element(Iter first, Iter last, Compare comp);
 
@@ -50,7 +50,7 @@
     for (int i = 0; i < N; ++i)
         a[i] = i;
     std::random_shuffle(a, a+N);
-    test(Iter(a), Iter(a+N)); 
+    test(Iter(a), Iter(a+N));
     delete [] a;
 }
 
diff --git a/test/algorithms/alg.sorting/alg.min.max/minmax_init_list.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/minmax_init_list.pass.cpp
index 0dbb211..cf028de 100644
--- a/test/algorithms/alg.sorting/alg.min.max/minmax_init_list.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/minmax_init_list.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template<class T> 
+// template<class T>
 //   pair<T, T>
 //   minmax(initializer_list<T> t);
 
@@ -25,5 +25,5 @@
     assert((std::minmax({2, 3, 1}) == std::pair<int, int>(1, 3)));
     assert((std::minmax({3, 1, 2}) == std::pair<int, int>(1, 3)));
     assert((std::minmax({3, 2, 1}) == std::pair<int, int>(1, 3)));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp b/test/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp
index 4f3d144..d233c25 100644
--- a/test/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.min.max/minmax_init_list_comp.pass.cpp
@@ -9,7 +9,7 @@
 
 // <algorithm>
 
-// template<class T, class Compare> 
+// template<class T, class Compare>
 //   pair<T, T>
 //   minmax(initializer_list<T> t, Compare comp);
 
@@ -26,5 +26,5 @@
     assert((std::minmax({2, 3, 1}, std::greater<int>()) == std::pair<int, int>(3, 1)));
     assert((std::minmax({3, 1, 2}, std::greater<int>()) == std::pair<int, int>(3, 1)));
     assert((std::minmax({3, 2, 1}, std::greater<int>()) == std::pair<int, int>(3, 1)));
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp b/test/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp
index ea46195..61d8d2a 100644
--- a/test/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires ShuffleIterator<Iter> 
-//         && LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires ShuffleIterator<Iter>
+//         && LessThanComparable<Iter::value_type>
 //   void
 //   nth_element(Iter first, Iter nth, Iter last);
 
diff --git a/test/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp b/test/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp
index b4d6050..5e89a03 100644
--- a/test/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires ShuffleIterator<Iter> 
-//         && CopyConstructible<Compare> 
+// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires ShuffleIterator<Iter>
+//         && CopyConstructible<Compare>
 //   void
 //   nth_element(Iter first, Iter nth, Iter last, Compare comp);
 
@@ -29,7 +29,7 @@
         {return *x < *y;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 void
 test_one(unsigned N, unsigned M)
@@ -81,5 +81,5 @@
     std::nth_element(v.begin(), v.begin() + v.size()/2, v.end(), indirect_less());
     assert(*v[v.size()/2] == v.size()/2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp b/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
index e469755..9ffef41 100644
--- a/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator Iter> 
+// template<BidirectionalIterator Iter>
 //   requires ShuffleIterator<Iter>
-//         && LessThanComparable<Iter::value_type> 
+//         && LessThanComparable<Iter::value_type>
 //   bool
 //   next_permutation(Iter first, Iter last);
 
diff --git a/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp b/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
index 842b9b8..0924697 100644
--- a/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.permutation.generators/next_permutation_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires ShuffleIterator<Iter> 
-//         && CopyConstructible<Compare> 
+// template<BidirectionalIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires ShuffleIterator<Iter>
+//         && CopyConstructible<Compare>
 //   bool
 //   next_permutation(Iter first, Iter last, Compare comp);
 
diff --git a/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp b/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
index c469316..c6e536e 100644
--- a/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator Iter> 
-//   requires ShuffleIterator<Iter> 
-//         && LessThanComparable<Iter::value_type> 
+// template<BidirectionalIterator Iter>
+//   requires ShuffleIterator<Iter>
+//         && LessThanComparable<Iter::value_type>
 //   bool
 //   prev_permutation(Iter first, Iter last);
 
diff --git a/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp b/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
index 6a96fdb..7ac2864 100644
--- a/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.permutation.generators/prev_permutation_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<BidirectionalIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires ShuffleIterator<Iter> 
-//         && CopyConstructible<Compare> 
+// template<BidirectionalIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires ShuffleIterator<Iter>
+//         && CopyConstructible<Compare>
 //   bool
 //   prev_permutation(Iter first, Iter last, Compare comp);
 
diff --git a/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
index 665ba51..13f0221 100644
--- a/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.set.operations/includes/includes.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<InputIterator Iter1, InputIterator Iter2> 
-//   requires HasLess<Iter1::value_type, Iter2::value_type> 
+// template<InputIterator Iter1, InputIterator Iter2>
+//   requires HasLess<Iter1::value_type, Iter2::value_type>
 //         && HasLess<Iter2::value_type, Iter1::value_type>
 //   bool
 //   includes(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2);
@@ -41,7 +41,6 @@
     assert(std::includes(Iter1(ia), Iter1(ia+sa), Iter2(ib), Iter2(ib+sb)));
     assert(!std::includes(Iter1(ib), Iter1(ib+sb), Iter2(ia), Iter2(ia+sa)));
 
-
     assert(std::includes(Iter1(ia), Iter1(ia+2), Iter2(ic), Iter2(ic+2)));
     assert(!std::includes(Iter1(ia), Iter1(ia+2), Iter2(ib), Iter2(ib+2)));
 
diff --git a/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
index ccdb04d..75181ab 100644
--- a/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.set.operations/includes/includes_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<InputIterator Iter1, InputIterator Iter2, typename Compare> 
-//   requires Predicate<Compare, Iter1::value_type, Iter2::value_type> 
-//         && Predicate<Compare, Iter2::value_type, Iter1::value_type> 
+// template<InputIterator Iter1, InputIterator Iter2, typename Compare>
+//   requires Predicate<Compare, Iter1::value_type, Iter2::value_type>
+//         && Predicate<Compare, Iter2::value_type, Iter1::value_type>
 //   bool
 //   includes(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2, Compare comp);
 
@@ -42,7 +42,6 @@
     assert(std::includes(Iter1(ia), Iter1(ia+sa), Iter2(ib), Iter2(ib+sb), std::less<int>()));
     assert(!std::includes(Iter1(ib), Iter1(ib+sb), Iter2(ia), Iter2(ia+sa), std::less<int>()));
 
-
     assert(std::includes(Iter1(ia), Iter1(ia+2), Iter2(ic), Iter2(ic+2), std::less<int>()));
     assert(!std::includes(Iter1(ia), Iter1(ia+2), Iter2(ib), Iter2(ib+2), std::less<int>()));
 
diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
index 03628b2..ef4473c 100644
--- a/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
@@ -9,11 +9,11 @@
 
 // <algorithm>
 
-// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> 
-//   requires OutputIterator<OutIter, InIter1::reference> 
-//         && OutputIterator<OutIter, InIter2::reference> 
-//         && HasLess<InIter2::value_type, InIter1::value_type> 
-//         && HasLess<InIter1::value_type, InIter2::value_type> 
+// template<InputIterator InIter1, InputIterator InIter2, typename OutIter>
+//   requires OutputIterator<OutIter, InIter1::reference>
+//         && OutputIterator<OutIter, InIter2::reference>
+//         && HasLess<InIter2::value_type, InIter1::value_type>
+//         && HasLess<InIter1::value_type, InIter2::value_type>
 //   OutIter
 //   set_difference(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2,
 //                  OutIter result);
diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
index 65e3cd6..f6e8d2c 100644
--- a/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
@@ -9,12 +9,12 @@
 
 // <algorithm>
 
-// template<InputIterator InIter1, InputIterator InIter2, typename OutIter, 
-//          CopyConstructible Compare> 
-//   requires OutputIterator<OutIter, InIter1::reference> 
-//         && OutputIterator<OutIter, InIter2::reference> 
-//         && Predicate<Compare, InIter1::value_type, InIter2::value_type> 
-//         && Predicate<Compare, InIter2::value_type, InIter1::value_type> 
+// template<InputIterator InIter1, InputIterator InIter2, typename OutIter,
+//          CopyConstructible Compare>
+//   requires OutputIterator<OutIter, InIter1::reference>
+//         && OutputIterator<OutIter, InIter2::reference>
+//         && Predicate<Compare, InIter1::value_type, InIter2::value_type>
+//         && Predicate<Compare, InIter2::value_type, InIter1::value_type>
 //   OutIter
 //   set_difference(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2,
 //                  OutIter result, Compare comp);
diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
index e832215..6b3ede5 100644
--- a/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
@@ -9,11 +9,11 @@
 
 // <algorithm>
 
-// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> 
-//   requires OutputIterator<OutIter, InIter1::reference> 
-//         && OutputIterator<OutIter, InIter2::reference> 
-//         && HasLess<InIter2::value_type, InIter1::value_type> 
-//         && HasLess<InIter1::value_type, InIter2::value_type> 
+// template<InputIterator InIter1, InputIterator InIter2, typename OutIter>
+//   requires OutputIterator<OutIter, InIter1::reference>
+//         && OutputIterator<OutIter, InIter2::reference>
+//         && HasLess<InIter2::value_type, InIter1::value_type>
+//         && HasLess<InIter1::value_type, InIter2::value_type>
 //   OutIter
 //   set_intersection(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2,
 //                    OutIter result);
diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
index 64aaf19..6b6c391 100644
--- a/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
@@ -9,12 +9,12 @@
 
 // <algorithm>
 
-// template<InputIterator InIter1, InputIterator InIter2, typename OutIter, 
-//          CopyConstructible Compare> 
-//   requires OutputIterator<OutIter, InIter1::reference> 
-//         && OutputIterator<OutIter, InIter2::reference> 
-//         && Predicate<Compare, InIter1::value_type, InIter2::value_type> 
-//         && Predicate<Compare, InIter2::value_type, InIter1::value_type> 
+// template<InputIterator InIter1, InputIterator InIter2, typename OutIter,
+//          CopyConstructible Compare>
+//   requires OutputIterator<OutIter, InIter1::reference>
+//         && OutputIterator<OutIter, InIter2::reference>
+//         && Predicate<Compare, InIter1::value_type, InIter2::value_type>
+//         && Predicate<Compare, InIter2::value_type, InIter1::value_type>
 //   OutIter
 //   set_intersection(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2,
 //                    OutIter result, Compare comp);
diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
index b7e30f4..d1491c3 100644
--- a/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
@@ -9,11 +9,11 @@
 
 // <algorithm>
 
-// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> 
-//   requires OutputIterator<OutIter, InIter1::reference> 
-//         && OutputIterator<OutIter, InIter2::reference> 
-//         && HasLess<InIter2::value_type, InIter1::value_type> 
-//         && HasLess<InIter1::value_type, InIter2::value_type> 
+// template<InputIterator InIter1, InputIterator InIter2, typename OutIter>
+//   requires OutputIterator<OutIter, InIter1::reference>
+//         && OutputIterator<OutIter, InIter2::reference>
+//         && HasLess<InIter2::value_type, InIter1::value_type>
+//         && HasLess<InIter1::value_type, InIter2::value_type>
 //   OutIter
 //   set_symmetric_difference(InIter1 first1, InIter1 last1,
 //                            InIter2 first2, InIter2 last2,
diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
index b4614ba..35a26c6 100644
--- a/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
@@ -10,14 +10,14 @@
 // <algorithm>
 
 // template<InputIterator InIter1, InputIterator InIter2, typename OutIter,
-//          CopyConstructible Compare> 
-//   requires OutputIterator<OutIter, InIter1::reference> 
-//         && OutputIterator<OutIter, InIter2::reference> 
-//         && Predicate<Compare, InIter1::value_type, InIter2::value_type> 
-//         && Predicate<Compare, InIter2::value_type, InIter1::value_type> 
+//          CopyConstructible Compare>
+//   requires OutputIterator<OutIter, InIter1::reference>
+//         && OutputIterator<OutIter, InIter2::reference>
+//         && Predicate<Compare, InIter1::value_type, InIter2::value_type>
+//         && Predicate<Compare, InIter2::value_type, InIter1::value_type>
 //   OutIter
 //   set_symmetric_difference(InIter1 first1, InIter1 last1,
-//                            InIter2 first2, InIter2 last2, 
+//                            InIter2 first2, InIter2 last2,
 //                            OutIter result, Compare comp);
 
 #include <algorithm>
diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
index 669f05d..76dfed1 100644
--- a/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
@@ -9,11 +9,11 @@
 
 // <algorithm>
 
-// template<InputIterator InIter1, InputIterator InIter2, typename OutIter> 
-//   requires OutputIterator<OutIter, InIter1::reference> 
-//         && OutputIterator<OutIter, InIter2::reference> 
-//         && HasLess<InIter2::value_type, InIter1::value_type> 
-//         && HasLess<InIter1::value_type, InIter2::value_type> 
+// template<InputIterator InIter1, InputIterator InIter2, typename OutIter>
+//   requires OutputIterator<OutIter, InIter1::reference>
+//         && OutputIterator<OutIter, InIter2::reference>
+//         && HasLess<InIter2::value_type, InIter1::value_type>
+//         && HasLess<InIter1::value_type, InIter2::value_type>
 //   OutIter
 //   set_union(InIter1 first1, InIter1 last1,
 //             InIter2 first2, InIter2 last2, OutIter result);
diff --git a/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp b/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
index ff61b7e..0fbb43a 100644
--- a/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
@@ -10,11 +10,11 @@
 // <algorithm>
 
 // template<InputIterator InIter1, InputIterator InIter2, typename OutIter,
-//          CopyConstructible Compare> 
-//   requires OutputIterator<OutIter, InIter1::reference> 
-//         && OutputIterator<OutIter, InIter2::reference> 
-//         && Predicate<Compare, InIter1::value_type, InIter2::value_type> 
-//         && Predicate<Compare, InIter2::value_type, InIter1::value_type> 
+//          CopyConstructible Compare>
+//   requires OutputIterator<OutIter, InIter1::reference>
+//         && OutputIterator<OutIter, InIter2::reference>
+//         && Predicate<Compare, InIter1::value_type, InIter2::value_type>
+//         && Predicate<Compare, InIter2::value_type, InIter1::value_type>
 //   OutIter
 //   set_union(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2,
 //             OutIter result, Compare comp);
diff --git a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
index efdd51b..167a9c6 100644
--- a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter> 
-//   requires LessThanComparable<Iter::value_type> 
+// template<ForwardIterator Iter>
+//   requires LessThanComparable<Iter::value_type>
 //   bool
 //   is_sorted(Iter first, Iter last);
 
diff --git a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
index 3251aeb..4c39fa5 100644
--- a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires CopyConstructible<Compare> 
+// template<ForwardIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires CopyConstructible<Compare>
 //   bool
 //   is_sorted(Iter first, Iter last, Compare comp);
 
diff --git a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
index 63b904a..33a894d 100644
--- a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter> 
-//   requires LessThanComparable<Iter::value_type> 
+// template<ForwardIterator Iter>
+//   requires LessThanComparable<Iter::value_type>
 //   Iter
 //   is_sorted_until(Iter first, Iter last);
 
diff --git a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
index 8489490..0fdf2b8 100644
--- a/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
@@ -9,8 +9,8 @@
 
 // <algorithm>
 
-// template<ForwardIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires CopyConstructible<Compare> 
+// template<ForwardIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires CopyConstructible<Compare>
 //   Iter
 //   is_sorted_until(Iter first, Iter last, Compare comp);
 
diff --git a/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp b/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
index 03eda68..bdfb1c0 100644
--- a/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
@@ -9,11 +9,11 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, RandomAccessIterator RAIter> 
-//   requires ShuffleIterator<RAIter> 
-//         && OutputIterator<RAIter, InIter::reference> 
-//         && HasLess<InIter::value_type, RAIter::value_type> 
-//         && LessThanComparable<RAIter::value_type> 
+// template<InputIterator InIter, RandomAccessIterator RAIter>
+//   requires ShuffleIterator<RAIter>
+//         && OutputIterator<RAIter, InIter::reference>
+//         && HasLess<InIter::value_type, RAIter::value_type>
+//         && LessThanComparable<RAIter::value_type>
 //   RAIter
 //   partial_sort_copy(InIter first, InIter last, RAIter result_first, RAIter result_last);
 
diff --git a/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp b/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
index 1ffcf54..9505866 100644
--- a/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
@@ -9,12 +9,12 @@
 
 // <algorithm>
 
-// template<InputIterator InIter, RandomAccessIterator RAIter, class Compare> 
-//   requires ShuffleIterator<RAIter> 
-//         && OutputIterator<RAIter, InIter::reference> 
-//         && Predicate<Compare, InIter::value_type, RAIter::value_type> 
-//         && StrictWeakOrder<Compare, RAIter::value_type>} 
-//         && CopyConstructible<Compare> 
+// template<InputIterator InIter, RandomAccessIterator RAIter, class Compare>
+//   requires ShuffleIterator<RAIter>
+//         && OutputIterator<RAIter, InIter::reference>
+//         && Predicate<Compare, InIter::value_type, RAIter::value_type>
+//         && StrictWeakOrder<Compare, RAIter::value_type>}
+//         && CopyConstructible<Compare>
 //   RAIter
 //   partial_sort_copy(InIter first, InIter last,
 //                     RAIter result_first, RAIter result_last, Compare comp);
diff --git a/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp b/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp
index 8773ee5..74d06bb 100644
--- a/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires ShuffleIterator<Iter> 
-//         && LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires ShuffleIterator<Iter>
+//         && LessThanComparable<Iter::value_type>
 //   void
 //   partial_sort(Iter first, Iter middle, Iter last);
 
diff --git a/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp b/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp
index e54bfe4..d9e8e5f 100644
--- a/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires ShuffleIterator<Iter> 
-//         && CopyConstructible<Compare> 
+// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires ShuffleIterator<Iter>
+//         && CopyConstructible<Compare>
 //   void
 //   partial_sort(Iter first, Iter middle, Iter last, Compare comp);
 
@@ -29,7 +29,7 @@
         {return *x < *y;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 void
 test_larger_sorts(unsigned N, unsigned M)
@@ -83,5 +83,5 @@
     for (int i = 0; i < v.size()/2; ++i)
         assert(*v[i] == i);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp b/test/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
index e60d09f..a21f173 100644
--- a/test/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires ShuffleIterator<Iter> 
-//         && LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires ShuffleIterator<Iter>
+//         && LessThanComparable<Iter::value_type>
 //   void
 //   sort(Iter first, Iter last);
 
diff --git a/test/algorithms/alg.sorting/alg.sort/sort/sort_comp.pass.cpp b/test/algorithms/alg.sorting/alg.sort/sort/sort_comp.pass.cpp
index 2c9f63f..46f1abb 100644
--- a/test/algorithms/alg.sorting/alg.sort/sort/sort_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/sort/sort_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires ShuffleIterator<Iter> 
-//         && CopyConstructible<Compare> 
+// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires ShuffleIterator<Iter>
+//         && CopyConstructible<Compare>
 //   void
 //   sort(Iter first, Iter last, Compare comp);
 
@@ -29,8 +29,7 @@
         {return *x < *y;}
 };
 
-#endif
-
+#endif  // _LIBCPP_MOVE
 
 int main()
 {
@@ -54,5 +53,5 @@
     assert(*v[1] == 1);
     assert(*v[2] == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp b/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp
index 652bdc1..ce01122 100644
--- a/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter> 
-//   requires ShuffleIterator<Iter> 
-//         && LessThanComparable<Iter::value_type> 
+// template<RandomAccessIterator Iter>
+//   requires ShuffleIterator<Iter>
+//         && LessThanComparable<Iter::value_type>
 //   void
 //   stable_sort(Iter first, Iter last);
 
diff --git a/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp b/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp
index 89b807b..6b57c2d 100644
--- a/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp
+++ b/test/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort_comp.pass.cpp
@@ -9,9 +9,9 @@
 
 // <algorithm>
 
-// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare> 
-//   requires ShuffleIterator<Iter> 
-//         && CopyConstructible<Compare> 
+// template<RandomAccessIterator Iter, StrictWeakOrder<auto, Iter::value_type> Compare>
+//   requires ShuffleIterator<Iter>
+//         && CopyConstructible<Compare>
 //   void
 //   stable_sort(Iter first, Iter last, Compare comp);
 
@@ -29,7 +29,7 @@
         {return *x < *y;}
 };
 
-#endif
+#endif  // _LIBCPP_MOVE
 
 struct first_only
 {
@@ -79,5 +79,5 @@
     assert(*v[1] == 1);
     assert(*v[2] == 2);
     }
-#endif
+#endif  // _LIBCPP_MOVE
 }
diff --git a/test/algorithms/iterators.h b/test/algorithms/iterators.h
index 01b0e33..539a9a4 100644
--- a/test/algorithms/iterators.h
+++ b/test/algorithms/iterators.h
@@ -311,4 +311,4 @@
     return i;
 }
 
-#endif
+#endif  // ITERATORS_H