Formatting, unsupported no-exceptions, directly use std::swap

Author: vogelsgesang

libcxx/include/__exception/exception_ptr.h

@@ -85,7 +85,7 @@ class _LIBCPP_EXPORTED_FROM_ABI exception_ptr {
   exception_ptr& operator=(const exception_ptr&) _NOEXCEPT;
   _LIBCPP_HIDE_FROM_ABI exception_ptr& operator=(exception_ptr&& __other) _NOEXCEPT {
     exception_ptr __tmp(std::move(__other));
-    swap(__tmp, *this);
+    std::swap(__tmp, *this);
     return *this;
   }
   ~exception_ptr() _NOEXCEPT;

libcxx/test/std/language.support/support.exception/propagation/exception_ptr_move_assignment.cpp

@@ -6,6 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: no-exceptions
+
 // <exception>
 
 // typedef unspecified exception_ptr;
@@ -18,27 +20,26 @@
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-    std::exception_ptr p = std::make_exception_ptr(42);
-    std::exception_ptr p2{p};
-    assert(p2 == p);
-    // Move assignment
-    std::exception_ptr p3
-    p3 = std::move(p2);
-    assert(p3 == p);
-    // `p2` was moved from. In libc++ it will be nullptr, but
-    // this is not guaranteed by the standard.
-    #if defined(_LIBCPP_VERSION) && !defined(_LIBCPP_ABI_MICROSOFT)
-    assert(p2 == nullptr);
-    assert(p2 == nullptr);
-    #endif
-
-    try {
-        std::rethrow_exception(p3);
-    } catch (int e) {
-        assert(e == 42);
-    }
-
-    return 0;
-}
+int main(int, char**) {
+  std::exception_ptr p = std::make_exception_ptr(42);
+  std::exception_ptr p2{p};
+  assert(p2 == p);
+  // Under test: the move assignment
+  std::exception_ptr p3;
+  p3 = std::move(p2);
+  assert(p3 == p);
+// `p2` was moved from. In libc++ it will be nullptr, but
+// this is not guaranteed by the standard.
+#if defined(_LIBCPP_VERSION) && !defined(_LIBCPP_ABI_MICROSOFT)
+  assert(p2 == nullptr);
+  assert(p2 == nullptr);
+#endif
+
+  try {
+    std::rethrow_exception(p3);
+  } catch (int e) {
+    assert(e == 42);
+  }
+
+  return 0;
+}

libcxx/test/std/language.support/support.exception/propagation/exception_ptr_move_ctr.cpp

@@ -6,6 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: no-exceptions
+
 // <exception>
 
 // typedef unspecified exception_ptr;
@@ -18,25 +20,24 @@
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-    std::exception_ptr p = std::make_exception_ptr(42);
-    std::exception_ptr p2{p};
-    assert(p2 == p);
-    // Move constructor
-    std::exception_ptr p3{std::move(p2)};
-    assert(p3 == p);
-    // `p2` was moved from. In libc++ it will be nullptr, but
-    // this is not guaranteed by the standard.
-    #if defined(_LIBCPP_VERSION) && !defined(_LIBCPP_ABI_MICROSOFT)
-    assert(p2 == nullptr);
-    #endif
-
-    try {
-        std::rethrow_exception(p3);
-    } catch (int e) {
-        assert(e == 42);
-    }
-
-    return 0;
-}
+int main(int, char**) {
+  std::exception_ptr p = std::make_exception_ptr(42);
+  std::exception_ptr p2{p};
+  assert(p2 == p);
+  // Under test: The move constructor
+  std::exception_ptr p3{std::move(p2)};
+  assert(p3 == p);
+// `p2` was moved from. In libc++ it will be nullptr, but
+// this is not guaranteed by the standard.
+#if defined(_LIBCPP_VERSION) && !defined(_LIBCPP_ABI_MICROSOFT)
+  assert(p2 == nullptr);
+#endif
+
+  try {
+    std::rethrow_exception(p3);
+  } catch (int e) {
+    assert(e == 42);
+  }
+
+  return 0;
+}

libcxx/test/std/language.support/support.exception/propagation/exception_ptr_swap.cpp

@@ -6,6 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: no-exceptions
+
 // <exception>
 
 // typedef unspecified exception_ptr;
@@ -18,22 +20,21 @@
 
 #include "test_macros.h"
 
-int main(int, char**)
-{
-    std::exception_ptr p21 = std::make_exception_ptr(42);
-    std::exception_ptr p42 = std::make_exception_ptr(21);
-    std::swap(p42, p21);
-
-    try {
-        std::rethrow_exception(p21);
-    } catch (int e) {
-        assert(e == 21);
-    }
-    try {
-        std::rethrow_exception(p42);
-    } catch (int e) {
-        assert(e == 42);
-    }
-
-    return 0;
+int main(int, char**) {
+  std::exception_ptr p21 = std::make_exception_ptr(42);
+  std::exception_ptr p42 = std::make_exception_ptr(21);
+  std::swap(p42, p21);
+
+  try {
+    std::rethrow_exception(p21);
+  } catch (int e) {
+    assert(e == 21);
+  }
+  try {
+    std::rethrow_exception(p42);
+  } catch (int e) {
+    assert(e == 42);
+  }
+
+  return 0;
 }