[libcxx-commits] [libcxx] [libc++] Implement P2077R3 Heterogeneous erasure overloads for associative containers (PR #78277)

Tue Jan 16 05:51:58 PST 2024

github-actions[bot] wrote:




:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff da6806dcb45d311efceaba0d770d9027d68a0de9 db3ba9998384f103b388be36cca99094c4bebf3e -- libcxx/test/std/containers/associative/map/map.modifiers/erase_tran.pass.cpp libcxx/test/std/containers/associative/map/map.modifiers/erase_tran1.compile.fail.cpp libcxx/test/std/containers/associative/map/map.modifiers/erase_tran2.compile.fail.cpp libcxx/test/std/containers/associative/map/map.modifiers/erase_tran3.compile.fail.cpp libcxx/test/std/containers/associative/map/map.modifiers/erase_tran4.pass.cpp libcxx/test/std/containers/associative/map/map.modifiers/erase_tran5.pass.cpp libcxx/test/std/containers/associative/map/map.modifiers/extract_tran.pass.cpp libcxx/test/std/containers/associative/map/map.modifiers/extract_tran1.compile.fail.cpp libcxx/test/std/containers/associative/map/map.modifiers/extract_tran2.compile.fail.cpp libcxx/test/std/containers/associative/map/map.modifiers/extract_tran3.compile.fail.cpp libcxx/test/std/containers/associative/map/map.modifiers/extract_tran4.pass.cpp libcxx/test/std/containers/associative/map/map.modifiers/extract_tran5.pass.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran.pass.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran1.compile.fail.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran2.compile.fail.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran3.compile.fail.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran4.pass.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran5.pass.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran.pass.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran1.compile.fail.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran2.compile.fail.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran3.compile.fail.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran4.pass.cpp libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran5.pass.cpp libcxx/test/std/containers/associative/multiset/erase_tran.pass.cpp libcxx/test/std/containers/associative/multiset/erase_tran1.compile.fail.cpp libcxx/test/std/containers/associative/multiset/erase_tran2.compile.fail.cpp libcxx/test/std/containers/associative/multiset/erase_tran3.compile.fail.cpp libcxx/test/std/containers/associative/multiset/erase_tran4.pass.cpp libcxx/test/std/containers/associative/multiset/erase_tran5.pass.cpp libcxx/test/std/containers/associative/multiset/extract_tran.pass.cpp libcxx/test/std/containers/associative/multiset/extract_tran1.compile.fail.cpp libcxx/test/std/containers/associative/multiset/extract_tran2.compile.fail.cpp libcxx/test/std/containers/associative/multiset/extract_tran3.compile.fail.cpp libcxx/test/std/containers/associative/multiset/extract_tran4.pass.cpp libcxx/test/std/containers/associative/multiset/extract_tran5.pass.cpp libcxx/test/std/containers/associative/set/erase_tran.pass.cpp libcxx/test/std/containers/associative/set/erase_tran1.compile.fail.cpp libcxx/test/std/containers/associative/set/erase_tran2.compile.fail.cpp libcxx/test/std/containers/associative/set/erase_tran3.compile.fail.cpp libcxx/test/std/containers/associative/set/erase_tran4.pass.cpp libcxx/test/std/containers/associative/set/erase_tran5.pass.cpp libcxx/test/std/containers/associative/set/extract_tran.pass.cpp libcxx/test/std/containers/associative/set/extract_tran1.compile.fail.cpp libcxx/test/std/containers/associative/set/extract_tran2.compile.fail.cpp libcxx/test/std/containers/associative/set/extract_tran3.compile.fail.cpp libcxx/test/std/containers/associative/set/extract_tran4.pass.cpp libcxx/test/std/containers/associative/set/extract_tran5.pass.cpp libcxx/include/__hash_table libcxx/include/__tree libcxx/include/map libcxx/include/set libcxx/include/unordered_map libcxx/include/unordered_set libcxx/include/version
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff

diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran.pass.cpp
index cd77c3ce27..b9072ec5bd 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran.pass.cpp
@@ -23,15 +23,13 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
+int main(int, char**) {
   {
     typedef std::map<int, double, transparent_less> M;
     M example;
@@ -45,9 +43,9 @@ int main(int, char**)
   {
     typedef std::map<int, double, transparent_less> M;
     M example;
-    example.insert({ 5, 1. });
-    example.insert({ 6, 2. });
-    example.insert({ 4, 0. });
+    example.insert({5, 1.});
+    example.insert({6, 2.});
+    example.insert({4, 0.});
     assert(example.size() == 3);
     M::size_type erased = example.erase(C2Int{5});
     assert(erased == 1);
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran1.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran1.compile.fail.cpp
index cc3269a85b..1202b3b95c 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran1.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::map<int, double, transparent_less_no_type> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran2.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran2.compile.fail.cpp
index e408ec93bc..5b49a587b5 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran2.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::map<int, double, transparent_less_private> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran3.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran3.compile.fail.cpp
index 26e305352e..db642780b9 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran3.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::map<int, double, transparent_less_not_a_type> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran4.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran4.pass.cpp
index 35f8e61661..0d8330c674 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran4.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran4.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
@@ -34,16 +33,13 @@ typedef std::map<int, double, transparent_less> M;
 M example;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() {
-    return example.begin();
-  }
+  operator M::const_iterator() { return example.begin(); }
 };
 
-int main(int, char**)
-{
-    {
-    example.insert({ 2, 3. });
+int main(int, char**) {
+  {
+    example.insert({2, 3.});
     M::iterator erased = example.erase(Convertible());
     assert(example.empty() && erased == example.end());
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran5.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran5.pass.cpp
index c65d80a8f1..84a8a94c3b 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran5.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/erase_tran5.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
@@ -33,20 +32,18 @@
 typedef std::map<int, double, transparent_less> M;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() const {
-    assert(false);
-  }
+  operator M::const_iterator() const { assert(false); }
+
 private:
   operator M::const_iterator();
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     Convertible c;
     M example;
-    example.insert({ 0, 1. });
+    example.insert({0, 1.});
     M::size_type erased = example.erase(c);
     assert(erased == 1);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran.pass.cpp
index 586c3a0100..00767524e7 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran.pass.cpp
@@ -23,15 +23,13 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
+int main(int, char**) {
   {
     typedef std::map<int, double, transparent_less> M;
     M example;
@@ -45,9 +43,9 @@ int main(int, char**)
   {
     typedef std::map<int, double, transparent_less> M;
     M example;
-    example.insert({ 5, 1. });
-    example.insert({ 6, 2. });
-    example.insert({ 4, 0. });
+    example.insert({5, 1.});
+    example.insert({6, 2.});
+    example.insert({4, 0.});
     assert(example.size() == 3);
     M::node_type nh = example.extract(C2Int{5});
     assert(nh && nh.key() == 5 && nh.mapped() == 1.);
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran1.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran1.compile.fail.cpp
index 4c5e84ed0a..f819541a53 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran1.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::map<int, double, transparent_less_no_type> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran2.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran2.compile.fail.cpp
index 7c5f2e7fa6..2eb0331298 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran2.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::map<int, double, transparent_less_private> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran3.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran3.compile.fail.cpp
index b8377318d4..e01eef5c5a 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran3.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::map<int, double, transparent_less_not_a_type> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran4.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran4.pass.cpp
index cf11b09ef8..4d469fad49 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran4.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran4.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
@@ -34,16 +33,13 @@ typedef std::map<int, double, transparent_less> M;
 M example;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() {
-    return example.begin();
-  }
+  operator M::const_iterator() { return example.begin(); }
 };
 
-int main(int, char**)
-{
-    {
-    example.insert({ 2, 3. });
+int main(int, char**) {
+  {
+    example.insert({2, 3.});
     M::node_type nh = example.extract(Convertible());
     assert(nh && nh.key() == 2 && nh.mapped() == 3.);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran5.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran5.pass.cpp
index f2c3ba0501..1adc76488f 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran5.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/extract_tran5.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
@@ -33,20 +32,18 @@
 typedef std::map<int, double, transparent_less> M;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() const {
-    assert(false);
-  }
+  operator M::const_iterator() const { assert(false); }
+
 private:
   operator M::const_iterator();
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     Convertible c;
     M example;
-    example.insert({ 0, 1. });
+    example.insert({0, 1.});
     M::node_type nh = example.extract(c);
     assert(nh && nh.key() == 0 && nh.mapped() == 1.);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran.pass.cpp
index f1b4f51203..525518e911 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran.pass.cpp
@@ -23,15 +23,13 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
+int main(int, char**) {
   {
     typedef std::multimap<int, double, transparent_less> M;
     M example;
@@ -45,9 +43,9 @@ int main(int, char**)
   {
     typedef std::multimap<int, double, transparent_less> M;
     M example;
-    example.insert({ 5, 1. });
-    example.insert({ 6, 2. });
-    example.insert({ 4, 0. });
+    example.insert({5, 1.});
+    example.insert({6, 2.});
+    example.insert({4, 0.});
     assert(example.size() == 3);
     M::size_type erased = example.erase(C2Int{5});
     assert(erased == 1);
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran1.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran1.compile.fail.cpp
index 8933471c30..59c7010b7d 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran1.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multimap<int, double, transparent_less_no_type> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran2.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran2.compile.fail.cpp
index 2d0a51caf3..773a9c74d7 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran2.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multimap<int, double, transparent_less_private> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran3.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran3.compile.fail.cpp
index f0afe4797e..f5d43e4ab5 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran3.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multimap<int, double, transparent_less_not_a_type> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran4.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran4.pass.cpp
index e3bc93f262..843dc49cd2 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran4.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran4.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
@@ -34,16 +33,13 @@ typedef std::multimap<int, double, transparent_less> M;
 M example;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() {
-    return example.begin();
-  }
+  operator M::const_iterator() { return example.begin(); }
 };
 
-int main(int, char**)
-{
-    {
-    example.insert({ 2, 3. });
+int main(int, char**) {
+  {
+    example.insert({2, 3.});
     M::iterator erased = example.erase(Convertible());
     assert(example.empty() && erased == example.end());
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran5.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran5.pass.cpp
index c97389c79d..748d6d9d6d 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran5.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_tran5.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
@@ -33,20 +32,18 @@
 typedef std::multimap<int, double, transparent_less> M;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() const {
-    assert(false);
-  }
+  operator M::const_iterator() const { assert(false); }
+
 private:
   operator M::const_iterator();
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     Convertible c;
     M example;
-    example.insert({ 0, 1. });
+    example.insert({0, 1.});
     M::size_type erased = example.erase(c);
     assert(erased == 1);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran.pass.cpp
index 34f02a7aca..5e0748870e 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran.pass.cpp
@@ -23,15 +23,13 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
+int main(int, char**) {
   {
     typedef std::multimap<int, double, transparent_less> M;
     M example;
@@ -45,9 +43,9 @@ int main(int, char**)
   {
     typedef std::multimap<int, double, transparent_less> M;
     M example;
-    example.insert({ 5, 1. });
-    example.insert({ 6, 2. });
-    example.insert({ 4, 0. });
+    example.insert({5, 1.});
+    example.insert({6, 2.});
+    example.insert({4, 0.});
     assert(example.size() == 3);
     M::node_type nh = example.extract(C2Int{5});
     assert(nh && nh.key() == 5 && nh.mapped() == 1.);
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran1.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran1.compile.fail.cpp
index 4ab69c5af8..1c987a690c 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran1.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multimap<int, double, transparent_less_no_type> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran2.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran2.compile.fail.cpp
index 0a0ec1d849..c31f29bd2e 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran2.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multimap<int, double, transparent_less_private> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran3.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran3.compile.fail.cpp
index 57b3836520..6af1808025 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran3.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multimap<int, double, transparent_less_not_a_type> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran4.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran4.pass.cpp
index c1fc767777..6ae8b1b668 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran4.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran4.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
@@ -34,16 +33,13 @@ typedef std::multimap<int, double, transparent_less> M;
 M example;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() {
-    return example.begin();
-  }
+  operator M::const_iterator() { return example.begin(); }
 };
 
-int main(int, char**)
-{
-    {
-    example.insert({ 2, 3. });
+int main(int, char**) {
+  {
+    example.insert({2, 3.});
     M::node_type nh = example.extract(Convertible());
     assert(nh && nh.key() == 2 && nh.mapped() == 3.);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran5.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran5.pass.cpp
index d6a994f3c2..5b74e667ee 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran5.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_tran5.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <map>
 #include <cassert>
 
@@ -33,20 +32,18 @@
 typedef std::multimap<int, double, transparent_less> M;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() const {
-    assert(false);
-  }
+  operator M::const_iterator() const { assert(false); }
+
 private:
   operator M::const_iterator();
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     Convertible c;
     M example;
-    example.insert({ 0, 1. });
+    example.insert({0, 1.});
     M::node_type nh = example.extract(c);
     assert(nh && nh.key() == 0 && nh.mapped() == 1.);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multiset/erase_tran.pass.cpp b/libcxx/test/std/containers/associative/multiset/erase_tran.pass.cpp
index 224e890ecc..bc74b05dd7 100644
--- a/libcxx/test/std/containers/associative/multiset/erase_tran.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/erase_tran.pass.cpp
@@ -23,15 +23,13 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
+int main(int, char**) {
   {
     typedef std::multiset<int, transparent_less> M;
     M example;
diff --git a/libcxx/test/std/containers/associative/multiset/erase_tran1.compile.fail.cpp b/libcxx/test/std/containers/associative/multiset/erase_tran1.compile.fail.cpp
index 75c4379d74..6cdd9965c3 100644
--- a/libcxx/test/std/containers/associative/multiset/erase_tran1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multiset/erase_tran1.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multiset<int, transparent_less_no_type> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multiset/erase_tran2.compile.fail.cpp b/libcxx/test/std/containers/associative/multiset/erase_tran2.compile.fail.cpp
index 898c366032..d02d7f7e0b 100644
--- a/libcxx/test/std/containers/associative/multiset/erase_tran2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multiset/erase_tran2.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multiset<int, transparent_less_private> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multiset/erase_tran3.compile.fail.cpp b/libcxx/test/std/containers/associative/multiset/erase_tran3.compile.fail.cpp
index 17b4cf8f35..5a88dac5ca 100644
--- a/libcxx/test/std/containers/associative/multiset/erase_tran3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multiset/erase_tran3.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multiset<int, transparent_less_not_a_type> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multiset/erase_tran4.pass.cpp b/libcxx/test/std/containers/associative/multiset/erase_tran4.pass.cpp
index 6798006f60..a96f9184ec 100644
--- a/libcxx/test/std/containers/associative/multiset/erase_tran4.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/erase_tran4.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
@@ -34,16 +33,13 @@ typedef std::multiset<int, transparent_less> M;
 M example;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() {
-    return example.begin();
-  }
+  operator M::const_iterator() { return example.begin(); }
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     example.insert(2);
     M::iterator erased = example.erase(Convertible());
     assert(example.empty() && erased == example.end());
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multiset/erase_tran5.pass.cpp b/libcxx/test/std/containers/associative/multiset/erase_tran5.pass.cpp
index 7dca3421f0..4809b8680f 100644
--- a/libcxx/test/std/containers/associative/multiset/erase_tran5.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/erase_tran5.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
@@ -33,20 +32,18 @@
 typedef std::multiset<int, transparent_less> M;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() const {
-    assert(false);
-  }
+  operator M::const_iterator() const { assert(false); }
+
 private:
   operator M::const_iterator();
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     Convertible c;
     M example;
     example.insert(0);
     M::size_type erased = example.erase(c);
     assert(erased == 1);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multiset/extract_tran.pass.cpp b/libcxx/test/std/containers/associative/multiset/extract_tran.pass.cpp
index c155d09bb9..84931ed276 100644
--- a/libcxx/test/std/containers/associative/multiset/extract_tran.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/extract_tran.pass.cpp
@@ -23,15 +23,13 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
+int main(int, char**) {
   {
     typedef std::multiset<int, transparent_less> M;
     M example;
diff --git a/libcxx/test/std/containers/associative/multiset/extract_tran1.compile.fail.cpp b/libcxx/test/std/containers/associative/multiset/extract_tran1.compile.fail.cpp
index b3d4f6473a..9d355e5f9d 100644
--- a/libcxx/test/std/containers/associative/multiset/extract_tran1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multiset/extract_tran1.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multiset<int, transparent_less_no_type> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multiset/extract_tran2.compile.fail.cpp b/libcxx/test/std/containers/associative/multiset/extract_tran2.compile.fail.cpp
index 8fc73752ce..b7b907261a 100644
--- a/libcxx/test/std/containers/associative/multiset/extract_tran2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multiset/extract_tran2.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multiset<int, transparent_less_private> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multiset/extract_tran3.compile.fail.cpp b/libcxx/test/std/containers/associative/multiset/extract_tran3.compile.fail.cpp
index e9b4a6b499..18654721a4 100644
--- a/libcxx/test/std/containers/associative/multiset/extract_tran3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multiset/extract_tran3.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::multiset<int, transparent_less_not_a_type> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multiset/extract_tran4.pass.cpp b/libcxx/test/std/containers/associative/multiset/extract_tran4.pass.cpp
index ec526ac4b8..b5528aef8a 100644
--- a/libcxx/test/std/containers/associative/multiset/extract_tran4.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/extract_tran4.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
@@ -34,16 +33,13 @@ typedef std::multiset<int, transparent_less> M;
 M example;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() {
-    return example.begin();
-  }
+  operator M::const_iterator() { return example.begin(); }
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     example.insert(2);
     M::node_type nh = example.extract(Convertible());
     assert(nh && nh.value() == 2);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/multiset/extract_tran5.pass.cpp b/libcxx/test/std/containers/associative/multiset/extract_tran5.pass.cpp
index 4049e28b5c..fa474b9b96 100644
--- a/libcxx/test/std/containers/associative/multiset/extract_tran5.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/extract_tran5.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
@@ -33,20 +32,18 @@
 typedef std::multiset<int, transparent_less> M;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() const {
-    assert(false);
-  }
+  operator M::const_iterator() const { assert(false); }
+
 private:
   operator M::const_iterator();
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     Convertible c;
     M example;
     example.insert(0);
     M::node_type nh = example.extract(c);
     assert(nh && nh.value() == 0);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/set/erase_tran.pass.cpp b/libcxx/test/std/containers/associative/set/erase_tran.pass.cpp
index 41360c0c55..c6e61f65b1 100644
--- a/libcxx/test/std/containers/associative/set/erase_tran.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/erase_tran.pass.cpp
@@ -23,15 +23,13 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
+int main(int, char**) {
   {
     typedef std::set<int, transparent_less> M;
     M example;
diff --git a/libcxx/test/std/containers/associative/set/erase_tran1.compile.fail.cpp b/libcxx/test/std/containers/associative/set/erase_tran1.compile.fail.cpp
index b92e1528a1..94d091bc3b 100644
--- a/libcxx/test/std/containers/associative/set/erase_tran1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/set/erase_tran1.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::set<int, transparent_less_no_type> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/set/erase_tran2.compile.fail.cpp b/libcxx/test/std/containers/associative/set/erase_tran2.compile.fail.cpp
index 47ee54c949..01367b0254 100644
--- a/libcxx/test/std/containers/associative/set/erase_tran2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/set/erase_tran2.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::set<int, transparent_less_private> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/set/erase_tran3.compile.fail.cpp b/libcxx/test/std/containers/associative/set/erase_tran3.compile.fail.cpp
index f82f962792..4d0a10acfc 100644
--- a/libcxx/test/std/containers/associative/set/erase_tran3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/set/erase_tran3.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::set<int, transparent_less_not_a_type> M;
 
     TEST_IGNORE_NODISCARD M().erase(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/set/erase_tran4.pass.cpp b/libcxx/test/std/containers/associative/set/erase_tran4.pass.cpp
index 75985fd660..d6e0323fc7 100644
--- a/libcxx/test/std/containers/associative/set/erase_tran4.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/erase_tran4.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
@@ -34,16 +33,13 @@ typedef std::set<int, transparent_less> M;
 M example;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() {
-    return example.begin();
-  }
+  operator M::const_iterator() { return example.begin(); }
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     example.insert(2);
     M::iterator erased = example.erase(Convertible());
     assert(example.empty() && erased == example.end());
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/set/erase_tran5.pass.cpp b/libcxx/test/std/containers/associative/set/erase_tran5.pass.cpp
index f27038d662..ae00dc51d2 100644
--- a/libcxx/test/std/containers/associative/set/erase_tran5.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/erase_tran5.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
@@ -33,20 +32,18 @@
 typedef std::set<int, transparent_less> M;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() const {
-    assert(false);
-  }
+  operator M::const_iterator() const { assert(false); }
+
 private:
   operator M::const_iterator();
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     Convertible c;
     M example;
     example.insert(0);
     M::size_type erased = example.erase(c);
     assert(erased == 1);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/set/extract_tran.pass.cpp b/libcxx/test/std/containers/associative/set/extract_tran.pass.cpp
index 7a71b95969..15167bba5e 100644
--- a/libcxx/test/std/containers/associative/set/extract_tran.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/extract_tran.pass.cpp
@@ -23,15 +23,13 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
+int main(int, char**) {
   {
     typedef std::set<int, transparent_less> M;
     M example;
diff --git a/libcxx/test/std/containers/associative/set/extract_tran1.compile.fail.cpp b/libcxx/test/std/containers/associative/set/extract_tran1.compile.fail.cpp
index 1607027aab..e3599fff32 100644
--- a/libcxx/test/std/containers/associative/set/extract_tran1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/set/extract_tran1.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::set<int, transparent_less_no_type> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/set/extract_tran2.compile.fail.cpp b/libcxx/test/std/containers/associative/set/extract_tran2.compile.fail.cpp
index 44f80c0576..e2249d702c 100644
--- a/libcxx/test/std/containers/associative/set/extract_tran2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/set/extract_tran2.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::set<int, transparent_less_private> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/set/extract_tran3.compile.fail.cpp b/libcxx/test/std/containers/associative/set/extract_tran3.compile.fail.cpp
index cf8a167163..a29bb01673 100644
--- a/libcxx/test/std/containers/associative/set/extract_tran3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/set/extract_tran3.compile.fail.cpp
@@ -23,18 +23,16 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
 #include "test_macros.h"
 #include "is_transparent.h"
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     typedef std::set<int, transparent_less_not_a_type> M;
 
     TEST_IGNORE_NODISCARD M().extract(C2Int{5});
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/set/extract_tran4.pass.cpp b/libcxx/test/std/containers/associative/set/extract_tran4.pass.cpp
index 09131308bc..192ab63351 100644
--- a/libcxx/test/std/containers/associative/set/extract_tran4.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/extract_tran4.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
@@ -34,16 +33,13 @@ typedef std::set<int, transparent_less> M;
 M example;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() {
-    return example.begin();
-  }
+  operator M::const_iterator() { return example.begin(); }
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     example.insert(2);
     M::node_type nh = example.extract(Convertible());
     assert(nh && nh.value() == 2);
-    }
+  }
 }
diff --git a/libcxx/test/std/containers/associative/set/extract_tran5.pass.cpp b/libcxx/test/std/containers/associative/set/extract_tran5.pass.cpp
index e5eefcc050..21247a00f8 100644
--- a/libcxx/test/std/containers/associative/set/extract_tran5.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/extract_tran5.pass.cpp
@@ -23,7 +23,6 @@
 // is_convertible_v<K&&, const_iterator> is true, where K is the type
 // substituted as the first template argument
 
-
 #include <set>
 #include <cassert>
 
@@ -33,20 +32,18 @@
 typedef std::set<int, transparent_less> M;
 
 struct Convertible : C2Int {
-  operator M::const_iterator() const {
-    assert(false);
-  }
+  operator M::const_iterator() const { assert(false); }
+
 private:
   operator M::const_iterator();
 };
 
-int main(int, char**)
-{
-    {
+int main(int, char**) {
+  {
     Convertible c;
     M example;
     example.insert(0);
     M::node_type nh = example.extract(c);
     assert(nh && nh.value() == 0);
-    }
+  }
 }

``````````

</details>


https://github.com/llvm/llvm-project/pull/78277
