review comments

Author: huixie90

libcxx/include/__flat_set/ra_iterator.h

@@ -10,6 +10,7 @@
 #ifndef _LIBCPP___FLAT_SET_RA_ITERATOR_H
 #define _LIBCPP___FLAT_SET_RA_ITERATOR_H
 
+#include "__type_traits/is_same.h"
 #include <__compare/three_way_comparable.h>
 #include <__config>
 #include <__iterator/incrementable_traits.h>
@@ -42,7 +43,7 @@ struct __ra_iterator {
   friend _Container;
 
   // note: checking the concept random_access_iterator does not work for incomplete types
-  static_assert(__is_same(iterator_traits<_Iterator>::iterator_category, random_access_iterator_tag),
+  static_assert(_IsSame<typename iterator_traits<_Iterator>::iterator_category, random_access_iterator_tag>::value,
                 "Underlying iterator must be a random access iterator");
 
 public:

libcxx/test/libcxx/containers/container.adaptors/flat.set/iterator.compile.pass.cpp

@@ -39,4 +39,4 @@ static_assert(!std::is_convertible_v<Iter3, Iter4>);
 static_assert(!std::is_convertible_v<Iter4, Iter1>);
 static_assert(!std::is_convertible_v<Iter4, Iter2>);
 static_assert(!std::is_convertible_v<Iter4, Iter3>);
-static_assert(std::is_convertible_v<Iter4, Iter4>);
+static_assert(std::is_convertible_v<Iter4, Iter4>);

libcxx/test/std/containers/container.adaptors/flat.set/flat.set.modifiers/erase_iter.pass.cpp

@@ -43,62 +43,50 @@ void test_one() {
       8,
   };
   M m(ar, ar + sizeof(ar) / sizeof(ar[0]));
+
+  auto make = [](std::initializer_list<int> il) {
+    M m;
+    for (int i : il) {
+      m.emplace(i);
+    }
+    return m;
+  };
   assert(m.size() == 8);
+  assert(m == make({1, 2, 3, 4, 5, 6, 7, 8}));
   std::same_as<I> decltype(auto) i1 = m.erase(std::next(m.cbegin(), 3));
   assert(m.size() == 7);
   assert(i1 == std::next(m.begin(), 3));
-  assert(*m.begin() == 1);
-  assert(*std::next(m.begin()) == 2);
-  assert(*std::next(m.begin(), 2) == 3);
-  assert(*std::next(m.begin(), 3) == 5);
-  assert(*std::next(m.begin(), 4) == 6);
-  assert(*std::next(m.begin(), 5) == 7);
-  assert(*std::next(m.begin(), 6) == 8);
+  assert(m == make({1, 2, 3, 5, 6, 7, 8}));
 
   std::same_as<I> decltype(auto) i2 = m.erase(std::next(m.begin(), 0));
   assert(m.size() == 6);
   assert(i2 == m.begin());
-  assert(*m.begin() == 2);
-  assert(*std::next(m.begin()) == 3);
-  assert(*std::next(m.begin(), 2) == 5);
-  assert(*std::next(m.begin(), 3) == 6);
-  assert(*std::next(m.begin(), 4) == 7);
-  assert(*std::next(m.begin(), 5) == 8);
+  assert(m == make({2, 3, 5, 6, 7, 8}));
 
   std::same_as<I> decltype(auto) i3 = m.erase(std::next(m.cbegin(), 5));
   assert(m.size() == 5);
   assert(i3 == m.end());
-  assert(*m.begin() == 2);
-  assert(*std::next(m.begin()) == 3);
-  assert(*std::next(m.begin(), 2) == 5);
-  assert(*std::next(m.begin(), 3) == 6);
-  assert(*std::next(m.begin(), 4) == 7);
+  assert(m == make({2, 3, 5, 6, 7}));
 
   std::same_as<I> decltype(auto) i4 = m.erase(std::next(m.begin(), 1));
   assert(m.size() == 4);
   assert(i4 == std::next(m.begin()));
-  assert(*m.begin() == 2);
-  assert(*std::next(m.begin()) == 5);
-  assert(*std::next(m.begin(), 2) == 6);
-  assert(*std::next(m.begin(), 3) == 7);
+  assert(m == make({2, 5, 6, 7}));
 
   std::same_as<I> decltype(auto) i5 = m.erase(std::next(m.cbegin(), 2));
   assert(m.size() == 3);
   assert(i5 == std::next(m.begin(), 2));
-  assert(*m.begin() == 2);
-  assert(*std::next(m.begin()) == 5);
-  assert(*std::next(m.begin(), 2) == 7);
+  assert(m == make({2, 5, 7}));
 
   std::same_as<I> decltype(auto) i6 = m.erase(std::next(m.begin(), 2));
   assert(m.size() == 2);
   assert(i6 == std::next(m.begin(), 2));
-  assert(*m.begin() == 2);
-  assert(*std::next(m.begin()) == 5);
+  assert(m == make({2, 5}));
 
   std::same_as<I> decltype(auto) i7 = m.erase(std::next(m.cbegin(), 0));
   assert(m.size() == 1);
   assert(i7 == std::next(m.begin(), 0));
-  assert(*m.begin() == 5);
+  assert(m == make({5}));
 
   std::same_as<I> decltype(auto) i8 = m.erase(m.begin());
   assert(m.size() == 0);

libcxx/test/std/containers/container.adaptors/flat.set/flat.set.modifiers/erase_iter_iter.pass.cpp

@@ -31,6 +31,14 @@ void test_one() {
   using M   = std::flat_set<Key, std::less<Key>, KeyContainer>;
   using I   = M::iterator;
 
+  auto make = [](std::initializer_list<int> il) {
+    M m;
+    for (int i : il) {
+      m.emplace(i);
+    }
+    return m;
+  };
+
   int ar[] = {
       1,
       2,
@@ -46,30 +54,17 @@ void test_one() {
   std::same_as<I> decltype(auto) i1 = m.erase(m.cbegin(), m.cbegin());
   assert(m.size() == 8);
   assert(i1 == m.begin());
-  assert(*m.begin() == 1);
-  assert(*std::next(m.begin()) == 2);
-  assert(*std::next(m.begin(), 2) == 3);
-  assert(*std::next(m.begin(), 3) == 4);
-  assert(*std::next(m.begin(), 4) == 5);
-  assert(*std::next(m.begin(), 5) == 6);
-  assert(*std::next(m.begin(), 6) == 7);
-  assert(*std::next(m.begin(), 7) == 8);
+  assert(m == make({1, 2, 3, 4, 5, 6, 7, 8}));
 
   std::same_as<I> decltype(auto) i2 = m.erase(m.cbegin(), std::next(m.cbegin(), 2));
   assert(m.size() == 6);
   assert(i2 == m.begin());
-  assert(*std::next(m.begin(), 0) == 3);
-  assert(*std::next(m.begin(), 1) == 4);
-  assert(*std::next(m.begin(), 2) == 5);
-  assert(*std::next(m.begin(), 3) == 6);
-  assert(*std::next(m.begin(), 4) == 7);
-  assert(*std::next(m.begin(), 5) == 8);
+  assert(m == make({3, 4, 5, 6, 7, 8}));
 
   std::same_as<I> decltype(auto) i3 = m.erase(std::next(m.cbegin(), 2), std::next(m.cbegin(), 6));
   assert(m.size() == 2);
   assert(i3 == std::next(m.begin(), 2));
-  assert(*std::next(m.begin(), 0) == 3);
-  assert(*std::next(m.begin(), 1) == 4);
+  assert(m == make({3, 4}));
 
   std::same_as<I> decltype(auto) i4 = m.erase(m.cbegin(), m.cend());
   assert(m.size() == 0);