Skip to content

Commit 9783f28

Browse files
ldionneldionne
authored
[libc++] Format the code base (llvm#74334)
This patch runs clang-format on all of libcxx/include and libcxx/src, in accordance with the RFC discussed at [1]. Follow-up patches will format the benchmarks, the test suite and remaining parts of the code. I'm splitting this one into its own patch so the diff is a bit easier to review. This patch was generated with: find libcxx/include libcxx/src -type f \ | grep -v 'module.modulemap.in' \ | grep -v 'CMakeLists.txt' \ | grep -v 'README.txt' \ | grep -v 'libcxx.imp' \ | grep -v '__config_site.in' \ | xargs clang-format -i A Git merge driver is available in libcxx/utils/clang-format-merge-driver.sh to help resolve merge and rebase issues across these formatting changes. [1]: https://discourse.llvm.org/t/rfc-clang-formatting-all-of-libc-once-and-for-all
1 parent e5c523e commit 9783f28

File tree

542 files changed

+67543
-84889
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

542 files changed

+67543
-84889
lines changed

‎.gitattributes

+142
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
libcxx/src/**/*.cpp merge=libcxx-reformat
2+
libcxx/include/**/*.h merge=libcxx-reformat
3+
4+
# Explicitly handle files with no extension
5+
libcxx/include/__availability merge=libcxx-reformat
6+
libcxx/include/__bit_reference merge=libcxx-reformat
7+
libcxx/include/__config merge=libcxx-reformat
8+
libcxx/include/__hash_table merge=libcxx-reformat
9+
libcxx/include/__locale merge=libcxx-reformat
10+
libcxx/include/__node_handle merge=libcxx-reformat
11+
libcxx/include/__split_buffer merge=libcxx-reformat
12+
libcxx/include/__std_clang_module merge=libcxx-reformat
13+
libcxx/include/__threading_support merge=libcxx-reformat
14+
libcxx/include/__tree merge=libcxx-reformat
15+
libcxx/include/__verbose_abort merge=libcxx-reformat
16+
libcxx/include/algorithm merge=libcxx-reformat
17+
libcxx/include/any merge=libcxx-reformat
18+
libcxx/include/array merge=libcxx-reformat
19+
libcxx/include/atomic merge=libcxx-reformat
20+
libcxx/include/barrier merge=libcxx-reformat
21+
libcxx/include/bit merge=libcxx-reformat
22+
libcxx/include/bitset merge=libcxx-reformat
23+
libcxx/include/cassert merge=libcxx-reformat
24+
libcxx/include/ccomplex merge=libcxx-reformat
25+
libcxx/include/cctype merge=libcxx-reformat
26+
libcxx/include/cerrno merge=libcxx-reformat
27+
libcxx/include/cfenv merge=libcxx-reformat
28+
libcxx/include/cfloat merge=libcxx-reformat
29+
libcxx/include/charconv merge=libcxx-reformat
30+
libcxx/include/chrono merge=libcxx-reformat
31+
libcxx/include/cinttypes merge=libcxx-reformat
32+
libcxx/include/ciso646 merge=libcxx-reformat
33+
libcxx/include/climits merge=libcxx-reformat
34+
libcxx/include/clocale merge=libcxx-reformat
35+
libcxx/include/cmath merge=libcxx-reformat
36+
libcxx/include/codecvt merge=libcxx-reformat
37+
libcxx/include/compare merge=libcxx-reformat
38+
libcxx/include/complex merge=libcxx-reformat
39+
libcxx/include/concepts merge=libcxx-reformat
40+
libcxx/include/condition_variable merge=libcxx-reformat
41+
libcxx/include/coroutine merge=libcxx-reformat
42+
libcxx/include/csetjmp merge=libcxx-reformat
43+
libcxx/include/csignal merge=libcxx-reformat
44+
libcxx/include/cstdarg merge=libcxx-reformat
45+
libcxx/include/cstdbool merge=libcxx-reformat
46+
libcxx/include/cstddef merge=libcxx-reformat
47+
libcxx/include/cstdint merge=libcxx-reformat
48+
libcxx/include/cstdio merge=libcxx-reformat
49+
libcxx/include/cstdlib merge=libcxx-reformat
50+
libcxx/include/cstring merge=libcxx-reformat
51+
libcxx/include/ctgmath merge=libcxx-reformat
52+
libcxx/include/ctime merge=libcxx-reformat
53+
libcxx/include/cuchar merge=libcxx-reformat
54+
libcxx/include/cwchar merge=libcxx-reformat
55+
libcxx/include/cwctype merge=libcxx-reformat
56+
libcxx/include/deque merge=libcxx-reformat
57+
libcxx/include/exception merge=libcxx-reformat
58+
libcxx/include/execution merge=libcxx-reformat
59+
libcxx/include/expected merge=libcxx-reformat
60+
libcxx/include/experimental/__config merge=libcxx-reformat
61+
libcxx/include/experimental/__memory merge=libcxx-reformat
62+
libcxx/include/experimental/deque merge=libcxx-reformat
63+
libcxx/include/experimental/forward_list merge=libcxx-reformat
64+
libcxx/include/experimental/iterator merge=libcxx-reformat
65+
libcxx/include/experimental/list merge=libcxx-reformat
66+
libcxx/include/experimental/map merge=libcxx-reformat
67+
libcxx/include/experimental/memory merge=libcxx-reformat
68+
libcxx/include/experimental/memory_resource merge=libcxx-reformat
69+
libcxx/include/experimental/propagate_const merge=libcxx-reformat
70+
libcxx/include/experimental/regex merge=libcxx-reformat
71+
libcxx/include/experimental/set merge=libcxx-reformat
72+
libcxx/include/experimental/simd merge=libcxx-reformat
73+
libcxx/include/experimental/string merge=libcxx-reformat
74+
libcxx/include/experimental/type_traits merge=libcxx-reformat
75+
libcxx/include/experimental/unordered_map merge=libcxx-reformat
76+
libcxx/include/experimental/unordered_set merge=libcxx-reformat
77+
libcxx/include/experimental/utility merge=libcxx-reformat
78+
libcxx/include/experimental/vector merge=libcxx-reformat
79+
libcxx/include/ext/__hash merge=libcxx-reformat
80+
libcxx/include/ext/hash_map merge=libcxx-reformat
81+
libcxx/include/ext/hash_set merge=libcxx-reformat
82+
libcxx/include/filesystem merge=libcxx-reformat
83+
libcxx/include/format merge=libcxx-reformat
84+
libcxx/include/forward_list merge=libcxx-reformat
85+
libcxx/include/fstream merge=libcxx-reformat
86+
libcxx/include/functional merge=libcxx-reformat
87+
libcxx/include/future merge=libcxx-reformat
88+
libcxx/include/initializer_list merge=libcxx-reformat
89+
libcxx/include/iomanip merge=libcxx-reformat
90+
libcxx/include/ios merge=libcxx-reformat
91+
libcxx/include/iosfwd merge=libcxx-reformat
92+
libcxx/include/iostream merge=libcxx-reformat
93+
libcxx/include/istream merge=libcxx-reformat
94+
libcxx/include/iterator merge=libcxx-reformat
95+
libcxx/include/latch merge=libcxx-reformat
96+
libcxx/include/limits merge=libcxx-reformat
97+
libcxx/include/list merge=libcxx-reformat
98+
libcxx/include/locale merge=libcxx-reformat
99+
libcxx/include/map merge=libcxx-reformat
100+
libcxx/include/mdspan merge=libcxx-reformat
101+
libcxx/include/memory merge=libcxx-reformat
102+
libcxx/include/memory_resource merge=libcxx-reformat
103+
libcxx/include/mutex merge=libcxx-reformat
104+
libcxx/include/new merge=libcxx-reformat
105+
libcxx/include/numbers merge=libcxx-reformat
106+
libcxx/include/numeric merge=libcxx-reformat
107+
libcxx/include/optional merge=libcxx-reformat
108+
libcxx/include/ostream merge=libcxx-reformat
109+
libcxx/include/print merge=libcxx-reformat
110+
libcxx/include/queue merge=libcxx-reformat
111+
libcxx/include/random merge=libcxx-reformat
112+
libcxx/include/ranges merge=libcxx-reformat
113+
libcxx/include/ratio merge=libcxx-reformat
114+
libcxx/include/regex merge=libcxx-reformat
115+
libcxx/include/scoped_allocator merge=libcxx-reformat
116+
libcxx/include/semaphore merge=libcxx-reformat
117+
libcxx/include/set merge=libcxx-reformat
118+
libcxx/include/shared_mutex merge=libcxx-reformat
119+
libcxx/include/source_location merge=libcxx-reformat
120+
libcxx/include/span merge=libcxx-reformat
121+
libcxx/include/sstream merge=libcxx-reformat
122+
libcxx/include/stack merge=libcxx-reformat
123+
libcxx/include/stdexcept merge=libcxx-reformat
124+
libcxx/include/stop_token merge=libcxx-reformat
125+
libcxx/include/streambuf merge=libcxx-reformat
126+
libcxx/include/string merge=libcxx-reformat
127+
libcxx/include/string_view merge=libcxx-reformat
128+
libcxx/include/strstream merge=libcxx-reformat
129+
libcxx/include/syncstream merge=libcxx-reformat
130+
libcxx/include/system_error merge=libcxx-reformat
131+
libcxx/include/thread merge=libcxx-reformat
132+
libcxx/include/tuple merge=libcxx-reformat
133+
libcxx/include/type_traits merge=libcxx-reformat
134+
libcxx/include/typeindex merge=libcxx-reformat
135+
libcxx/include/typeinfo merge=libcxx-reformat
136+
libcxx/include/unordered_map merge=libcxx-reformat
137+
libcxx/include/unordered_set merge=libcxx-reformat
138+
libcxx/include/utility merge=libcxx-reformat
139+
libcxx/include/valarray merge=libcxx-reformat
140+
libcxx/include/variant merge=libcxx-reformat
141+
libcxx/include/vector merge=libcxx-reformat
142+
libcxx/include/version merge=libcxx-reformat

‎libcxx/include/__algorithm/binary_search.h

+7-13
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,16 @@
2222
_LIBCPP_BEGIN_NAMESPACE_STD
2323

2424
template <class _ForwardIterator, class _Tp, class _Compare>
25-
_LIBCPP_NODISCARD_EXT inline
26-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
27-
bool
28-
binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, _Compare __comp)
29-
{
30-
__first = std::lower_bound<_ForwardIterator, _Tp, __comp_ref_type<_Compare> >(__first, __last, __value, __comp);
31-
return __first != __last && !__comp(__value, *__first);
25+
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
26+
binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, _Compare __comp) {
27+
__first = std::lower_bound<_ForwardIterator, _Tp, __comp_ref_type<_Compare> >(__first, __last, __value, __comp);
28+
return __first != __last && !__comp(__value, *__first);
3229
}
3330

3431
template <class _ForwardIterator, class _Tp>
35-
_LIBCPP_NODISCARD_EXT inline
36-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
37-
bool
38-
binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
39-
{
40-
return std::binary_search(__first, __last, __value, __less<>());
32+
_LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
33+
binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value) {
34+
return std::binary_search(__first, __last, __value, __less<>());
4135
}
4236

4337
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/comp_ref_type.h

+28-38
Original file line numberDiff line numberDiff line change
@@ -20,52 +20,42 @@
2020
_LIBCPP_BEGIN_NAMESPACE_STD
2121

2222
template <class _Compare>
23-
struct __debug_less
24-
{
25-
_Compare &__comp_;
26-
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI __debug_less(_Compare& __c) : __comp_(__c) {}
23+
struct __debug_less {
24+
_Compare& __comp_;
25+
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI __debug_less(_Compare& __c) : __comp_(__c) {}
2726

28-
template <class _Tp, class _Up>
29-
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI
30-
bool operator()(const _Tp& __x, const _Up& __y)
31-
{
32-
bool __r = __comp_(__x, __y);
33-
if (__r)
34-
__do_compare_assert(0, __y, __x);
35-
return __r;
36-
}
27+
template <class _Tp, class _Up>
28+
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI bool operator()(const _Tp& __x, const _Up& __y) {
29+
bool __r = __comp_(__x, __y);
30+
if (__r)
31+
__do_compare_assert(0, __y, __x);
32+
return __r;
33+
}
3734

38-
template <class _Tp, class _Up>
39-
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI
40-
bool operator()(_Tp& __x, _Up& __y)
41-
{
42-
bool __r = __comp_(__x, __y);
43-
if (__r)
44-
__do_compare_assert(0, __y, __x);
45-
return __r;
46-
}
35+
template <class _Tp, class _Up>
36+
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI bool operator()(_Tp& __x, _Up& __y) {
37+
bool __r = __comp_(__x, __y);
38+
if (__r)
39+
__do_compare_assert(0, __y, __x);
40+
return __r;
41+
}
4742

48-
template <class _LHS, class _RHS>
49-
_LIBCPP_CONSTEXPR_SINCE_CXX14
50-
inline _LIBCPP_HIDE_FROM_ABI
51-
decltype((void)std::declval<_Compare&>()(
52-
std::declval<_LHS &>(), std::declval<_RHS &>()))
53-
__do_compare_assert(int, _LHS & __l, _RHS & __r) {
54-
_LIBCPP_ASSERT_UNCATEGORIZED(!__comp_(__l, __r),
55-
"Comparator does not induce a strict weak ordering");
56-
(void)__l;
57-
(void)__r;
58-
}
43+
template <class _LHS, class _RHS>
44+
_LIBCPP_CONSTEXPR_SINCE_CXX14 inline _LIBCPP_HIDE_FROM_ABI decltype((void)std::declval<_Compare&>()(
45+
std::declval<_LHS&>(), std::declval<_RHS&>()))
46+
__do_compare_assert(int, _LHS& __l, _RHS& __r) {
47+
_LIBCPP_ASSERT_UNCATEGORIZED(!__comp_(__l, __r), "Comparator does not induce a strict weak ordering");
48+
(void)__l;
49+
(void)__r;
50+
}
5951

60-
template <class _LHS, class _RHS>
61-
_LIBCPP_CONSTEXPR_SINCE_CXX14
62-
inline _LIBCPP_HIDE_FROM_ABI
63-
void __do_compare_assert(long, _LHS &, _RHS &) {}
52+
template <class _LHS, class _RHS>
53+
_LIBCPP_CONSTEXPR_SINCE_CXX14 inline _LIBCPP_HIDE_FROM_ABI void __do_compare_assert(long, _LHS&, _RHS&) {}
6454
};
6555

6656
// Pass the comparator by lvalue reference. Or in debug mode, using a
6757
// debugging wrapper that stores a reference.
68-
# if _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
58+
#if _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
6959
template <class _Comp>
7060
using __comp_ref_type = __debug_less<_Comp>;
7161
#else

‎libcxx/include/__algorithm/copy_backward.h

+6-10
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ struct __copy_backward_loop {
108108

109109
struct __copy_backward_trivial {
110110
// At this point, the iterators have been unwrapped so any `contiguous_iterator` has been unwrapped to a pointer.
111-
template <class _In, class _Out,
112-
__enable_if_t<__can_lower_copy_assignment_to_memmove<_In, _Out>::value, int> = 0>
111+
template <class _In, class _Out, __enable_if_t<__can_lower_copy_assignment_to_memmove<_In, _Out>::value, int> = 0>
113112
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In*, _Out*>
114113
operator()(_In* __first, _In* __last, _Out* __result) const {
115114
return std::__copy_backward_trivial_impl(__first, __last, __result);
@@ -124,16 +123,13 @@ __copy_backward(_BidirectionalIterator1 __first, _Sentinel __last, _Bidirectiona
124123
}
125124

126125
template <class _BidirectionalIterator1, class _BidirectionalIterator2>
127-
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
128-
_BidirectionalIterator2
129-
copy_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last,
130-
_BidirectionalIterator2 __result)
131-
{
126+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _BidirectionalIterator2
127+
copy_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last, _BidirectionalIterator2 __result) {
132128
static_assert(std::is_copy_constructible<_BidirectionalIterator1>::value &&
133-
std::is_copy_constructible<_BidirectionalIterator1>::value, "Iterators must be copy constructible.");
129+
std::is_copy_constructible<_BidirectionalIterator1>::value,
130+
"Iterators must be copy constructible.");
134131

135-
return std::__copy_backward<_ClassicAlgPolicy>(
136-
std::move(__first), std::move(__last), std::move(__result)).second;
132+
return std::__copy_backward<_ClassicAlgPolicy>(std::move(__first), std::move(__last), std::move(__result)).second;
137133
}
138134

139135
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/copy_if.h

+9-14
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,16 @@
1717

1818
_LIBCPP_BEGIN_NAMESPACE_STD
1919

20-
template<class _InputIterator, class _OutputIterator, class _Predicate>
21-
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
22-
_OutputIterator
23-
copy_if(_InputIterator __first, _InputIterator __last,
24-
_OutputIterator __result, _Predicate __pred)
25-
{
26-
for (; __first != __last; ++__first)
27-
{
28-
if (__pred(*__first))
29-
{
30-
*__result = *__first;
31-
++__result;
32-
}
20+
template <class _InputIterator, class _OutputIterator, class _Predicate>
21+
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
22+
copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Predicate __pred) {
23+
for (; __first != __last; ++__first) {
24+
if (__pred(*__first)) {
25+
*__result = *__first;
26+
++__result;
3327
}
34-
return __result;
28+
}
29+
return __result;
3530
}
3631

3732
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__algorithm/copy_move_common.h

+11-14
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,19 @@ _LIBCPP_BEGIN_NAMESPACE_STD
3838
template <class _From, class _To>
3939
struct __can_lower_copy_assignment_to_memmove {
4040
static const bool value =
41-
// If the types are always bitcastable, it's valid to do a bitwise copy between them.
42-
__is_always_bitcastable<_From, _To>::value &&
43-
// Reject conversions that wouldn't be performed by the regular built-in assignment (e.g. between arrays).
44-
is_trivially_assignable<_To&, const _From&>::value &&
45-
// `memmove` doesn't accept `volatile` pointers, make sure the optimization SFINAEs away in that case.
46-
!is_volatile<_From>::value &&
47-
!is_volatile<_To>::value;
41+
// If the types are always bitcastable, it's valid to do a bitwise copy between them.
42+
__is_always_bitcastable<_From, _To>::value &&
43+
// Reject conversions that wouldn't be performed by the regular built-in assignment (e.g. between arrays).
44+
is_trivially_assignable<_To&, const _From&>::value &&
45+
// `memmove` doesn't accept `volatile` pointers, make sure the optimization SFINAEs away in that case.
46+
!is_volatile<_From>::value && !is_volatile<_To>::value;
4847
};
4948

5049
template <class _From, class _To>
5150
struct __can_lower_move_assignment_to_memmove {
5251
static const bool value =
53-
__is_always_bitcastable<_From, _To>::value &&
54-
is_trivially_assignable<_To&, _From&&>::value &&
55-
!is_volatile<_From>::value &&
56-
!is_volatile<_To>::value;
52+
__is_always_bitcastable<_From, _To>::value && is_trivially_assignable<_To&, _From&&>::value &&
53+
!is_volatile<_From>::value && !is_volatile<_To>::value;
5754
};
5855

5956
// `memmove` algorithms implementation.
@@ -95,8 +92,8 @@ struct __can_rewrap<_InIter,
9592
_Sent,
9693
_OutIter,
9794
// Note that sentinels are always copy-constructible.
98-
__enable_if_t< is_copy_constructible<_InIter>::value &&
99-
is_copy_constructible<_OutIter>::value > > : true_type {};
95+
__enable_if_t< is_copy_constructible<_InIter>::value && is_copy_constructible<_OutIter>::value > >
96+
: true_type {};
10097

10198
template <class _Algorithm,
10299
class _InIter,
@@ -108,7 +105,7 @@ __unwrap_and_dispatch(_InIter __first, _Sent __last, _OutIter __out_first) {
108105
auto __range = std::__unwrap_range(__first, std::move(__last));
109106
auto __result = _Algorithm()(std::move(__range.first), std::move(__range.second), std::__unwrap_iter(__out_first));
110107
return std::make_pair(std::__rewrap_range<_Sent>(std::move(__first), std::move(__result.first)),
111-
std::__rewrap_iter(std::move(__out_first), std::move(__result.second)));
108+
std::__rewrap_iter(std::move(__out_first), std::move(__result.second)));
112109
}
113110

114111
template <class _Algorithm,

0 commit comments

Comments
 (0)