Skip to content

Commit 0f1b477

Browse files
ericnieblerericniebler
authored
Merge pull request #1546 from ericniebler/improved-formatting
tweak some clang-format settings and reformat everything with clang-format-21
2 parents 186f36c + 67591fc commit 0f1b477

File tree

232 files changed

+4363
-4115
lines changed

Some content is hidden

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

232 files changed

+4363
-4115
lines changed

‎.clang-format

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ AlignOperands: AlignAfterOperator
1515
AlignTrailingComments: true
1616
AllowAllArgumentsOnNextLine: true
1717
AllowAllParametersOfDeclarationOnNextLine: false
18+
AllowBreakBeforeNoexceptSpecifier: OnlyWithParen
1819
AllowShortBlocksOnASingleLine: Never
1920
AllowShortCaseLabelsOnASingleLine: false
2021
AllowShortEnumsOnASingleLine: false
@@ -55,6 +56,7 @@ BraceWrapping:
5556
SplitEmptyNamespace: false
5657
BreakBeforeBinaryOperators: NonAssignment
5758
BreakBeforeConceptDeclarations: true
59+
BreakBeforeTemplateCloser: true
5860
BreakBeforeTernaryOperators: true
5961
BreakConstructorInitializers: BeforeComma
6062
BreakInheritanceList: BeforeComma
@@ -84,23 +86,25 @@ LambdaBodyIndentation: Signature
8486
LineEnding: LF
8587
Macros: [
8688
'STDEXEC_MEMFN_DECL(...)=__VA_ARGS__',
87-
'STDEXEC_ATTRIBUTE(X)=[[]]',
89+
'STDEXEC_ATTRIBUTE(...)=__attribute__((__VA_ARGS__))',
8890
'STDEXEC_IMMOVABLE_NO_UNIQUE_ADDRESS=[[no_unique_address]]',
8991
'STDEXEC_MISSING_MEMBER(X,Y)=true',
9092
'STDEXEC_DEFINE_MEMBER(X)=void foo() {}',
91-
'STDEXEC_AUTO_RETURN(...)=->decltype(auto){ return __VA_ARGS__; }',
93+
'STDEXEC_AUTO_RETURN(...)=->decltype(auto){ return __VA_ARGS__; }'
9294
]
9395
MaxEmptyLinesToKeep: 2
9496
NamespaceIndentation: All
9597
PackConstructorInitializers: Never
96-
PenaltyBreakAssignment: 10
97-
PenaltyBreakBeforeFirstCallParameter: 64
98+
PenaltyBreakAssignment: 100
99+
PenaltyBreakBeforeFirstCallParameter: 100
100+
PenaltyBreakBeforeMemberAccess: 0
98101
PenaltyBreakComment: 0
99102
PenaltyBreakFirstLessLess: 0
100-
PenaltyBreakOpenParenthesis: 80
101-
PenaltyBreakString: 10
102-
PenaltyBreakTemplateDeclaration: 0
103-
PenaltyExcessCharacter: 100
103+
PenaltyBreakOpenParenthesis: 0
104+
PenaltyBreakScopeResolution: 0x7FFFFFFF
105+
PenaltyBreakString: 0
106+
PenaltyBreakTemplateDeclaration: 100
107+
PenaltyExcessCharacter: 500
104108
PenaltyIndentedWhitespace: 0
105109
PenaltyReturnTypeOnItsOwnLine: 0
106110
PointerAlignment: Left

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ ab2a3baef655db23fb7ec11ce7ec49575bbd2807
2424

2525
# Reformat everything with clang-format-20
2626
aee392a046a26ae2340849fe98e38332d9537397
27+
28+
# Tweak some clang-format settings and eformat everything with clang-format-21
29+
8a63d46aabca368c867c715e40ebc0a2f3c48e1c

‎examples/algorithms/retry.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ struct _op {
8787
_op(_op&&) = delete;
8888

8989
auto _connect() noexcept {
90-
return _conv{[this] {
91-
return stdexec::connect(s_, _retry_receiver<S, R>{this});
92-
}};
90+
return _conv{[this] { return stdexec::connect(s_, _retry_receiver<S, R>{this}); }};
9391
}
9492

9593
void _retry() noexcept {
@@ -126,7 +124,8 @@ struct _retry_sender {
126124
Env,
127125
stdexec::completion_signatures<stdexec::set_error_t(std::exception_ptr)>,
128126
_value,
129-
_error> {
127+
_error
128+
> {
130129
return {};
131130
}
132131

‎examples/algorithms/then.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ using namespace stdexec::tags;
2626
template <class R, class F>
2727
class _then_receiver : public stdexec::receiver_adaptor<_then_receiver<R, F>, R> {
2828
template <class... As>
29-
using _completions = //
30-
stdexec::completion_signatures<
31-
stdexec::set_value_t(std::invoke_result_t<F, As...>),
32-
stdexec::set_error_t(std::exception_ptr)>;
29+
using _completions = stdexec::completion_signatures<
30+
stdexec::set_value_t(std::invoke_result_t<F, As...>),
31+
stdexec::set_error_t(std::exception_ptr)
32+
>;
3333

3434
public:
3535
_then_receiver(R r, F f)
@@ -66,12 +66,12 @@ struct _then_sender {
6666
stdexec::completion_signatures<stdexec::set_value_t(std::invoke_result_t<F, Args...>)>;
6767

6868
template <class Env>
69-
using _completions_t = //
70-
stdexec::transform_completion_signatures_of<
71-
S,
72-
Env,
73-
stdexec::completion_signatures<stdexec::set_error_t(std::exception_ptr)>,
74-
_set_value_t>;
69+
using _completions_t = stdexec::transform_completion_signatures_of<
70+
S,
71+
Env,
72+
stdexec::completion_signatures<stdexec::set_error_t(std::exception_ptr)>,
73+
_set_value_t
74+
>;
7575

7676
template <class Env>
7777
auto get_completion_signatures(Env&&) && -> _completions_t<Env> {

‎examples/benchmark/asio_thread_pool.cpp

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,14 @@ struct RunThread {
4747
std::atomic<std::size_t> counter{scheds};
4848
auto env = exec::make_env(stdexec::prop{stdexec::get_allocator, alloc});
4949
while (scheds) {
50-
stdexec::start_detached( //
51-
stdexec::schedule(scheduler) //
52-
| stdexec::then([&] {
53-
auto prev = counter.fetch_sub(1);
54-
if (prev == 1) {
55-
std::lock_guard lock{mut};
56-
cv.notify_one();
57-
}
58-
}),
50+
stdexec::start_detached(
51+
stdexec::schedule(scheduler) | stdexec::then([&] {
52+
auto prev = counter.fetch_sub(1);
53+
if (prev == 1) {
54+
std::lock_guard lock{mut};
55+
cv.notify_one();
56+
}
57+
}),
5958
env);
6059
--scheds;
6160
}
@@ -64,15 +63,13 @@ struct RunThread {
6463
std::size_t scheds = end - start;
6564
std::atomic<std::size_t> counter{scheds};
6665
while (scheds) {
67-
stdexec::start_detached( //
68-
stdexec::schedule(scheduler) //
69-
| stdexec::then([&] {
70-
auto prev = counter.fetch_sub(1);
71-
if (prev == 1) {
72-
std::lock_guard lock{mut};
73-
cv.notify_one();
74-
}
75-
}));
66+
stdexec::start_detached(stdexec::schedule(scheduler) | stdexec::then([&] {
67+
auto prev = counter.fetch_sub(1);
68+
if (prev == 1) {
69+
std::lock_guard lock{mut};
70+
cv.notify_one();
71+
}
72+
}));
7673
--scheds;
7774
}
7875
#endif

‎examples/benchmark/fibonacci.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,8 @@ auto main(int argc, char** argv) -> int {
115115
auto snd = std::visit(
116116
[&](auto&& pool) { return fib_sender(fib_s{cutoff, n, pool.get_scheduler()}); }, pool);
117117

118-
auto time = measure<std::chrono::milliseconds>([&] {
119-
std::tie(result) = stdexec::sync_wait(std::move(snd)).value();
120-
});
118+
auto time = measure<std::chrono::milliseconds>(
119+
[&] { std::tie(result) = stdexec::sync_wait(std::move(snd)).value(); });
121120
times.push_back(static_cast<unsigned int>(time));
122121
}
123122

‎examples/benchmark/static_thread_pool.cpp

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,14 @@ struct RunThread {
4949
std::atomic<std::size_t> counter{scheds};
5050
auto env = exec::make_env(stdexec::prop{stdexec::get_allocator, alloc});
5151
while (scheds) {
52-
stdexec::start_detached( //
53-
stdexec::schedule(scheduler) //
54-
| stdexec::then([&] {
55-
auto prev = counter.fetch_sub(1);
56-
if (prev == 1) {
57-
std::lock_guard lock{mut};
58-
cv.notify_one();
59-
}
60-
}),
52+
stdexec::start_detached(
53+
stdexec::schedule(scheduler) | stdexec::then([&] {
54+
auto prev = counter.fetch_sub(1);
55+
if (prev == 1) {
56+
std::lock_guard lock{mut};
57+
cv.notify_one();
58+
}
59+
}),
6160
env);
6261
--scheds;
6362
}
@@ -66,15 +65,13 @@ struct RunThread {
6665
std::size_t scheds = end - start;
6766
std::atomic<std::size_t> counter{scheds};
6867
while (scheds) {
69-
stdexec::start_detached( //
70-
stdexec::schedule(scheduler) //
71-
| stdexec::then([&] {
72-
auto prev = counter.fetch_sub(1);
73-
if (prev == 1) {
74-
std::lock_guard lock{mut};
75-
cv.notify_one();
76-
}
77-
}));
68+
stdexec::start_detached(stdexec::schedule(scheduler) | stdexec::then([&] {
69+
auto prev = counter.fetch_sub(1);
70+
if (prev == 1) {
71+
std::lock_guard lock{mut};
72+
cv.notify_one();
73+
}
74+
}));
7875
--scheds;
7976
}
8077
#endif

‎examples/benchmark/static_thread_pool_nested.cpp

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -46,45 +46,39 @@ struct RunThread {
4646
std::size_t scheds = end - start;
4747
std::atomic<std::size_t> counter{scheds};
4848
auto env = exec::make_env(stdexec::prop{stdexec::get_allocator, alloc});
49-
stdexec::sync_wait(
50-
stdexec::schedule(scheduler) //
51-
| stdexec::then([&] {
52-
auto nested_scheduler = pool.get_scheduler();
53-
while (scheds) {
54-
stdexec::start_detached( //
55-
stdexec::schedule(nested_scheduler) //
56-
| stdexec::then([&] {
57-
auto prev = counter.fetch_sub(1);
58-
if (prev == 1) {
59-
std::lock_guard lock{mut};
60-
cv.notify_one();
61-
}
62-
}),
63-
env);
64-
--scheds;
65-
}
66-
}));
49+
stdexec::sync_wait(stdexec::schedule(scheduler) | stdexec::then([&] {
50+
auto nested_scheduler = pool.get_scheduler();
51+
while (scheds) {
52+
stdexec::start_detached(
53+
stdexec::schedule(nested_scheduler) | stdexec::then([&] {
54+
auto prev = counter.fetch_sub(1);
55+
if (prev == 1) {
56+
std::lock_guard lock{mut};
57+
cv.notify_one();
58+
}
59+
}),
60+
env);
61+
--scheds;
62+
}
63+
}));
6764
#else
6865
auto [start, end] = exec::_pool_::even_share(total_scheds, tid, pool.available_parallelism());
6966
std::size_t scheds = end - start;
7067
std::atomic<std::size_t> counter{scheds};
71-
stdexec::sync_wait(
72-
stdexec::schedule(scheduler) //
73-
| stdexec::then([&] {
74-
auto nested_scheduler = pool.get_scheduler();
75-
while (scheds) {
76-
stdexec::start_detached( //
77-
stdexec::schedule(nested_scheduler) //
78-
| stdexec::then([&] {
79-
auto prev = counter.fetch_sub(1);
80-
if (prev == 1) {
81-
std::lock_guard lock{mut};
82-
cv.notify_one();
83-
}
84-
}));
85-
--scheds;
86-
}
87-
}));
68+
stdexec::sync_wait(stdexec::schedule(scheduler) | stdexec::then([&] {
69+
auto nested_scheduler = pool.get_scheduler();
70+
while (scheds) {
71+
stdexec::start_detached(
72+
stdexec::schedule(nested_scheduler) | stdexec::then([&] {
73+
auto prev = counter.fetch_sub(1);
74+
if (prev == 1) {
75+
std::lock_guard lock{mut};
76+
cv.notify_one();
77+
}
78+
}));
79+
--scheds;
80+
}
81+
}));
8882
#endif
8983
std::unique_lock lock{mut};
9084
cv.wait(lock, [&] { return counter.load() == 0; });

‎examples/benchmark/static_thread_pool_nested_old.cpp

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -46,43 +46,37 @@ struct RunThread {
4646
std::size_t scheds = end - start;
4747
std::atomic<std::size_t> counter{scheds};
4848
auto env = exec::make_env(stdexec::prop{stdexec::get_allocator, alloc});
49-
stdexec::sync_wait(
50-
stdexec::schedule(scheduler) //
51-
| stdexec::then([&] {
52-
while (scheds) {
53-
stdexec::start_detached( //
54-
stdexec::schedule(scheduler) //
55-
| stdexec::then([&] {
56-
auto prev = counter.fetch_sub(1);
57-
if (prev == 1) {
58-
std::lock_guard lock{mut};
59-
cv.notify_one();
60-
}
61-
}),
62-
env);
63-
--scheds;
64-
}
65-
}));
49+
stdexec::sync_wait(stdexec::schedule(scheduler) | stdexec::then([&] {
50+
while (scheds) {
51+
stdexec::start_detached(
52+
stdexec::schedule(scheduler) | stdexec::then([&] {
53+
auto prev = counter.fetch_sub(1);
54+
if (prev == 1) {
55+
std::lock_guard lock{mut};
56+
cv.notify_one();
57+
}
58+
}),
59+
env);
60+
--scheds;
61+
}
62+
}));
6663
#else
6764
auto [start, end] = exec_old::even_share(total_scheds, tid, pool.available_parallelism());
6865
std::size_t scheds = end - start;
6966
std::atomic<std::size_t> counter{scheds};
70-
stdexec::sync_wait(
71-
stdexec::schedule(scheduler) //
72-
| stdexec::then([&] {
73-
while (scheds) {
74-
stdexec::start_detached( //
75-
stdexec::schedule(scheduler) //
76-
| stdexec::then([&] {
77-
auto prev = counter.fetch_sub(1);
78-
if (prev == 1) {
79-
std::lock_guard lock{mut};
80-
cv.notify_one();
81-
}
82-
}));
83-
--scheds;
84-
}
85-
}));
67+
stdexec::sync_wait(stdexec::schedule(scheduler) | stdexec::then([&] {
68+
while (scheds) {
69+
stdexec::start_detached(
70+
stdexec::schedule(scheduler) | stdexec::then([&] {
71+
auto prev = counter.fetch_sub(1);
72+
if (prev == 1) {
73+
std::lock_guard lock{mut};
74+
cv.notify_one();
75+
}
76+
}));
77+
--scheds;
78+
}
79+
}));
8680
#endif
8781
std::unique_lock lock{mut};
8882
cv.wait(lock, [&] { return counter.load() == 0; });

0 commit comments

Comments
 (0)