Commit b7012f16 authored by Marshall Cline's avatar Marshall Cline Committed by Facebook Github Bot

remove `inline`s that don't add value

Summary: (self explanatory)

Reviewed By: yfeldblum

Differential Revision: D7825123

fbshipit-source-id: 60c99950b3af351536c0fd0ba306b5796572e1b6
parent 6161b9a5
...@@ -121,7 +121,7 @@ class CoreCallbackState { ...@@ -121,7 +121,7 @@ class CoreCallbackState {
}; };
template <typename T, typename F> template <typename T, typename F>
inline auto makeCoreCallbackState(Promise<T>&& p, F&& f) noexcept( auto makeCoreCallbackState(Promise<T>&& p, F&& f) noexcept(
noexcept(CoreCallbackState<T, _t<std::decay<F>>>( noexcept(CoreCallbackState<T, _t<std::decay<F>>>(
std::declval<Promise<T>&&>(), std::declval<Promise<T>&&>(),
std::declval<F&&>()))) { std::declval<F&&>()))) {
...@@ -678,7 +678,7 @@ SemiFuture<T>& SemiFuture<T>::operator=(Future<T>&& other) noexcept { ...@@ -678,7 +678,7 @@ SemiFuture<T>& SemiFuture<T>::operator=(Future<T>&& other) noexcept {
} }
template <class T> template <class T>
inline Future<T> SemiFuture<T>::via(Executor* executor, int8_t priority) && { Future<T> SemiFuture<T>::via(Executor* executor, int8_t priority) && {
if (!executor) { if (!executor) {
throwNoExecutor(); throwNoExecutor();
} }
...@@ -695,7 +695,7 @@ inline Future<T> SemiFuture<T>::via(Executor* executor, int8_t priority) && { ...@@ -695,7 +695,7 @@ inline Future<T> SemiFuture<T>::via(Executor* executor, int8_t priority) && {
} }
template <class T> template <class T>
inline Future<T> SemiFuture<T>::toUnsafeFuture() && { Future<T> SemiFuture<T>::toUnsafeFuture() && {
return std::move(*this).via(&folly::InlineExecutor::instance()); return std::move(*this).via(&folly::InlineExecutor::instance());
} }
...@@ -867,7 +867,7 @@ typename std:: ...@@ -867,7 +867,7 @@ typename std::
} }
template <class T> template <class T>
inline Future<T> Future<T>::via(Executor* executor, int8_t priority) && { Future<T> Future<T>::via(Executor* executor, int8_t priority) && {
this->setExecutor(executor, priority); this->setExecutor(executor, priority);
auto newFuture = Future<T>(this->core_); auto newFuture = Future<T>(this->core_);
...@@ -876,7 +876,7 @@ inline Future<T> Future<T>::via(Executor* executor, int8_t priority) && { ...@@ -876,7 +876,7 @@ inline Future<T> Future<T>::via(Executor* executor, int8_t priority) && {
} }
template <class T> template <class T>
inline Future<T> Future<T>::via(Executor* executor, int8_t priority) & { Future<T> Future<T>::via(Executor* executor, int8_t priority) & {
this->throwIfInvalid(); this->throwIfInvalid();
Promise<T> p; Promise<T> p;
auto sf = p.getSemiFuture(); auto sf = p.getSemiFuture();
...@@ -1237,7 +1237,7 @@ struct CollectContext { ...@@ -1237,7 +1237,7 @@ struct CollectContext {
p.setValue(std::move(finalResult)); p.setValue(std::move(finalResult));
} }
} }
inline void setPartialResult(size_t i, Try<T>& t) { void setPartialResult(size_t i, Try<T>& t) {
result[i] = std::move(t.value()); result[i] = std::move(t.value());
} }
Promise<Result> p; Promise<Result> p;
...@@ -1368,11 +1368,11 @@ collectN(InputIterator first, InputIterator last, size_t n) { ...@@ -1368,11 +1368,11 @@ collectN(InputIterator first, InputIterator last, size_t n) {
std::atomic<size_t> completed = {0}; std::atomic<size_t> completed = {0};
Promise<Result> p; Promise<Result> p;
inline void setPartialResult(size_t index, Try<T>&& t) { void setPartialResult(size_t index, Try<T>&& t) {
v[index] = std::move(t); v[index] = std::move(t);
} }
inline void complete() { void complete() {
Result result; Result result;
result.reserve(completed.load()); result.reserve(completed.load());
for (size_t i = 0; i < v.size(); ++i) { for (size_t i = 0; i < v.size(); ++i) {
...@@ -1468,7 +1468,7 @@ window(Executor* executor, Collection input, F func, size_t n) { ...@@ -1468,7 +1468,7 @@ window(Executor* executor, Collection input, F func, size_t n) {
std::vector<Promise<Result>> promises; std::vector<Promise<Result>> promises;
F func; F func;
static inline void spawn(std::shared_ptr<WindowContext> ctx) { static void spawn(std::shared_ptr<WindowContext> ctx) {
size_t i = ctx->i++; size_t i = ctx->i++;
if (i < ctx->input.size()) { if (i < ctx->input.size()) {
auto fut = auto fut =
...@@ -1949,7 +1949,7 @@ Future<T> Future<T>::filter(F&& predicate) { ...@@ -1949,7 +1949,7 @@ Future<T> Future<T>::filter(F&& predicate) {
} }
template <class F> template <class F>
inline Future<Unit> when(bool p, F&& thunk) { Future<Unit> when(bool p, F&& thunk) {
return p ? std::forward<F>(thunk)().unit() : makeFuture(); return p ? std::forward<F>(thunk)().unit() : makeFuture();
} }
......
...@@ -333,9 +333,7 @@ class SemiFuture : private futures::detail::FutureBase<T> { ...@@ -333,9 +333,7 @@ class SemiFuture : private futures::detail::FutureBase<T> {
// The ref-qualifier allows for `this` to be moved out so we // The ref-qualifier allows for `this` to be moved out so we
// don't get access-after-free situations in chaining. // don't get access-after-free situations in chaining.
// https://akrzemi1.wordpress.com/2014/06/02/ref-qualifiers/ // https://akrzemi1.wordpress.com/2014/06/02/ref-qualifiers/
inline Future<T> via( Future<T> via(Executor* executor, int8_t priority = Executor::MID_PRI) &&;
Executor* executor,
int8_t priority = Executor::MID_PRI) &&;
/** /**
* Defer work to run on the consumer of the future. * Defer work to run on the consumer of the future.
...@@ -414,7 +412,7 @@ class SemiFuture : private futures::detail::FutureBase<T> { ...@@ -414,7 +412,7 @@ class SemiFuture : private futures::detail::FutureBase<T> {
/// non-deterministic in the standard case. /// non-deterministic in the standard case.
/// For new code, or to update code that temporarily uses this, please /// For new code, or to update code that temporarily uses this, please
/// use via and pass a meaningful executor. /// use via and pass a meaningful executor.
inline Future<T> toUnsafeFuture() &&; Future<T> toUnsafeFuture() &&;
#if FOLLY_HAS_COROUTINES #if FOLLY_HAS_COROUTINES
class promise_type { class promise_type {
...@@ -601,16 +599,12 @@ class Future : private futures::detail::FutureBase<T> { ...@@ -601,16 +599,12 @@ class Future : private futures::detail::FutureBase<T> {
// The ref-qualifier allows for `this` to be moved out so we // The ref-qualifier allows for `this` to be moved out so we
// don't get access-after-free situations in chaining. // don't get access-after-free situations in chaining.
// https://akrzemi1.wordpress.com/2014/06/02/ref-qualifiers/ // https://akrzemi1.wordpress.com/2014/06/02/ref-qualifiers/
inline Future<T> via( Future<T> via(Executor* executor, int8_t priority = Executor::MID_PRI) &&;
Executor* executor,
int8_t priority = Executor::MID_PRI) &&;
/// This variant creates a new future, where the ref-qualifier && version /// This variant creates a new future, where the ref-qualifier && version
/// moves `this` out. This one is less efficient but avoids confusing users /// moves `this` out. This one is less efficient but avoids confusing users
/// when "return f.via(x);" fails. /// when "return f.via(x);" fails.
inline Future<T> via( Future<T> via(Executor* executor, int8_t priority = Executor::MID_PRI) &;
Executor* executor,
int8_t priority = Executor::MID_PRI) &;
/** When this Future has completed, execute func which is a function that /** When this Future has completed, execute func which is a function that
takes one of: takes one of:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment