CI again

Author: huixie90

libcxx/include/module.modulemap

@@ -1291,8 +1291,8 @@ module std [system] {
       header "__flat_set/flat_set.h"
       export std.vector.vector
       export std.vector.fwd
-      export std.flat_map.sorted_unique
     }
+    module sorted_unique                  { header "__flat_map/sorted_unique.h" }
 
     header "flat_set"
     export *

libcxx/test/std/containers/container.adaptors/flat.set/flat.set.cons/default.pass.cpp

@@ -53,7 +53,6 @@ void test() {
   }
   {
     using A1 = explicit_allocator<int>;
-    using A2 = explicit_allocator<char*>;
     {
       std::flat_set<int, DefaultCtableComp, std::vector<int, A1>> m;
       assert(m.empty());

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

@@ -146,9 +146,9 @@ void test_exception() {
     auto insert_func = [](auto& m, auto key_arg) {
       using FlatSet = std::decay_t<decltype(m)>;
       struct T {
-        typename FlatSet::key_type key;
-        T(typename FlatSet::key_type key) : key(key) {}
-        operator typename FlatSet::value_type() const { return key; }
+        typename FlatSet::key_type key_;
+        T(typename FlatSet::key_type key) : key_(key) {}
+        operator typename FlatSet::value_type() const { return key_; }
       };
       T t(key_arg);
       m.insert(t);