[libcxx-commits] [libcxx] 7067aee - [libc++][CI] Switches to clang-format-16.

[Mark de Wever via libcxx-commits]

Author: Mark de Wever
Date: 2023-02-17T18:03:49+01:00
New Revision: 7067aee367d40882cf8324357ab5a09275a590b6

URL: https://github.com/llvm/llvm-project/commit/7067aee367d40882cf8324357ab5a09275a590b6
DIFF: https://github.com/llvm/llvm-project/commit/7067aee367d40882cf8324357ab5a09275a590b6.diff

LOG: [libc++][CI] Switches to clang-format-16.

Uses an absolute path to the selected binary.
Updates the formatting of two files to match clang-format-16 style.

Depends on D144126

Reviewed By: #libc, philnik

Differential Revision: https://reviews.llvm.org/D144132

Added: 
    

Modified: 
    libcxx/include/__expected/unexpected.h
    libcxx/src/memory_resource.cpp
    libcxx/utils/ci/buildkite-pipeline.yml
    libcxx/utils/data/ignore_format.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__expected/unexpected.h b/libcxx/include/__expected/unexpected.h
index 075963a84dedc..75a057bb9c69a 100644
--- a/libcxx/include/__expected/unexpected.h
+++ b/libcxx/include/__expected/unexpected.h
@@ -64,8 +64,8 @@ class unexpected {
   _LIBCPP_HIDE_FROM_ABI constexpr unexpected(unexpected&&)      = default;
 
   template <class _Error = _Err>
-    requires(!is_same_v<remove_cvref_t<_Error>, unexpected> && //
-             !is_same_v<remove_cvref_t<_Error>, in_place_t> && //
+    requires(!is_same_v<remove_cvref_t<_Error>, unexpected> &&          //
+             !is_same_v<remove_cvref_t<_Error>, in_place_t> &&          //
              is_constructible_v<_Err, _Error>)
   _LIBCPP_HIDE_FROM_ABI constexpr explicit unexpected(_Error&& __error) //
       noexcept(is_nothrow_constructible_v<_Err, _Error>)                // strengthened

diff  --git a/libcxx/src/memory_resource.cpp b/libcxx/src/memory_resource.cpp
index e00611dd1c9c5..ca1d6406aa270 100644
--- a/libcxx/src/memory_resource.cpp
+++ b/libcxx/src/memory_resource.cpp
@@ -107,7 +107,7 @@ static memory_resource* __default_memory_resource(bool set = false, memory_resou
     new_res = new_res ? new_res : new_delete_resource();
     lock_guard<mutex> guard(res_lock);
     memory_resource* old_res = res;
-    res = new_res;
+    res                      = new_res;
     return old_res;
   } else {
     lock_guard<mutex> guard(res_lock);

diff  --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index c0680a987a629..d4fe17aaa7d29 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -56,9 +56,7 @@ steps:
     env:
         CC: "clang-${LLVM_HEAD_VERSION}"
         CXX: "clang++-${LLVM_HEAD_VERSION}"
-        # TODO ENABLE
-        # CLANG_FORMAT: "/usr/bin/clang-format-${LLVM_STABLE_VERSION}"
-        CLANG_FORMAT: "clang-format-15"
+        CLANG_FORMAT: "/usr/bin/clang-format-${LLVM_STABLE_VERSION}"
     agents:
       queue: "libcxx-builders"
       os: "linux"

diff  --git a/libcxx/utils/data/ignore_format.txt b/libcxx/utils/data/ignore_format.txt
index a3da9d5681737..74bcdb3e14ffe 100644
--- a/libcxx/utils/data/ignore_format.txt
+++ b/libcxx/utils/data/ignore_format.txt
@@ -260,7 +260,6 @@ libcxx/include/__chrono/literals.h
 libcxx/include/__chrono/monthday.h
 libcxx/include/__chrono/month.h
 libcxx/include/__chrono/month_weekday.h
-libcxx/include/__chrono/statically_widen.h
 libcxx/include/__chrono/steady_clock.h
 libcxx/include/__chrono/system_clock.h
 libcxx/include/__chrono/time_point.h