Skip to content

Commit 28ef669

Browse files
frederick-vs-jafrederick-vs-ja
committed
Clang-format
1 parent f0fb6cc commit 28ef669

File tree

4 files changed

+41
-38
lines changed

4 files changed

+41
-38
lines changed

‎libcxx/include/__ranges/const_access.h‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ struct __fn {
5656
using _UType = decltype(ranges::begin(ranges::__possibly_const_range(std::declval<_Rng&>())));
5757

5858
template <__const_accessible_range _Rng>
59-
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr static auto
60-
operator()(_Rng&& __rng) noexcept(noexcept(const_iterator<_UType<_Rng>>(
61-
ranges::begin(ranges::__possibly_const_range(__rng))))) -> const_iterator<_UType<_Rng>> {
59+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr static auto operator()(_Rng&& __rng) noexcept(
60+
noexcept(const_iterator<_UType<_Rng>>(ranges::begin(ranges::__possibly_const_range(__rng)))))
61+
-> const_iterator<_UType<_Rng>> {
6262
return const_iterator<_UType<_Rng>>(ranges::begin(ranges::__possibly_const_range(__rng)));
6363
}
6464
# else // ^^^ _LIBCPP_STD_VER >= 23 / _LIBCPP_STD_VER < 23 vvv
@@ -103,9 +103,9 @@ struct __fn {
103103
using _UType = decltype(ranges::end(ranges::__possibly_const_range(std::declval<_Rng&>())));
104104

105105
template <__const_accessible_range _Rng>
106-
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr static auto
107-
operator()(_Rng&& __rng) noexcept(noexcept(const_sentinel<_UType<_Rng>>(
108-
ranges::end(ranges::__possibly_const_range(__rng))))) -> const_sentinel<_UType<_Rng>> {
106+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr static auto operator()(_Rng&& __rng) noexcept(
107+
noexcept(const_sentinel<_UType<_Rng>>(ranges::end(ranges::__possibly_const_range(__rng)))))
108+
-> const_sentinel<_UType<_Rng>> {
109109
return const_sentinel<_UType<_Rng>>(ranges::end(ranges::__possibly_const_range(__rng)));
110110
}
111111
# else // ^^^ _LIBCPP_STD_VER >= 23 / _LIBCPP_STD_VER < 23 vvv
@@ -119,8 +119,9 @@ struct __fn {
119119

120120
template <class _Tp>
121121
requires is_rvalue_reference_v<_Tp&&>
122-
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp&& __t) const noexcept(
123-
noexcept(ranges::end(static_cast<const _Tp&&>(__t)))) -> decltype(ranges::end(static_cast<const _Tp&&>(__t))) {
122+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp&& __t) const
123+
noexcept(noexcept(ranges::end(static_cast<const _Tp&&>(__t))))
124+
-> decltype(ranges::end(static_cast<const _Tp&&>(__t))) {
124125
return ranges::end(static_cast<const _Tp&&>(__t));
125126
}
126127
# endif
@@ -149,9 +150,9 @@ struct __fn {
149150
using _UType = decltype(ranges::rbegin(ranges::__possibly_const_range(std::declval<_Rng&>())));
150151

151152
template <__const_accessible_range _Rng>
152-
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr static auto
153-
operator()(_Rng&& __rng) noexcept(noexcept(const_iterator<_UType<_Rng>>(
154-
ranges::rbegin(ranges::__possibly_const_range(__rng))))) -> const_iterator<_UType<_Rng>> {
153+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr static auto operator()(_Rng&& __rng) noexcept(
154+
noexcept(const_iterator<_UType<_Rng>>(ranges::rbegin(ranges::__possibly_const_range(__rng)))))
155+
-> const_iterator<_UType<_Rng>> {
155156
return const_iterator<_UType<_Rng>>(ranges::rbegin(ranges::__possibly_const_range(__rng)));
156157
}
157158
# else // ^^^ _LIBCPP_STD_VER >= 23 / _LIBCPP_STD_VER < 23
@@ -188,9 +189,9 @@ struct __fn {
188189
using _UType = decltype(ranges::rend(ranges::__possibly_const_range(std::declval<_Rng&>())));
189190

190191
template <__const_accessible_range _Rng>
191-
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr static auto
192-
operator()(_Rng&& __rng) noexcept(noexcept(const_sentinel<_UType<_Rng>>(
193-
ranges::rend(ranges::__possibly_const_range(__rng))))) -> const_sentinel<_UType<_Rng>> {
192+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr static auto operator()(_Rng&& __rng) noexcept(
193+
noexcept(const_sentinel<_UType<_Rng>>(ranges::rend(ranges::__possibly_const_range(__rng)))))
194+
-> const_sentinel<_UType<_Rng>> {
194195
return const_sentinel<_UType<_Rng>>(ranges::rend(ranges::__possibly_const_range(__rng)));
195196
}
196197
# else // ^^^ _LIBCPP_STD_VER >= 23 / _LIBCPP_STD_VER < 23 vvv
@@ -204,8 +205,9 @@ struct __fn {
204205

205206
template <class _Tp>
206207
requires is_rvalue_reference_v<_Tp&&>
207-
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp&& __t) const noexcept(
208-
noexcept(ranges::rend(static_cast<const _Tp&&>(__t)))) -> decltype(ranges::rend(static_cast<const _Tp&&>(__t))) {
208+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp&& __t) const
209+
noexcept(noexcept(ranges::rend(static_cast<const _Tp&&>(__t))))
210+
-> decltype(ranges::rend(static_cast<const _Tp&&>(__t))) {
209211
return ranges::rend(static_cast<const _Tp&&>(__t));
210212
}
211213
# endif // ^^^ _LIBCPP_STD_VER < 23
@@ -246,8 +248,9 @@ struct __fn {
246248

247249
template <class _Tp>
248250
requires is_rvalue_reference_v<_Tp&&>
249-
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp&& __t) const noexcept(
250-
noexcept(ranges::data(static_cast<const _Tp&&>(__t)))) -> decltype(ranges::data(static_cast<const _Tp&&>(__t))) {
251+
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp&& __t) const
252+
noexcept(noexcept(ranges::data(static_cast<const _Tp&&>(__t))))
253+
-> decltype(ranges::data(static_cast<const _Tp&&>(__t))) {
251254
return ranges::data(static_cast<const _Tp&&>(__t));
252255
}
253256
# endif // ^^^ _LIBCPP_STD_VER < 23

‎libcxx/include/iterator‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -752,10 +752,10 @@ template <class E> constexpr const E* data(initializer_list<E> il) noexcept;
752752
# include <__iterator/readable_traits.h>
753753
# include <__iterator/sortable.h>
754754
# include <__iterator/unreachable_sentinel.h>
755-
#endif
755+
# endif
756756

757-
#if _LIBCPP_STD_VER >= 23
758-
# include <__iterator/const_iterator.h>
757+
# if _LIBCPP_STD_VER >= 23
758+
# include <__iterator/const_iterator.h>
759759
# endif
760760

761761
# include <version>

‎libcxx/include/ranges‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ namespace std {
433433
# endif
434434

435435
# if _LIBCPP_STD_VER >= 23
436-
# include <__ranges/as_const_view.h>
436+
# include <__ranges/as_const_view.h>
437437
# include <__ranges/as_rvalue_view.h>
438438
# include <__ranges/chunk_by_view.h>
439439
# include <__ranges/from_range.h>

‎libcxx/include/span‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ template<class R>
163163
# include <__fwd/span.h>
164164
# include <__iterator/bounded_iter.h>
165165
# include <__iterator/concepts.h>
166-
#include <__iterator/const_iterator.h>
166+
# include <__iterator/const_iterator.h>
167167
# include <__iterator/iterator_traits.h>
168168
# include <__iterator/reverse_iterator.h>
169169
# include <__iterator/wrap_iter.h>
@@ -179,7 +179,7 @@ template<class R>
179179
# include <__type_traits/is_convertible.h>
180180
# include <__type_traits/is_integral.h>
181181
# include <__type_traits/is_same.h>
182-
#include <__type_traits/is_volatile.h>
182+
# include <__type_traits/is_volatile.h>
183183
# include <__type_traits/remove_const.h>
184184
# include <__type_traits/remove_cv.h>
185185
# include <__type_traits/remove_cvref.h>
@@ -254,10 +254,10 @@ public:
254254
using iterator = __wrap_iter<pointer>;
255255
# endif
256256
using reverse_iterator = std::reverse_iterator<iterator>;
257-
# if _LIBCPP_STD_VER >= 23
257+
# if _LIBCPP_STD_VER >= 23
258258
using const_iterator = std::const_iterator<iterator>;
259259
using const_reverse_iterator = std::const_iterator<reverse_iterator>;
260-
# endif // _LIBCPP_STD_VER >= 23
260+
# endif // _LIBCPP_STD_VER >= 23
261261

262262
static constexpr size_type extent = _Extent;
263263

@@ -344,8 +344,8 @@ public:
344344
}
345345

346346
template <size_t _Offset, size_t _Count = dynamic_extent>
347-
_LIBCPP_HIDE_FROM_ABI constexpr auto
348-
subspan() const noexcept -> span<element_type, _Count != dynamic_extent ? _Count : _Extent - _Offset> {
347+
_LIBCPP_HIDE_FROM_ABI constexpr auto subspan() const noexcept
348+
-> span<element_type, _Count != dynamic_extent ? _Count : _Extent - _Offset> {
349349
static_assert(_Offset <= _Extent, "span<T, N>::subspan<Offset, Count>(): Offset out of range");
350350
static_assert(_Count == dynamic_extent || _Count <= _Extent - _Offset,
351351
"span<T, N>::subspan<Offset, Count>(): Offset + Count out of range");
@@ -408,7 +408,7 @@ public:
408408
return iterator(data() + size());
409409
# endif
410410
}
411-
# if _LIBCPP_STD_VER >= 23
411+
# if _LIBCPP_STD_VER >= 23
412412
_LIBCPP_HIDE_FROM_ABI constexpr const_iterator cbegin() const noexcept
413413
requires(!is_volatile_v<_Tp>)
414414
{
@@ -419,11 +419,11 @@ public:
419419
{
420420
return end();
421421
}
422-
# endif // _LIBCPP_STD_VER >= 23
422+
# endif // _LIBCPP_STD_VER >= 23
423423

424424
_LIBCPP_HIDE_FROM_ABI constexpr reverse_iterator rbegin() const noexcept { return reverse_iterator(end()); }
425425
_LIBCPP_HIDE_FROM_ABI constexpr reverse_iterator rend() const noexcept { return reverse_iterator(begin()); }
426-
# if _LIBCPP_STD_VER >= 23
426+
# if _LIBCPP_STD_VER >= 23
427427
_LIBCPP_HIDE_FROM_ABI constexpr const_reverse_iterator crbegin() const noexcept
428428
requires(!is_volatile_v<_Tp>)
429429
{
@@ -434,7 +434,7 @@ public:
434434
{
435435
return rend();
436436
}
437-
# endif // _LIBCPP_STD_VER >= 23
437+
# endif // _LIBCPP_STD_VER >= 23
438438

439439
_LIBCPP_HIDE_FROM_ABI span<const byte, _Extent * sizeof(element_type)> __as_bytes() const noexcept {
440440
return span<const byte, _Extent * sizeof(element_type)>{reinterpret_cast<const byte*>(data()), size_bytes()};
@@ -466,10 +466,10 @@ public:
466466
using iterator = __wrap_iter<pointer>;
467467
# endif
468468
using reverse_iterator = std::reverse_iterator<iterator>;
469-
# if _LIBCPP_STD_VER >= 23
469+
# if _LIBCPP_STD_VER >= 23
470470
using const_iterator = std::const_iterator<iterator>;
471471
using const_reverse_iterator = std::const_iterator<reverse_iterator>;
472-
# endif
472+
# endif
473473

474474
static constexpr size_type extent = dynamic_extent;
475475

@@ -602,7 +602,7 @@ public:
602602
return iterator(data() + size());
603603
# endif
604604
}
605-
# if _LIBCPP_STD_VER >= 23
605+
# if _LIBCPP_STD_VER >= 23
606606
_LIBCPP_HIDE_FROM_ABI constexpr const_iterator cbegin() const noexcept
607607
requires(!is_volatile_v<_Tp>)
608608
{
@@ -613,11 +613,11 @@ public:
613613
{
614614
return end();
615615
}
616-
# endif
616+
# endif
617617

618618
_LIBCPP_HIDE_FROM_ABI constexpr reverse_iterator rbegin() const noexcept { return reverse_iterator(end()); }
619619
_LIBCPP_HIDE_FROM_ABI constexpr reverse_iterator rend() const noexcept { return reverse_iterator(begin()); }
620-
# if _LIBCPP_STD_VER >= 23
620+
# if _LIBCPP_STD_VER >= 23
621621
_LIBCPP_HIDE_FROM_ABI constexpr const_reverse_iterator crbegin() const noexcept
622622
requires(!is_volatile_v<_Tp>)
623623
{
@@ -628,7 +628,7 @@ public:
628628
{
629629
return rend();
630630
}
631-
# endif
631+
# endif
632632

633633
_LIBCPP_HIDE_FROM_ABI span<const byte, dynamic_extent> __as_bytes() const noexcept {
634634
return {reinterpret_cast<const byte*>(data()), size_bytes()};

0 commit comments

Comments
 (0)