diff --git a/libcxx/include/__expected/unexpected.h b/libcxx/include/__expected/unexpected.h --- a/libcxx/include/__expected/unexpected.h +++ b/libcxx/include/__expected/unexpected.h @@ -64,8 +64,8 @@ _LIBCPP_HIDE_FROM_ABI constexpr unexpected(unexpected&&) = default; template - requires(!is_same_v, unexpected> && // - !is_same_v, in_place_t> && // + requires(!is_same_v, unexpected> && // + !is_same_v, 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 --- a/libcxx/src/memory_resource.cpp +++ b/libcxx/src/memory_resource.cpp @@ -107,7 +107,7 @@ new_res = new_res ? new_res : new_delete_resource(); lock_guard guard(res_lock); memory_resource* old_res = res; - res = new_res; + res = new_res; return old_res; } else { lock_guard guard(res_lock); diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml --- a/libcxx/utils/ci/buildkite-pipeline.yml +++ b/libcxx/utils/ci/buildkite-pipeline.yml @@ -56,9 +56,7 @@ 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 --- a/libcxx/utils/data/ignore_format.txt +++ b/libcxx/utils/data/ignore_format.txt @@ -260,7 +260,6 @@ 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