Skip to content

Commit f36b40a

Browse files
authored
Merge pull request NVIDIA#1583 from ericniebler/fix-formatting
reformat everything with clang-format-21
2 parents 512c546 + 0453d6c commit f36b40a

27 files changed

+230
-212
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ aee392a046a26ae2340849fe98e38332d9537397
2727

2828
# Tweak some clang-format settings and eformat everything with clang-format-21
2929
8a63d46aabca368c867c715e40ebc0a2f3c48e1c
30+
31+
# Reformat everything with clang-format-21 again
32+
1957788ce7a55843c0bcf81e4c97a4027547dcb1

include/exec/__detail/__basic_sequence.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,13 @@ namespace exec {
9191
apply(_Sender&& __sndr, _ApplyFn&& __fun) noexcept(stdexec::__nothrow_callable<
9292
stdexec::__detail::__impl_of<_Sender>,
9393
stdexec::__copy_cvref_fn<_Sender>,
94-
_ApplyFn>)
94+
_ApplyFn
95+
>)
9596
-> stdexec::__call_result_t<
9697
stdexec::__detail::__impl_of<_Sender>,
9798
stdexec::__copy_cvref_fn<_Sender>,
98-
_ApplyFn> {
99+
_ApplyFn
100+
> {
99101
return static_cast<_Sender&&>(__sndr)
100102
.__impl_(stdexec::__copy_cvref_fn<_Sender>(), static_cast<_ApplyFn&&>(__fun));
101103
}

include/exec/__detail/__system_context_default_impl.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ namespace exec::__system_context_default_impl {
203203
}
204204

205205
uint32_t __end(uint32_t __chunk_index) const noexcept {
206-
return (std::min)(__begin(__chunk_index + 1), __max_size_);
206+
return (std::min) (__begin(__chunk_index + 1), __max_size_);
207207
}
208208
};
209209

@@ -308,7 +308,8 @@ namespace exec::__system_context_default_impl {
308308
struct __instance_data {
309309
// work around for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=119652
310310
constexpr __instance_data() noexcept // NOLINT(modernize-use-equals-default)
311-
{}
311+
{
312+
}
312313

313314
/// Gets the current instance; if there is no instance, uses the current factory to create one.
314315
auto __get_current_instance() -> std::shared_ptr<_Interface> {

include/exec/linux/io_uring_context.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,8 +1082,9 @@ namespace exec {
10821082
auto operator==(const __scheduler&) const -> bool = default;
10831083

10841084
struct __schedule_env {
1085-
[[nodiscard]] auto
1086-
query(stdexec::get_completion_scheduler_t<stdexec::set_value_t>) const noexcept -> __scheduler {
1085+
[[nodiscard]]
1086+
auto query(stdexec::get_completion_scheduler_t<stdexec::set_value_t>) const noexcept
1087+
-> __scheduler {
10871088
return __scheduler{__context_};
10881089
}
10891090

include/exec/sequence/ignore_all_values.hpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ namespace exec {
9797
_ResultVariant,
9898
__decayed_std_tuple<set_error_t, _Error>,
9999
set_error_t,
100-
_Error>
100+
_Error
101+
>
101102
&& __callable<stdexec::set_stopped_t, _ItemReceiver>
102103
void set_error(_Error&& __error) noexcept {
103104
// store error and signal stop
@@ -109,7 +110,8 @@ namespace exec {
109110
requires __variant_emplaceable<
110111
_ResultVariant,
111112
__decayed_std_tuple<set_stopped_t>,
112-
set_stopped_t>
113+
set_stopped_t
114+
>
113115
&& __callable<set_stopped_t, _ItemReceiver>
114116
{
115117
// stop without error
@@ -225,7 +227,8 @@ namespace exec {
225227
__mconst<__types<>>::__f,
226228
__mcompose_q<__types, __mbind_front_q<__decayed_std_tuple, set_error_t>::__f>::__f,
227229
__types<std::tuple<set_stopped_t>>,
228-
__mconcat<__qq<__nullable_std_variant>>::__f>;
230+
__mconcat<__qq<__nullable_std_variant>>::__f
231+
>;
229232

230233
template <class _Sender, class _Env>
231234
using __result_variant_t =
@@ -321,7 +324,8 @@ namespace exec {
321324
requires receiver_of<_Receiver, __completion_sigs<__child_of<_Sender>, env_of_t<_Receiver>>>
322325
&& sequence_sender_to<
323326
__child_of<_Sender>,
324-
__receiver_t<__child_of<_Sender>, _Receiver>>
327+
__receiver_t<__child_of<_Sender>, _Receiver>
328+
>
325329
{
326330
static_assert(sender_expr_for<_Sender, ignore_all_values_t>);
327331
return __sexpr_apply(static_cast<_Sender&&>(__sndr), __connect_fn<_Receiver>{__rcvr});

include/exec/static_thread_pool.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ namespace exec {
322322
static_assert(
323323
__starts_on<Sender, static_thread_pool_::scheduler, Env>
324324
|| __completes_on<Sender, static_thread_pool_::scheduler>,
325-
"No static_thread_pool_ instance can be found in the sender's or receiver's "
325+
"No static_thread_pool instance can be found in the sender's or receiver's "
326326
"environment on which to schedule bulk work.");
327327
return not_a_sender<__name_of<Sender>>();
328328
}
@@ -1673,7 +1673,7 @@ namespace exec {
16731673
}
16741674

16751675
template <exec::sequence_receiver_of<item_types> Receiver>
1676-
requires __decay_copyable<Range const&>
1676+
requires __decay_copyable<Range const &>
16771677
auto subscribe(Receiver rcvr) const & noexcept
16781678
-> stdexec::__t<operation<Range, stdexec::__id<Receiver>>> {
16791679
return {range_, *pool_, static_cast<Receiver&&>(rcvr)};

include/exec/system_context.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,7 @@ namespace exec {
708708
};
709709

710710
template <__bulk_chunked_or_unchunked _Sender>
711-
auto __parallel_scheduler_domain::transform_sender(_Sender&& __sndr)
712-
const noexcept {
711+
auto __parallel_scheduler_domain::transform_sender(_Sender&& __sndr) const noexcept {
713712
if constexpr (stdexec::__completes_on<_Sender, parallel_scheduler>) {
714713
auto __sched = stdexec::get_completion_scheduler<stdexec::set_value_t>(
715714
stdexec::get_env(__sndr));
@@ -723,6 +722,7 @@ namespace exec {
723722
return __not_a_sender<stdexec::__name_of<_Sender>>();
724723
}
725724
}
725+
726726
template <__bulk_chunked_or_unchunked _Sender, class _Env>
727727
auto __parallel_scheduler_domain::transform_sender(_Sender&& __sndr, const _Env& __env)
728728
const noexcept {

include/exec/task.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ namespace exec {
188188
static_assert(std::is_nothrow_constructible_v<
189189
__stop_callback_t,
190190
__stop_token_t,
191-
__forward_stop_request>);
191+
__forward_stop_request
192+
>);
192193
__self.__stop_token_ = __stop_source_.get_token();
193194
}
194195

@@ -442,9 +443,7 @@ namespace exec {
442443

443444
auto await_resume() -> _Ty {
444445
__context_.reset();
445-
scope_guard __on_exit{[this]() noexcept {
446-
std::exchange(__coro_, {}).destroy();
447-
}};
446+
scope_guard __on_exit{[this]() noexcept { std::exchange(__coro_, {}).destroy(); }};
448447
if (__coro_.promise().__data_.index() == 1)
449448
std::rethrow_exception(std::move(__coro_.promise().__data_.template get<1>()));
450449
if constexpr (!std::is_void_v<_Ty>)
@@ -458,7 +457,8 @@ namespace exec {
458457
requires constructible_from<
459458
awaiter_context_t<__promise, _ParentPromise>,
460459
__promise_context_t&,
461-
_ParentPromise&>
460+
_ParentPromise&
461+
>
462462
auto as_awaitable(_ParentPromise&) && noexcept -> __task_awaitable<_ParentPromise> {
463463
return __task_awaitable<_ParentPromise>{std::exchange(__coro_, {})};
464464
}

include/exec/timed_thread_scheduler.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ namespace exec {
210210
&task_type::when_,
211211
&task_type::prev_,
212212
&task_type::left_,
213-
&task_type::right_>
213+
&task_type::right_
214+
>
214215
heap_;
215216
std::atomic<std::ptrdiff_t> n_submissions_in_flight_{0};
216217
std::mutex ready_mutex_;
@@ -291,7 +292,8 @@ namespace exec {
291292
};
292293

293294
using callback_type = typename stdexec::stop_token_of_t<
294-
stdexec::env_of_t<Receiver>>::template callback_type<on_stopped_t>;
295+
stdexec::env_of_t<Receiver>
296+
>::template callback_type<on_stopped_t>;
295297

296298
void request_stop() noexcept {
297299
if (ref_count_.fetch_add(1, std::memory_order_relaxed) == 1) {

0 commit comments

Comments
 (0)