Skip to content

Commit 89d3f18

Browse files
committed
refactor: unify parameter pack naming in perfect forwarding
1 parent dfb1474 commit 89d3f18

1 file changed

Lines changed: 22 additions & 22 deletions

File tree

include/zero/async/promise.h

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,20 @@ namespace zero::async::promise {
8383
return Future<T, E>{mCore};
8484
}
8585

86-
template<typename... Ts>
87-
void resolve(Ts &&... args) {
86+
template<typename... Args>
87+
void resolve(Args &&... args) {
8888
assert(mCore);
8989
assert(!mCore->result);
9090
assert(mCore->state != State::ONLY_RESULT);
9191
assert(mCore->state != State::DONE);
9292

9393
if constexpr (std::is_void_v<T>) {
94-
static_assert(sizeof...(Ts) == 0);
94+
static_assert(sizeof...(Args) == 0);
9595
mCore->result.emplace();
9696
}
9797
else {
98-
static_assert(sizeof...(Ts) > 0);
99-
mCore->result.emplace(std::in_place, std::forward<Ts>(args)...);
98+
static_assert(sizeof...(Args) > 0);
99+
mCore->result.emplace(std::in_place, std::forward<Args>(args)...);
100100
}
101101

102102
auto state = mCore->state.load();
@@ -113,15 +113,15 @@ namespace zero::async::promise {
113113
mCore->trigger();
114114
}
115115

116-
template<typename... Ts>
117-
void reject(Ts &&... args) {
118-
static_assert(sizeof...(Ts) > 0);
116+
template<typename... Args>
117+
void reject(Args &&... args) {
118+
static_assert(sizeof...(Args) > 0);
119119
assert(mCore);
120120
assert(!mCore->result);
121121
assert(mCore->state != State::ONLY_RESULT);
122122
assert(mCore->state != State::DONE);
123123

124-
mCore->result.emplace(std::unexpected<E>(std::in_place, std::forward<Ts>(args)...));
124+
mCore->result.emplace(std::unexpected<E>(std::in_place, std::forward<Args>(args)...));
125125
auto state = mCore->state.load();
126126

127127
if (state == State::PENDING && mCore->state.compare_exchange_strong(state, State::ONLY_RESULT)) {
@@ -149,10 +149,10 @@ namespace zero::async::promise {
149149
return future;
150150
}
151151

152-
template<typename T, typename E, typename... Ts>
153-
Future<T, E> reject(Ts &&... args) {
152+
template<typename T, typename E, typename... Args>
153+
Future<T, E> reject(Args &&... args) {
154154
Promise<T, E> promise;
155-
promise.reject(std::forward<Ts>(args)...);
155+
promise.reject(std::forward<Args>(args)...);
156156
return promise.getFuture();
157157
}
158158

@@ -164,11 +164,11 @@ namespace zero::async::promise {
164164
return promise.getFuture();
165165
}
166166

167-
template<typename T, typename E, typename... Ts>
168-
requires (!std::is_void_v<T> && sizeof...(Ts) > 0)
169-
Future<T, E> resolve(Ts &&... args) {
167+
template<typename T, typename E, typename... Args>
168+
requires (!std::is_void_v<T> && sizeof...(Args) > 0)
169+
Future<T, E> resolve(Args &&... args) {
170170
Promise<T, E> promise;
171-
promise.resolve(std::forward<Ts>(args)...);
171+
promise.resolve(std::forward<Args>(args)...);
172172
return promise.getFuture();
173173
}
174174

@@ -282,8 +282,8 @@ namespace zero::async::promise {
282282
return;
283283
}
284284

285-
std::move(*next).then([=]<typename... Ts>(Ts &&... args) {
286-
promise->resolve(std::forward<Ts>(args)...);
285+
std::move(*next).then([=]<typename... Args>(Args &&... args) {
286+
promise->resolve(std::forward<Args>(args)...);
287287
}).fail([=](E &&error) {
288288
promise->reject(std::move(error));
289289
});
@@ -363,9 +363,9 @@ namespace zero::async::promise {
363363

364364
const auto fallthrough = std::make_shared<bool>();
365365

366-
auto future = std::move(*this).then([=, f = std::forward<F1>(f1)]<typename... Ts>(Ts &&... args) mutable {
366+
auto future = std::move(*this).then([=, f = std::forward<F1>(f1)]<typename... Args>(Args &&... args) mutable {
367367
*fallthrough = true;
368-
return f(std::forward<Ts>(args)...);
368+
return f(std::forward<Args>(args)...);
369369
});
370370

371371
using NextValue = decltype(future)::value_type;
@@ -393,8 +393,8 @@ namespace zero::async::promise {
393393

394394
setCallback([promise = std::move(promise), f = std::forward<F>(f)](std::expected<T, E> &&result) mutable {
395395
if (!result) {
396-
std::invoke(f, std::move(result).error()).then([=]<typename... Ts>(Ts &&... args) {
397-
promise->resolve(std::forward<Ts>(args)...);
396+
std::invoke(f, std::move(result).error()).then([=]<typename... Args>(Args &&... args) {
397+
promise->resolve(std::forward<Args>(args)...);
398398
}).fail([=](NextError &&error) {
399399
promise->reject(std::move(error));
400400
});

0 commit comments

Comments
 (0)