Skip to content

Commit 7067aee

Browse files
committed
[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
1 parent f7f8645 commit 7067aee

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

libcxx/include/__expected/unexpected.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class unexpected {
6464
_LIBCPP_HIDE_FROM_ABI constexpr unexpected(unexpected&&) = default;
6565

6666
template <class _Error = _Err>
67-
requires(!is_same_v<remove_cvref_t<_Error>, unexpected> && //
68-
!is_same_v<remove_cvref_t<_Error>, in_place_t> && //
67+
requires(!is_same_v<remove_cvref_t<_Error>, unexpected> && //
68+
!is_same_v<remove_cvref_t<_Error>, in_place_t> && //
6969
is_constructible_v<_Err, _Error>)
7070
_LIBCPP_HIDE_FROM_ABI constexpr explicit unexpected(_Error&& __error) //
7171
noexcept(is_nothrow_constructible_v<_Err, _Error>) // strengthened

libcxx/src/memory_resource.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static memory_resource* __default_memory_resource(bool set = false, memory_resou
107107
new_res = new_res ? new_res : new_delete_resource();
108108
lock_guard<mutex> guard(res_lock);
109109
memory_resource* old_res = res;
110-
res = new_res;
110+
res = new_res;
111111
return old_res;
112112
} else {
113113
lock_guard<mutex> guard(res_lock);

libcxx/utils/ci/buildkite-pipeline.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ steps:
5656
env:
5757
CC: "clang-${LLVM_HEAD_VERSION}"
5858
CXX: "clang++-${LLVM_HEAD_VERSION}"
59-
# TODO ENABLE
60-
# CLANG_FORMAT: "/usr/bin/clang-format-${LLVM_STABLE_VERSION}"
61-
CLANG_FORMAT: "clang-format-15"
59+
CLANG_FORMAT: "/usr/bin/clang-format-${LLVM_STABLE_VERSION}"
6260
agents:
6361
queue: "libcxx-builders"
6462
os: "linux"

libcxx/utils/data/ignore_format.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ libcxx/include/__chrono/literals.h
260260
libcxx/include/__chrono/monthday.h
261261
libcxx/include/__chrono/month.h
262262
libcxx/include/__chrono/month_weekday.h
263-
libcxx/include/__chrono/statically_widen.h
264263
libcxx/include/__chrono/steady_clock.h
265264
libcxx/include/__chrono/system_clock.h
266265
libcxx/include/__chrono/time_point.h

0 commit comments

Comments
 (0)