rebase

Author: huixie90

libcxx/include/CMakeLists.txt

@@ -357,7 +357,6 @@ set(files
   __filesystem/recursive_directory_iterator.h
   __filesystem/space_info.h
   __filesystem/u8path.h
-  __flat_map/container_traits.h
   __flat_map/flat_map.h
   __flat_map/sorted_unique.h
   __format/buffer.h

libcxx/include/__flat_map/container_traits.h

@@ -23,7 +23,6 @@
 #include <__concepts/convertible_to.h>
 #include <__concepts/swappable.h>
 #include <__config>
-#include <__flat_map/container_traits.h>
 #include <__flat_map/sorted_unique.h>
 #include <__functional/invoke.h>
 #include <__functional/is_transparent.h>
@@ -43,6 +42,7 @@
 #include <__ranges/subrange.h>
 #include <__ranges/zip_view.h>
 #include <__type_traits/conjunction.h>
+#include <__type_traits/container_traits.h>
 #include <__type_traits/invoke.h>
 #include <__type_traits/is_allocator.h>
 #include <__type_traits/is_nothrow_constructible.h>

libcxx/include/__flat_map/flat_map.h

@@ -194,7 +194,6 @@ template <class T, class Allocator, class Predicate>
 #include <__assert>
 #include <__config>
 #include <__debug_utils/sanitizers.h>
-#include <__flat_map/container_traits.h>
 #include <__format/enable_insertable.h>
 #include <__fwd/deque.h>
 #include <__iterator/distance.h>

libcxx/include/deque

@@ -39,7 +39,6 @@ namespace std {
 
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
-#include <__flat_map/container_traits.h>
 #include <__flat_map/flat_map.h>
 #include <__flat_map/sorted_unique.h>
 #include <version>

libcxx/include/flat_map

@@ -1225,7 +1225,7 @@ module std [system] {
     module flat_map                       { header "__flat_map/flat_map.h" }
     module sorted_unique                  { header "__flat_map/sorted_unique.h" }
 
-    head "flat_map"
+    header "flat_map"
     export *
   }
 

libcxx/include/module.modulemap

@@ -323,7 +323,6 @@ template<class T, class charT> requires is-vector-bool-reference<T> // Since C++
 #include <__concepts/same_as.h>
 #include <__config>
 #include <__debug_utils/sanitizers.h>
-#include <__flat_map/container_traits.h>
 #include <__format/enable_insertable.h>
 #include <__format/formatter.h>
 #include <__format/formatter_bool.h>
@@ -3006,23 +3005,6 @@ public:
     return __underlying_.format(__ref, __ctx);
   }
 };
-
-template <class _Tp, class _Allocator>
-inline constexpr bool __is_stl_container<vector<_Tp, _Allocator>> = true;
-
-template <class _Tp, class _Allocator>
-struct __container_traits<vector<_Tp, _Allocator>> {
-  // http://eel.is/c++draft/vector.modifiers#2
-  //  If an exception is thrown other than by the copy constructor, move constructor, assignment operator, or move
-  //  assignment operator of T or by any InputIterator operation, there are no effects. If an exception is thrown while
-  //  inserting a single element at the end and T is Cpp17CopyInsertable or is_nothrow_move_constructible_v<T> is true,
-  //  there are no effects. Otherwise, if an exception is thrown by the move constructor of a non-Cpp17CopyInsertable T,
-  //  the effects are unspecified.
-  static constexpr bool __emplacement_has_strong_exception_safety_guarantee =
-      is_nothrow_move_constructible_v<_Tp> ||
-      __is_cpp17_copy_insertable<typename vector<_Tp, _Allocator>::allocator_type>::value;
-};
-
 #endif // _LIBCPP_STD_VER >= 23
 
 template <class _Tp, class _Allocator>

libcxx/include/vector

@@ -39,8 +39,8 @@ int main(int, char**) {
 
     assert(mo.empty());
     assert(mo.key_comp() == C(5));
-    assert(mo.keys().get_allocator() == A(test_alloc_base::moved_value));
-    assert(mo.values().get_allocator() == A(test_alloc_base::moved_value));
+    assert(mo.keys().get_allocator().get_id() == test_alloc_base::moved_value);
+    assert(mo.values().get_allocator().get_id() == test_alloc_base::moved_value);
   }
   {
     using C = test_less<int>;
@@ -76,9 +76,9 @@ int main(int, char**) {
   {
     // moved-from object maintains invariant if one of underlying container does not clear after move
     using M = std::flat_map<int, int, std::less<>, std::vector<int>, CopyOnlyVector<int>>;
-    M m1    = M({1,2,3},{1,2,3});
-    M m2     = std::move(m1);
-    assert(m2.size()==3);
+    M m1    = M({1, 2, 3}, {1, 2, 3});
+    M m2    = std::move(m1);
+    assert(m2.size() == 3);
     assert(m1.keys().size() == m1.values().size());
     LIBCPP_ASSERT(m1.empty());
     LIBCPP_ASSERT(m1.keys().size() == 0);