ci

Author: huixie90

libcxx/include/__flat_set/flat_multiset.h

@@ -68,7 +68,6 @@
 #include <__utility/pair.h>
 #include <__utility/scope_guard.h>
 #include <__vector/vector.h>
-#include <algorithm>
 #include <initializer_list>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

libcxx/include/__flat_set/flat_set.h

@@ -10,7 +10,6 @@
 #ifndef _LIBCPP___FLAT_SET_FLAT_SET_H
 #define _LIBCPP___FLAT_SET_FLAT_SET_H
 
-#include "utils.h"
 #include <__algorithm/lexicographical_compare_three_way.h>
 #include <__algorithm/lower_bound.h>
 #include <__algorithm/min.h>

libcxx/include/flat_set

@@ -55,10 +55,10 @@ namespace std {
 #  include <__config>
 
 #  if _LIBCPP_STD_VER >= 23
-#    include <__flat_map/sorted_unique.h>
 #    include <__flat_map/sorted_equivalent.h>
-#    include <__flat_set/flat_set.h>
+#    include <__flat_map/sorted_unique.h>
 #    include <__flat_set/flat_multiset.h>
+#    include <__flat_set/flat_set.h>
 #  endif
 
 // for feature-test macros

libcxx/include/module.modulemap

@@ -1304,6 +1304,7 @@ module std [system] {
   module flat_set {
     module flat_set                       {
       header "__flat_set/flat_set.h"
+      header "__flat_set/flat_multiset.h"
       export std.vector.vector
       export std.vector.fwd
     }

libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.modifiers/insert_initializer_list.pass.cpp

@@ -26,7 +26,6 @@ template <class KeyContainer>
 void test_one() {
   using Key = typename KeyContainer::value_type;
   using M   = std::flat_multiset<Key, std::less<Key>, KeyContainer>;
-  using V   = typename M::value_type;
 
   {
     M m = {1, 1, 1, 3, 3, 3};

libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.modifiers/insert_sorted_initializer_list.pass.cpp

@@ -26,7 +26,6 @@ template <class KeyContainer>
 void test_one() {
   using Key = typename KeyContainer::value_type;
   using M   = std::flat_multiset<Key, std::less<Key>, KeyContainer>;
-  using V   = Key;
   {
     M m = {1, 1, 1, 3, 3, 3};
     m.insert(std::sorted_equivalent, {0, 1, 1, 2, 2, 4});

libcxx/utils/libcxx/test/modules.py

@@ -93,6 +93,7 @@
 ExtraHeader["functional"] = "v1/__compare/compare_three_way.h$"
 
 # <flat_set> reuses some functionality defined inside <flat_map>
+ExtraHeader["flat_set"] = "v1/__flat_map/sorted_equivalent.h$"
 ExtraHeader["flat_set"] = "v1/__flat_map/sorted_unique.h$"
 
 # Some C compatibility headers define std::size_t, which is in <__cstddef/size_t.h>