Revert "[libc++] Implement P0429R9 std::flat_map (llvm#98643)"

This reverts commit 0be1883.

Author: Quuxplusone

libcxx/docs/ReleaseNotes/20.rst

@@ -44,7 +44,6 @@ Implemented Papers
 - P2985R0: A type trait for detecting virtual base classes (`Github <https://github.com/llvm/llvm-project/issues/105432>`__)
 - ``std::jthread`` and ``<stop_token>`` are not guarded behind ``-fexperimental-library`` anymore
 - P2674R1: A trait for implicit lifetime types (`Github <https://github.com/llvm/llvm-project/issues/105259>`__)
-- P0429R9: A Standard ``flat_map`` is partially implemented and ``flat_map`` is provided (`Github <https://github.com/llvm/llvm-project/issues/105190>`__)
 
 Improvements and New Features
 -----------------------------

libcxx/docs/Status/Cxx23Papers.csv

@@ -52,7 +52,7 @@
 "`P2443R1 <https://wg21.link/P2443R1>`__","``views::chunk_by``","2022-02 (Virtual)","|Complete|","18",""
 "","","","","",""
 "`P0009R18 <https://wg21.link/P0009R18>`__","mdspan: A Non-Owning Multidimensional Array Reference","2022-07 (Virtual)","|Complete|","18",""
-"`P0429R9 <https://wg21.link/P0429R9>`__","A Standard ``flat_map``","2022-07 (Virtual)","|In Progress|","",""
+"`P0429R9 <https://wg21.link/P0429R9>`__","A Standard ``flat_map``","2022-07 (Virtual)","","",""
 "`P1169R4 <https://wg21.link/P1169R4>`__","``static operator()``","2022-07 (Virtual)","|Complete|","16",""
 "`P1222R4 <https://wg21.link/P1222R4>`__","A Standard ``flat_set``","2022-07 (Virtual)","","",""
 "`P1223R5 <https://wg21.link/P1223R5>`__","``ranges::find_last()``, ``ranges::find_last_if()``, and ``ranges::find_last_if_not()``","2022-07 (Virtual)","|Complete|","19",""

libcxx/include/CMakeLists.txt

@@ -361,9 +361,6 @@ set(files
   __filesystem/recursive_directory_iterator.h
   __filesystem/space_info.h
   __filesystem/u8path.h
-  __flat_map/flat_map.h
-  __flat_map/key_value_iterator.h
-  __flat_map/sorted_unique.h
   __format/buffer.h
   __format/concepts.h
   __format/container_adaptor.h
@@ -982,7 +979,6 @@ set(files
   ext/hash_set
   fenv.h
   filesystem
-  flat_map
   float.h
   format
   forward_list

libcxx/include/__flat_map/flat_map.h

@@ -1243,15 +1243,6 @@ module std [system] {
     export *
   }
 
-  module flat_map {
-    module flat_map                       { header "__flat_map/flat_map.h" }
-    module key_value_iterator             { header "__flat_map/key_value_iterator.h" }
-    module sorted_unique                  { header "__flat_map/sorted_unique.h" }
-
-    header "flat_map"
-    export *
-  }
-
   module format {
     module buffer                             {
       header "__format/buffer.h"

libcxx/include/__flat_map/key_value_iterator.h

@@ -53,6 +53,9 @@ module;
 #  if __has_include(<debugging>)
 #    error "please update the header information for <debugging> in headers_not_available in utils/libcxx/header_information.py"
 #  endif // __has_include(<debugging>)
+#  if __has_include(<flat_map>)
+#    error "please update the header information for <flat_map> in headers_not_available in utils/libcxx/header_information.py"
+#  endif // __has_include(<flat_map>)
 #  if __has_include(<flat_set>)
 #    error "please update the header information for <flat_set> in headers_not_available in utils/libcxx/header_information.py"
 #  endif // __has_include(<flat_set>)

libcxx/include/__flat_map/sorted_unique.h

@@ -64,7 +64,6 @@ module;
 #include <execution>
 #include <expected>
 #include <filesystem>
-#include <flat_map>
 #include <format>
 #include <forward_list>
 #if _LIBCPP_HAS_LOCALIZATION
@@ -162,6 +161,9 @@ module;
 #  if __has_include(<debugging>)
 #    error "please update the header information for <debugging> in headers_not_available in utils/libcxx/header_information.py"
 #  endif // __has_include(<debugging>)
+#  if __has_include(<flat_map>)
+#    error "please update the header information for <flat_map> in headers_not_available in utils/libcxx/header_information.py"
+#  endif // __has_include(<flat_map>)
 #  if __has_include(<flat_set>)
 #    error "please update the header information for <flat_set> in headers_not_available in utils/libcxx/header_information.py"
 #  endif // __has_include(<flat_set>)

libcxx/include/flat_map

@@ -8,26 +8,24 @@
 //===----------------------------------------------------------------------===//
 
 export namespace std {
-#if _LIBCPP_STD_VER >= 23
-  // [flat.map], class template flat_map
+#if 0
+  // [flat.map], class template flat_­map
   using std::flat_map;
 
   using std::sorted_unique;
   using std::sorted_unique_t;
 
   using std::uses_allocator;
 
-  // [flat.map.erasure], erasure for flat_map
+  // [flat.map.erasure], erasure for flat_­map
   using std::erase_if;
 
-#endif // _LIBCPP_STD_VER >= 23
-#if 0
-  // [flat.multimap], class template flat_multimap
+  // [flat.multimap], class template flat_­multimap
   using std::flat_multimap;
 
   using std::sorted_equivalent;
   using std::sorted_equivalent_t;
 
-  // [flat.multimap.erasure], erasure for flat_multimap
+  // [flat.multimap.erasure], erasure for flat_­multimap
 #endif
 } // namespace std