Skip to content

Commit 6dd75bb

Browse files
ldionneldionne
committed
[libc++][NFC] Re-run libcxx/include through clang-format
This is a small re-adjustment of libcxx/include with the current version of clang-format we use in the CI.
1 parent c4eec9e commit 6dd75bb

File tree

129 files changed

+452
-435
lines changed

Some content is hidden

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

129 files changed

+452
-435
lines changed

‎libcxx/include/__cxx03/__format/buffer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,8 @@ class _LIBCPP_TEMPLATE_VIS __format_to_n_buffer_base<_OutIt, _CharT, true> {
488488
/// The buffer that counts and limits the number of insertions.
489489
template <class _OutIt, __fmt_char_type _CharT>
490490
requires(output_iterator<_OutIt, const _CharT&>)
491-
struct _LIBCPP_TEMPLATE_VIS __format_to_n_buffer final
492-
: public __format_to_n_buffer_base< _OutIt, _CharT, __enable_direct_output<_OutIt, _CharT>> {
491+
struct _LIBCPP_TEMPLATE_VIS
492+
__format_to_n_buffer final : public __format_to_n_buffer_base< _OutIt, _CharT, __enable_direct_output<_OutIt, _CharT>> {
493493
using _Base = __format_to_n_buffer_base<_OutIt, _CharT, __enable_direct_output<_OutIt, _CharT>>;
494494
using _Size = iter_difference_t<_OutIt>;
495495

‎libcxx/include/__cxx03/__format/container_adaptor.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ struct _LIBCPP_TEMPLATE_VIS __formatter_container_adaptor {
5555
};
5656

5757
template <class _CharT, class _Tp, formattable<_CharT> _Container>
58-
struct _LIBCPP_TEMPLATE_VIS formatter<queue<_Tp, _Container>, _CharT>
59-
: public __formatter_container_adaptor<queue<_Tp, _Container>, _CharT> {};
58+
struct _LIBCPP_TEMPLATE_VIS
59+
formatter<queue<_Tp, _Container>, _CharT> : public __formatter_container_adaptor<queue<_Tp, _Container>, _CharT> {};
6060

6161
template <class _CharT, class _Tp, class _Container, class _Compare>
6262
struct _LIBCPP_TEMPLATE_VIS formatter<priority_queue<_Tp, _Container, _Compare>, _CharT>
6363
: public __formatter_container_adaptor<priority_queue<_Tp, _Container, _Compare>, _CharT> {};
6464

6565
template <class _CharT, class _Tp, formattable<_CharT> _Container>
66-
struct _LIBCPP_TEMPLATE_VIS formatter<stack<_Tp, _Container>, _CharT>
67-
: public __formatter_container_adaptor<stack<_Tp, _Container>, _CharT> {};
66+
struct _LIBCPP_TEMPLATE_VIS
67+
formatter<stack<_Tp, _Container>, _CharT> : public __formatter_container_adaptor<stack<_Tp, _Container>, _CharT> {};
6868

6969
#endif //_LIBCPP_STD_VER >= 23
7070

‎libcxx/include/__cxx03/__format/formatter_output.h‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ __padding_size(size_t __size, size_t __width, __format_spec::__alignment __align
100100
///
101101
/// This uses a "mass output function" of __format::__output_buffer when possible.
102102
template <__fmt_char_type _CharT, __fmt_char_type _OutCharT = _CharT>
103-
_LIBCPP_HIDE_FROM_ABI auto
104-
__copy(basic_string_view<_CharT> __str, output_iterator<const _OutCharT&> auto __out_it) -> decltype(__out_it) {
103+
_LIBCPP_HIDE_FROM_ABI auto __copy(basic_string_view<_CharT> __str, output_iterator<const _OutCharT&> auto __out_it)
104+
-> decltype(__out_it) {
105105
if constexpr (std::same_as<decltype(__out_it), std::back_insert_iterator<__format::__output_buffer<_OutCharT>>>) {
106106
__out_it.__get_container()->__copy(__str);
107107
return __out_it;
@@ -116,16 +116,16 @@ __copy(basic_string_view<_CharT> __str, output_iterator<const _OutCharT&> auto _
116116
template <contiguous_iterator _Iterator,
117117
__fmt_char_type _CharT = typename iterator_traits<_Iterator>::value_type,
118118
__fmt_char_type _OutCharT = _CharT>
119-
_LIBCPP_HIDE_FROM_ABI auto
120-
__copy(_Iterator __first, _Iterator __last, output_iterator<const _OutCharT&> auto __out_it) -> decltype(__out_it) {
119+
_LIBCPP_HIDE_FROM_ABI auto __copy(_Iterator __first, _Iterator __last, output_iterator<const _OutCharT&> auto __out_it)
120+
-> decltype(__out_it) {
121121
return __formatter::__copy(basic_string_view{__first, __last}, std::move(__out_it));
122122
}
123123

124124
template <contiguous_iterator _Iterator,
125125
__fmt_char_type _CharT = typename iterator_traits<_Iterator>::value_type,
126126
__fmt_char_type _OutCharT = _CharT>
127-
_LIBCPP_HIDE_FROM_ABI auto
128-
__copy(_Iterator __first, size_t __n, output_iterator<const _OutCharT&> auto __out_it) -> decltype(__out_it) {
127+
_LIBCPP_HIDE_FROM_ABI auto __copy(_Iterator __first, size_t __n, output_iterator<const _OutCharT&> auto __out_it)
128+
-> decltype(__out_it) {
129129
return __formatter::__copy(basic_string_view{std::to_address(__first), __n}, std::move(__out_it));
130130
}
131131

@@ -136,11 +136,9 @@ template <contiguous_iterator _Iterator,
136136
__fmt_char_type _CharT = typename iterator_traits<_Iterator>::value_type,
137137
__fmt_char_type _OutCharT = _CharT,
138138
class _UnaryOperation>
139-
_LIBCPP_HIDE_FROM_ABI auto
140-
__transform(_Iterator __first,
141-
_Iterator __last,
142-
output_iterator<const _OutCharT&> auto __out_it,
143-
_UnaryOperation __operation) -> decltype(__out_it) {
139+
_LIBCPP_HIDE_FROM_ABI auto __transform(
140+
_Iterator __first, _Iterator __last, output_iterator<const _OutCharT&> auto __out_it, _UnaryOperation __operation)
141+
-> decltype(__out_it) {
144142
if constexpr (std::same_as<decltype(__out_it), std::back_insert_iterator<__format::__output_buffer<_OutCharT>>>) {
145143
__out_it.__get_container()->__transform(__first, __last, std::move(__operation));
146144
return __out_it;

‎libcxx/include/__cxx03/__format/formatter_string.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ struct _LIBCPP_TEMPLATE_VIS formatter<_CharT[_Size], _CharT> : public __formatte
118118

119119
// Formatter std::string.
120120
template <__fmt_char_type _CharT, class _Traits, class _Allocator>
121-
struct _LIBCPP_TEMPLATE_VIS formatter<basic_string<_CharT, _Traits, _Allocator>, _CharT>
122-
: public __formatter_string<_CharT> {
121+
struct _LIBCPP_TEMPLATE_VIS
122+
formatter<basic_string<_CharT, _Traits, _Allocator>, _CharT> : public __formatter_string<_CharT> {
123123
using _Base = __formatter_string<_CharT>;
124124

125125
template <class _FormatContext>

‎libcxx/include/__cxx03/__format/formatter_tuple.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ struct _LIBCPP_TEMPLATE_VIS __formatter_tuple {
136136
};
137137

138138
template <__fmt_char_type _CharT, formattable<_CharT>... _Args>
139-
struct _LIBCPP_TEMPLATE_VIS formatter<pair<_Args...>, _CharT>
140-
: public __formatter_tuple<_CharT, pair<_Args...>, _Args...> {};
139+
struct _LIBCPP_TEMPLATE_VIS
140+
formatter<pair<_Args...>, _CharT> : public __formatter_tuple<_CharT, pair<_Args...>, _Args...> {};
141141

142142
template <__fmt_char_type _CharT, formattable<_CharT>... _Args>
143-
struct _LIBCPP_TEMPLATE_VIS formatter<tuple<_Args...>, _CharT>
144-
: public __formatter_tuple<_CharT, tuple<_Args...>, _Args...> {};
143+
struct _LIBCPP_TEMPLATE_VIS
144+
formatter<tuple<_Args...>, _CharT> : public __formatter_tuple<_CharT, tuple<_Args...>, _Args...> {};
145145

146146
#endif //_LIBCPP_STD_VER >= 23
147147

‎libcxx/include/__cxx03/__functional/bind_back.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct __bind_back_t : __perfect_forward<__bind_back_op<tuple_size_v<_BoundArgs>
5252

5353
template <class _Fn, class... _Args>
5454
requires is_constructible_v<decay_t<_Fn>, _Fn> && is_move_constructible_v<decay_t<_Fn>> &&
55-
(is_constructible_v<decay_t<_Args>, _Args> && ...) && (is_move_constructible_v<decay_t<_Args>> && ...)
55+
(is_constructible_v<decay_t<_Args>, _Args> && ...) && (is_move_constructible_v<decay_t<_Args>> && ...)
5656
_LIBCPP_HIDE_FROM_ABI constexpr auto __bind_back(_Fn&& __f, _Args&&... __args) noexcept(
5757
noexcept(__bind_back_t<decay_t<_Fn>, tuple<decay_t<_Args>...>>(
5858
std::forward<_Fn>(__f), std::forward_as_tuple(std::forward<_Args>(__args)...))))

‎libcxx/include/__cxx03/__functional/bind_front.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2929

3030
struct __bind_front_op {
3131
template <class... _Args>
32-
_LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Args&&... __args) const noexcept(
33-
noexcept(std::invoke(std::forward<_Args>(__args)...))) -> decltype(std::invoke(std::forward<_Args>(__args)...)) {
32+
_LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Args&&... __args) const
33+
noexcept(noexcept(std::invoke(std::forward<_Args>(__args)...)))
34+
-> decltype(std::invoke(std::forward<_Args>(__args)...)) {
3435
return std::invoke(std::forward<_Args>(__args)...);
3536
}
3637
};

‎libcxx/include/__cxx03/__functional/binder1st.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2222
#if _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
2323

2424
template <class _Operation>
25-
class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX11 binder1st
26-
: public __unary_function<typename _Operation::second_argument_type, typename _Operation::result_type> {
25+
class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX11
26+
binder1st : public __unary_function<typename _Operation::second_argument_type, typename _Operation::result_type> {
2727
protected:
2828
_Operation op;
2929
typename _Operation::first_argument_type value;

‎libcxx/include/__cxx03/__functional/binder2nd.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2222
#if _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
2323

2424
template <class _Operation>
25-
class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX11 binder2nd
26-
: public __unary_function<typename _Operation::first_argument_type, typename _Operation::result_type> {
25+
class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX11
26+
binder2nd : public __unary_function<typename _Operation::first_argument_type, typename _Operation::result_type> {
2727
protected:
2828
_Operation op;
2929
typename _Operation::second_argument_type value;

‎libcxx/include/__cxx03/__functional/function.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ _LIBCPP_HIDE_FROM_ABI bool __not_null(_Fp* __ptr) {
114114
}
115115

116116
template <class _Ret, class _Class>
117-
_LIBCPP_HIDE_FROM_ABI bool __not_null(_Ret _Class::*__ptr) {
117+
_LIBCPP_HIDE_FROM_ABI bool __not_null(_Ret _Class::* __ptr) {
118118
return __ptr;
119119
}
120120

@@ -492,7 +492,7 @@ template <typename _Fun>
492492
struct __use_small_storage
493493
: public integral_constant<
494494
bool,
495-
sizeof(_Fun) <= sizeof(__policy_storage)&& _LIBCPP_ALIGNOF(_Fun) <= _LIBCPP_ALIGNOF(__policy_storage) &&
495+
sizeof(_Fun) <= sizeof(__policy_storage) && _LIBCPP_ALIGNOF(_Fun) <= _LIBCPP_ALIGNOF(__policy_storage) &&
496496
is_trivially_copy_constructible<_Fun>::value && is_trivially_destructible<_Fun>::value> {};
497497

498498
// Policy contains information about how to copy, destroy, and move the

0 commit comments

Comments
 (0)