From d43657fbd561aed1ffeebda97b0139edaf17a92f Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Sat, 21 Mar 2020 14:23:40 +0100
Subject: [PATCH] Use clang-format for code style consistency

Based on the WebKit preset and following 'most' of the Qt guidelines, except a few rules that work better for promise continuation lambdas. Requires clang-format 11.
---
 .clang-format                                 |  66 +++++
 src/qtpromise/qpromise.h                      |  91 +++----
 src/qtpromise/qpromise.inl                    | 110 ++++----
 src/qtpromise/qpromise_p.h                    | 238 ++++++++----------
 src/qtpromise/qpromiseconnections.h           |   8 +-
 src/qtpromise/qpromisefuture.h                |  23 +-
 src/qtpromise/qpromiseglobal.h                |  52 ++--
 src/qtpromise/qpromisehelpers.h               | 217 ++++++++--------
 src/qtpromise/qpromisehelpers_p.h             |  55 ++--
 src/qtpromise/qpromiseresolver.h              |  38 ++-
 .../qtpromise/benchmark/tst_benchmark.cpp     | 185 ++++++++------
 .../deprecations/tst_helpers_qpromise.cpp     |  10 +-
 .../deprecations/tst_helpers_qpromiseall.cpp  |  30 +--
 .../deprecations/tst_qpromise_all.cpp         |  30 +--
 .../qtpromise/exceptions/tst_exceptions.cpp   |   6 +-
 tests/auto/qtpromise/future/tst_future.cpp    | 132 +++++-----
 tests/auto/qtpromise/helpers/tst_all.cpp      |  30 +--
 tests/auto/qtpromise/helpers/tst_attempt.cpp  |   9 +-
 tests/auto/qtpromise/helpers/tst_each.cpp     |  17 +-
 tests/auto/qtpromise/helpers/tst_filter.cpp   |  17 +-
 tests/auto/qtpromise/helpers/tst_map.cpp      |  15 +-
 tests/auto/qtpromise/helpers/tst_reduce.cpp   | 127 ++++++----
 tests/auto/qtpromise/helpers/tst_resolve.cpp  |  12 +-
 tests/auto/qtpromise/internals/tst_argsof.cpp |  99 ++++++--
 .../auto/qtpromise/qpromise/tst_construct.cpp |  55 ++--
 tests/auto/qtpromise/qpromise/tst_each.cpp    |  45 ++--
 tests/auto/qtpromise/qpromise/tst_fail.cpp    | 141 +++++++----
 tests/auto/qtpromise/qpromise/tst_filter.cpp  |  34 +--
 tests/auto/qtpromise/qpromise/tst_finally.cpp |   4 +-
 tests/auto/qtpromise/qpromise/tst_map.cpp     |  40 +--
 .../auto/qtpromise/qpromise/tst_operators.cpp |   4 +-
 tests/auto/qtpromise/qpromise/tst_reduce.cpp  | 120 +++++----
 tests/auto/qtpromise/qpromise/tst_tap.cpp     |   8 +-
 tests/auto/qtpromise/qpromise/tst_tapfail.cpp |  88 +++----
 tests/auto/qtpromise/qpromise/tst_then.cpp    | 119 +++++----
 tests/auto/qtpromise/qpromise/tst_timeout.cpp |  92 +++----
 .../requirements/tst_requirements.cpp         | 187 +++++++++-----
 tests/auto/qtpromise/shared/data.h            |  54 ++--
 tests/auto/qtpromise/shared/utils.h           |  55 ++--
 tests/auto/qtpromise/thread/tst_thread.cpp    |  94 ++++---
 40 files changed, 1534 insertions(+), 1223 deletions(-)
 create mode 100644 .clang-format

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..0260e14
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,66 @@
+---
+Language: Cpp
+Standard: Cpp11
+BasedOnStyle: WebKit
+AlignAfterOpenBracket: true
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortLambdasOnASingleLine: Empty
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+    AfterCaseLabel: false
+    AfterClass: true
+    AfterControlStatement: false
+    AfterEnum: false
+    AfterFunction: true
+    AfterNamespace: false
+    AfterStruct: true
+    AfterUnion: false
+    AfterExternBlock: false
+    BeforeCatch: false
+    BeforeElse: false
+    IndentBraces: false
+    SplitEmptyFunction: false
+    SplitEmptyRecord: false
+    SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakInheritanceList: BeforeComma
+BreakConstructorInitializers: BeforeColon
+ColumnLimit: 100
+CommentPragmas: "^!|^:"
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+Cpp11BracedListStyle: true
+FixNamespaceComments: true
+ForEachMacros:
+    - BOOST_FOREACH
+    - foreach
+    - forever
+    - Q_FOREACH
+    - Q_FOREVER
+    - QBENCHMARK
+    - QBENCHMARK_ONCE
+IncludeBlocks: Regroup
+IncludeCategories:
+    - Regex:         '^<Q.*>'
+      Priority:      2
+      SortPriority:  0
+    - Regex:         '^<.*\.h>'
+      Priority:      3
+      SortPriority:  0
+    - Regex:         '^<.*>'
+      Priority:      4
+      SortPriority:  0
+    - Regex:         '.*'
+      Priority:      1
+      SortPriority:  0
+IndentPPDirectives: AfterHash
+NamespaceIndentation: None
+PenaltyReturnTypeOnItsOwnLine: 10
+SpaceAfterTemplateKeyword: false
+SpaceBeforeCpp11BracedList: false
+...
diff --git a/src/qtpromise/qpromise.h b/src/qtpromise/qpromise.h
index 5c34ffd..6976b5d 100644
--- a/src/qtpromise/qpromise.h
+++ b/src/qtpromise/qpromise.h
@@ -19,27 +19,36 @@
 
 namespace QtPromise {
 
-template <typename T>
+template<typename T>
 class QPromiseBase
 {
 public:
     using Type = T;
 
-    template <typename F, typename std::enable_if<QtPromisePrivate::ArgsOf<F>::count == 1, int>::type = 0>
+    template<typename F,
+             typename std::enable_if<QtPromisePrivate::ArgsOf<F>::count == 1, int>::type = 0>
     inline QPromiseBase(F resolver);
 
-    template <typename F, typename std::enable_if<QtPromisePrivate::ArgsOf<F>::count == 2, int>::type = 0>
+    template<typename F,
+             typename std::enable_if<QtPromisePrivate::ArgsOf<F>::count == 2, int>::type = 0>
     inline QPromiseBase(F resolver);
 
-    QPromiseBase(const QPromiseBase<T>& other): m_d{other.m_d} {}
-    QPromiseBase(const QPromise<T>& other): m_d{other.m_d} {}
+    QPromiseBase(const QPromiseBase<T>& other) : m_d{other.m_d} { }
+    QPromiseBase(const QPromise<T>& other) : m_d{other.m_d} { }
     QPromiseBase(QPromiseBase<T>&& other) Q_DECL_NOEXCEPT { swap(other); }
 
     virtual ~QPromiseBase() { }
 
-    QPromiseBase<T>& operator=(const QPromiseBase<T>& other) { m_d = other.m_d; return *this;}
+    QPromiseBase<T>& operator=(const QPromiseBase<T>& other)
+    {
+        m_d = other.m_d;
+        return *this;
+    }
     QPromiseBase<T>& operator=(QPromiseBase<T>&& other) Q_DECL_NOEXCEPT
-    { QPromiseBase<T>(std::move(other)).swap(*this); return *this; }
+    {
+        QPromiseBase<T>(std::move(other)).swap(*this);
+        return *this;
+    }
 
     bool operator==(const QPromiseBase<T>& other) const { return (m_d == other.m_d); }
     bool operator!=(const QPromiseBase<T>& other) const { return (m_d != other.m_d); }
@@ -50,31 +59,31 @@ public:
     bool isRejected() const { return m_d->isRejected(); }
     bool isPending() const { return m_d->isPending(); }
 
-    template <typename TFulfilled, typename TRejected>
+    template<typename TFulfilled, typename TRejected>
     inline typename QtPromisePrivate::PromiseHandler<T, TFulfilled>::Promise
     then(const TFulfilled& fulfilled, const TRejected& rejected) const;
 
-    template <typename TFulfilled>
+    template<typename TFulfilled>
     inline typename QtPromisePrivate::PromiseHandler<T, TFulfilled>::Promise
     then(TFulfilled&& fulfilled) const;
 
-    template <typename TRejected>
+    template<typename TRejected>
     inline typename QtPromisePrivate::PromiseHandler<T, std::nullptr_t>::Promise
     fail(TRejected&& rejected) const;
 
-    template <typename THandler>
+    template<typename THandler>
     inline QPromise<T> finally(THandler handler) const;
 
-    template <typename THandler>
+    template<typename THandler>
     inline QPromise<T> tap(THandler handler) const;
 
-    template <typename THandler>
+    template<typename THandler>
     inline QPromise<T> tapFail(THandler handler) const;
 
-    template <typename E = QPromiseTimeoutException>
+    template<typename E = QPromiseTimeoutException>
     inline QPromise<T> timeout(int msec, E&& error = E{}) const;
 
-    template <typename E = QPromiseTimeoutException>
+    template<typename E = QPromiseTimeoutException>
     inline QPromise<T> timeout(std::chrono::milliseconds msec, E&& error = E{}) const;
 
     inline QPromise<T> delay(int msec) const;
@@ -83,7 +92,7 @@ public:
     inline QPromise<T> wait() const;
 
 public: // STATIC
-    template <typename E>
+    template<typename E>
     inline static QPromise<T> reject(E&& error);
 
 protected:
@@ -94,39 +103,35 @@ protected:
     QExplicitlySharedDataPointer<QtPromisePrivate::PromiseData<T>> m_d;
 };
 
-template <typename T>
+template<typename T>
 class QPromise : public QPromiseBase<T>
 {
 public:
-    template <typename F>
-    QPromise(F&& resolver): QPromiseBase<T>(std::forward<F>(resolver)) { }
+    template<typename F>
+    QPromise(F&& resolver) : QPromiseBase<T>(std::forward<F>(resolver))
+    { }
 
-    template <typename Functor>
-    inline QPromise<T>
-    each(Functor fn);
+    template<typename Functor>
+    inline QPromise<T> each(Functor fn);
 
-    template <typename Functor>
-    inline QPromise<T>
-    filter(Functor fn);
+    template<typename Functor>
+    inline QPromise<T> filter(Functor fn);
 
-    template <typename Functor>
-    inline typename QtPromisePrivate::PromiseMapper<T, Functor>::PromiseType
-    map(Functor fn);
+    template<typename Functor>
+    inline typename QtPromisePrivate::PromiseMapper<T, Functor>::PromiseType map(Functor fn);
 
-    template <typename Functor, typename Input>
-    inline typename QtPromisePrivate::PromiseDeduce<Input>::Type
-    reduce(Functor fn, Input initial);
+    template<typename Functor, typename Input>
+    inline typename QtPromisePrivate::PromiseDeduce<Input>::Type reduce(Functor fn, Input initial);
 
-    template <typename Functor, typename U = T>
+    template<typename Functor, typename U = T>
     inline typename QtPromisePrivate::PromiseDeduce<typename U::value_type>::Type
     reduce(Functor fn);
 
 public: // STATIC
-
     // DEPRECATED (remove at version 1)
-    template <template <typename, typename...> class Sequence = QVector, typename ...Args>
-    Q_DECL_DEPRECATED_X("Use QtPromise::all instead") static inline QPromise<QVector<T>>
-    all(const Sequence<QPromise<T>, Args...>& promises);
+    template<template<typename, typename...> class Sequence = QVector, typename... Args>
+    Q_DECL_DEPRECATED_X("Use QtPromise::all instead")
+    static inline QPromise<QVector<T>> all(const Sequence<QPromise<T>, Args...>& promises);
 
     inline static QPromise<T> resolve(const T& value);
     inline static QPromise<T> resolve(T&& value);
@@ -135,19 +140,19 @@ private:
     friend class QPromiseBase<T>;
 };
 
-template <>
+template<>
 class QPromise<void> : public QPromiseBase<void>
 {
 public:
-    template <typename F>
-    QPromise(F&& resolver): QPromiseBase<void>(std::forward<F>(resolver)) { }
+    template<typename F>
+    QPromise(F&& resolver) : QPromiseBase<void>(std::forward<F>(resolver))
+    { }
 
 public: // STATIC
-
     // DEPRECATED (remove at version 1)
-    template <template <typename, typename...> class Sequence = QVector, typename ...Args>
-    Q_DECL_DEPRECATED_X("Use QtPromise::all instead") static inline QPromise<void>
-    all(const Sequence<QPromise<void>, Args...>& promises);
+    template<template<typename, typename...> class Sequence = QVector, typename... Args>
+    Q_DECL_DEPRECATED_X("Use QtPromise::all instead")
+    static inline QPromise<void> all(const Sequence<QPromise<void>, Args...>& promises);
 
     inline static QPromise<void> resolve();
 
diff --git a/src/qtpromise/qpromise.inl b/src/qtpromise/qpromise.inl
index 2f70388..e541219 100644
--- a/src/qtpromise/qpromise.inl
+++ b/src/qtpromise/qpromise.inl
@@ -14,10 +14,9 @@
 
 namespace QtPromise {
 
-template <typename T>
-template <typename F, typename std::enable_if<QtPromisePrivate::ArgsOf<F>::count == 1, int>::type>
-inline QPromiseBase<T>::QPromiseBase(F callback)
-    : m_d{new QtPromisePrivate::PromiseData<T>{}}
+template<typename T>
+template<typename F, typename std::enable_if<QtPromisePrivate::ArgsOf<F>::count == 1, int>::type>
+inline QPromiseBase<T>::QPromiseBase(F callback) : m_d{new QtPromisePrivate::PromiseData<T>{}}
 {
     QtPromisePrivate::PromiseResolver<T> resolver{*this};
 
@@ -28,10 +27,9 @@ inline QPromiseBase<T>::QPromiseBase(F callback)
     }
 }
 
-template <typename T>
-template <typename F, typename std::enable_if<QtPromisePrivate::ArgsOf<F>::count == 2, int>::type>
-inline QPromiseBase<T>::QPromiseBase(F callback)
-    : m_d{new QtPromisePrivate::PromiseData<T>{}}
+template<typename T>
+template<typename F, typename std::enable_if<QtPromisePrivate::ArgsOf<F>::count == 2, int>::type>
+inline QPromiseBase<T>::QPromiseBase(F callback) : m_d{new QtPromisePrivate::PromiseData<T>{}}
 {
     QtPromisePrivate::PromiseResolver<T> resolver{*this};
 
@@ -42,17 +40,16 @@ inline QPromiseBase<T>::QPromiseBase(F callback)
     }
 }
 
-template <typename T>
-template <typename TFulfilled, typename TRejected>
+template<typename T>
+template<typename TFulfilled, typename TRejected>
 inline typename QtPromisePrivate::PromiseHandler<T, TFulfilled>::Promise
 QPromiseBase<T>::then(const TFulfilled& fulfilled, const TRejected& rejected) const
 {
     using namespace QtPromisePrivate;
     using PromiseType = typename PromiseHandler<T, TFulfilled>::Promise;
 
-    PromiseType next([&](
-        const QPromiseResolve<typename PromiseType::Type>& resolve,
-        const QPromiseReject<typename PromiseType::Type>& reject) {
+    PromiseType next([&](const QPromiseResolve<typename PromiseType::Type>& resolve,
+                         const QPromiseReject<typename PromiseType::Type>& reject) {
         m_d->addHandler(PromiseHandler<T, TFulfilled>::create(fulfilled, resolve, reject));
         m_d->addCatcher(PromiseCatcher<T, TRejected>::create(rejected, resolve, reject));
     });
@@ -64,24 +61,24 @@ QPromiseBase<T>::then(const TFulfilled& fulfilled, const TRejected& rejected) co
     return next;
 }
 
-template <typename T>
-template <typename TFulfilled>
+template<typename T>
+template<typename TFulfilled>
 inline typename QtPromisePrivate::PromiseHandler<T, TFulfilled>::Promise
 QPromiseBase<T>::then(TFulfilled&& fulfilled) const
 {
     return then(std::forward<TFulfilled>(fulfilled), nullptr);
 }
 
-template <typename T>
-template <typename TRejected>
+template<typename T>
+template<typename TRejected>
 inline typename QtPromisePrivate::PromiseHandler<T, std::nullptr_t>::Promise
 QPromiseBase<T>::fail(TRejected&& rejected) const
 {
     return then(nullptr, std::forward<TRejected>(rejected));
 }
 
-template <typename T>
-template <typename THandler>
+template<typename T>
+template<typename THandler>
 inline QPromise<T> QPromiseBase<T>::finally(THandler handler) const
 {
     QPromise<T> p = *this;
@@ -90,8 +87,8 @@ inline QPromise<T> QPromiseBase<T>::finally(THandler handler) const
     });
 }
 
-template <typename T>
-template <typename THandler>
+template<typename T>
+template<typename THandler>
 inline QPromise<T> QPromiseBase<T>::tap(THandler handler) const
 {
     QPromise<T> p = *this;
@@ -100,25 +97,22 @@ inline QPromise<T> QPromiseBase<T>::tap(THandler handler) const
     });
 }
 
-template <typename T>
-template <typename THandler>
+template<typename T>
+template<typename THandler>
 inline QPromise<T> QPromiseBase<T>::tapFail(THandler handler) const
 {
     QPromise<T> p = *this;
-    return p.then([](){}, handler).then([=]() {
+    return p.then([]() {}, handler).then([=]() {
         return p;
     });
 }
 
-template <typename T>
-template <typename E>
+template<typename T>
+template<typename E>
 inline QPromise<T> QPromiseBase<T>::timeout(int msec, E&& error) const
 {
     QPromise<T> p = *this;
-    return QPromise<T>{[&](
-        const QPromiseResolve<T>& resolve,
-        const QPromiseReject<T>& reject) {
-
+    return QPromise<T>{[&](const QPromiseResolve<T>& resolve, const QPromiseReject<T>& reject) {
         QTimer::singleShot(msec, [=]() {
             // we don't need to verify the current promise state, reject()
             // takes care of checking if the promise is already resolved,
@@ -130,14 +124,14 @@ inline QPromise<T> QPromiseBase<T>::timeout(int msec, E&& error) const
     }};
 }
 
-template <typename T>
-template <typename E>
+template<typename T>
+template<typename E>
 inline QPromise<T> QPromiseBase<T>::timeout(std::chrono::milliseconds msec, E&& error) const
 {
     return timeout(static_cast<int>(msec.count()), std::forward<E>(error));
 }
 
-template <typename T>
+template<typename T>
 inline QPromise<T> QPromiseBase<T>::delay(int msec) const
 {
     return tap([=]() {
@@ -153,7 +147,7 @@ inline QPromise<T> QPromiseBase<T>::delay(std::chrono::milliseconds msec) const
     return delay(static_cast<int>(msec.count()));
 }
 
-template <typename T>
+template<typename T>
 inline QPromise<T> QPromiseBase<T>::wait() const
 {
     // @TODO wait timeout + global timeout
@@ -165,8 +159,8 @@ inline QPromise<T> QPromiseBase<T>::wait() const
     return *this;
 }
 
-template <typename T>
-template <typename E>
+template<typename T>
+template<typename E>
 inline QPromise<T> QPromiseBase<T>::reject(E&& error)
 {
     return QPromise<T>{[&](const QPromiseResolve<T>&, const QPromiseReject<T>& reject) {
@@ -174,8 +168,8 @@ inline QPromise<T> QPromiseBase<T>::reject(E&& error)
     }};
 }
 
-template <typename T>
-template <typename Functor>
+template<typename T>
+template<typename Functor>
 inline QPromise<T> QPromise<T>::each(Functor fn)
 {
     return this->tap([=](const T& values) {
@@ -183,12 +177,10 @@ inline QPromise<T> QPromise<T>::each(Functor fn)
 
         std::vector<QPromise<void>> promises;
         for (const auto& v : values) {
-            promises.push_back(
-                QtPromise::attempt(fn, v, i)
-                    .then([]() {
-                        // Cast to void in case fn returns a non promise value.
-                        // TODO remove when implicit cast is implemented.
-                    }));
+            promises.push_back(QtPromise::attempt(fn, v, i).then([]() {
+                // Cast to void in case fn returns a non promise value.
+                // TODO remove when implicit cast is implemented.
+            }));
 
             i++;
         }
@@ -197,8 +189,8 @@ inline QPromise<T> QPromise<T>::each(Functor fn)
     });
 }
 
-template <typename T>
-template <typename Functor>
+template<typename T>
+template<typename Functor>
 inline QPromise<T> QPromise<T>::filter(Functor fn)
 {
     return this->then([=](const T& values) {
@@ -206,8 +198,8 @@ inline QPromise<T> QPromise<T>::filter(Functor fn)
     });
 }
 
-template <typename T>
-template <typename Functor>
+template<typename T>
+template<typename Functor>
 inline typename QtPromisePrivate::PromiseMapper<T, Functor>::PromiseType
 QPromise<T>::map(Functor fn)
 {
@@ -216,8 +208,8 @@ QPromise<T>::map(Functor fn)
     });
 }
 
-template <typename T>
-template <typename Functor, typename Input>
+template<typename T>
+template<typename Functor, typename Input>
 inline typename QtPromisePrivate::PromiseDeduce<Input>::Type
 QPromise<T>::reduce(Functor fn, Input initial)
 {
@@ -226,8 +218,8 @@ QPromise<T>::reduce(Functor fn, Input initial)
     });
 }
 
-template <typename T>
-template <typename Functor, typename U>
+template<typename T>
+template<typename Functor, typename U>
 inline typename QtPromisePrivate::PromiseDeduce<typename U::value_type>::Type
 QPromise<T>::reduce(Functor fn)
 {
@@ -236,30 +228,30 @@ QPromise<T>::reduce(Functor fn)
     });
 }
 
-template <typename T>
-template <template <typename, typename...> class Sequence, typename ...Args>
+template<typename T>
+template<template<typename, typename...> class Sequence, typename... Args>
 inline QPromise<QVector<T>> QPromise<T>::all(const Sequence<QPromise<T>, Args...>& promises)
 {
     return QtPromise::all(promises);
 }
 
-template <typename T>
+template<typename T>
 inline QPromise<T> QPromise<T>::resolve(const T& value)
 {
     return QPromise<T>{[&](const QPromiseResolve<T>& resolve) {
-       resolve(value);
+        resolve(value);
     }};
 }
 
-template <typename T>
+template<typename T>
 inline QPromise<T> QPromise<T>::resolve(T&& value)
 {
     return QPromise<T>{[&](const QPromiseResolve<T>& resolve) {
-       resolve(std::forward<T>(value));
+        resolve(std::forward<T>(value));
     }};
 }
 
-template <template <typename, typename...> class Sequence, typename ...Args>
+template<template<typename, typename...> class Sequence, typename... Args>
 inline QPromise<void> QPromise<void>::all(const Sequence<QPromise<void>, Args...>& promises)
 {
     return QtPromise::all(promises);
diff --git a/src/qtpromise/qpromise_p.h b/src/qtpromise/qpromise_p.h
index 3b73537..85710dd 100644
--- a/src/qtpromise/qpromise_p.h
+++ b/src/qtpromise/qpromise_p.h
@@ -21,13 +21,13 @@
 
 namespace QtPromise {
 
-template <typename T>
+template<typename T>
 class QPromise;
 
-template <typename T>
+template<typename T>
 class QPromiseResolve;
 
-template <typename T>
+template<typename T>
 class QPromiseReject;
 
 } // namespace QtPromise
@@ -35,7 +35,7 @@ class QPromiseReject;
 namespace QtPromisePrivate {
 
 // https://stackoverflow.com/a/21653558
-template <typename F>
+template<typename F>
 static void qtpromise_defer(F&& f, const QPointer<QThread>& thread)
 {
     using FType = typename std::decay<F>::type;
@@ -69,14 +69,14 @@ static void qtpromise_defer(F&& f, const QPointer<QThread>& thread)
     QCoreApplication::postEvent(target, new Event{std::forward<F>(f)});
 }
 
-template <typename F>
+template<typename F>
 static void qtpromise_defer(F&& f)
 {
     Q_ASSERT(QThread::currentThread());
     qtpromise_defer(std::forward<F>(f), QThread::currentThread());
 }
 
-template <typename T>
+template<typename T>
 class PromiseValue
 {
 public:
@@ -93,7 +93,7 @@ private:
 class PromiseError
 {
 public:
-    template <typename T>
+    template<typename T>
     PromiseError(const T& value)
     {
         try {
@@ -113,116 +113,110 @@ private:
     std::exception_ptr m_data;
 };
 
-template <typename T>
+template<typename T>
 struct PromiseDeduce
 {
     using Type = QtPromise::QPromise<T>;
 };
 
-template <typename T>
-struct PromiseDeduce<T&>
-    : public PromiseDeduce<T>
+template<typename T>
+struct PromiseDeduce<T&> : public PromiseDeduce<T>
 { };
 
-template <typename T>
-struct PromiseDeduce<const T>
-    : public PromiseDeduce<T>
+template<typename T>
+struct PromiseDeduce<const T> : public PromiseDeduce<T>
 { };
 
-template <typename T>
-struct PromiseDeduce<const volatile T>
-    : public PromiseDeduce<T>
+template<typename T>
+struct PromiseDeduce<const volatile T> : public PromiseDeduce<T>
 { };
 
-template <typename T>
-struct PromiseDeduce<QtPromise::QPromise<T>>
-    : public PromiseDeduce<T>
+template<typename T>
+struct PromiseDeduce<QtPromise::QPromise<T>> : public PromiseDeduce<T>
 { };
 
-template <typename Functor, typename... Args>
+template<typename Functor, typename... Args>
 struct PromiseFunctor
 {
     using ResultType = typename std::result_of<Functor(Args...)>::type;
     using PromiseType = typename PromiseDeduce<ResultType>::Type;
 };
 
-template <typename T>
+template<typename T>
 struct PromiseFulfill
 {
-    template <typename V, typename TResolve, typename TReject>
+    template<typename V, typename TResolve, typename TReject>
     static void call(V&& value, const TResolve& resolve, const TReject&)
     {
         resolve(std::forward<V>(value));
     }
 };
 
-template <typename T>
+template<typename T>
 struct PromiseFulfill<QtPromise::QPromise<T>>
 {
-    template <typename TResolve, typename TReject>
-    static void call(
-        const QtPromise::QPromise<T>& promise,
-        const TResolve& resolve,
-        const TReject& reject)
+    template<typename TResolve, typename TReject>
+    static void
+    call(const QtPromise::QPromise<T>& promise, const TResolve& resolve, const TReject& reject)
     {
         if (promise.isFulfilled()) {
             resolve(promise.m_d->value());
         } else if (promise.isRejected()) {
             reject(promise.m_d->error());
         } else {
-            promise.then([=]() {
-                resolve(promise.m_d->value());
-            }, [=]() { // catch all
-                reject(promise.m_d->error());
-            });
+            promise.then(
+                [=]() {
+                    resolve(promise.m_d->value());
+                },
+                [=]() { // catch all
+                    reject(promise.m_d->error());
+                });
         }
     }
 };
 
-template <>
+template<>
 struct PromiseFulfill<QtPromise::QPromise<void>>
 {
-    template <typename TPromise, typename TResolve, typename TReject>
-    static void call(
-        const TPromise& promise,
-        const TResolve& resolve,
-        const TReject& reject)
+    template<typename TPromise, typename TResolve, typename TReject>
+    static void call(const TPromise& promise, const TResolve& resolve, const TReject& reject)
     {
         if (promise.isFulfilled()) {
             resolve();
         } else if (promise.isRejected()) {
             reject(promise.m_d->error());
         } else {
-            promise.then([=]() {
-                resolve();
-            }, [=]() { // catch all
-                reject(promise.m_d->error());
-            });
+            promise.then(
+                [=]() {
+                    resolve();
+                },
+                [=]() { // catch all
+                    reject(promise.m_d->error());
+                });
         }
     }
 };
 
-template <typename Result>
+template<typename Result>
 struct PromiseDispatch
 {
-    template <typename Resolve, typename Reject, typename Functor, typename... Args>
+    template<typename Resolve, typename Reject, typename Functor, typename... Args>
     static void call(const Resolve& resolve, const Reject& reject, Functor fn, Args&&... args)
     {
         try {
-            PromiseFulfill<Unqualified<Result>>::call(
-                fn(std::forward<Args>(args)...),
-                resolve,
-                reject);
+            PromiseFulfill<Unqualified<Result>>::call(fn(std::forward<Args>(args)...),
+                                                      resolve,
+                                                      reject);
         } catch (...) {
             reject(std::current_exception());
         }
     }
 };
 
-template <>
+template<>
 struct PromiseDispatch<void>
 {
-    template <typename Resolve, typename Reject, typename Functor, typename... Args>
+    template<typename Resolve, typename Reject, typename Functor, typename... Args>
     static void call(const Resolve& resolve, const Reject& reject, Functor fn, Args&&... args)
     {
         try {
@@ -234,17 +228,15 @@ struct PromiseDispatch<void>
     }
 };
 
-template <typename T, typename THandler, typename TArg = typename ArgsOf<THandler>::first>
+template<typename T, typename THandler, typename TArg = typename ArgsOf<THandler>::first>
 struct PromiseHandler
 {
     using ResType = typename std::result_of<THandler(T)>::type;
     using Promise = typename PromiseDeduce<ResType>::Type;
 
-    template <typename TResolve, typename TReject>
-    static std::function<void(const T&)> create(
-        const THandler& handler,
-        const TResolve& resolve,
-        const TReject& reject)
+    template<typename TResolve, typename TReject>
+    static std::function<void(const T&)>
+    create(const THandler& handler, const TResolve& resolve, const TReject& reject)
     {
         return [=](const T& value) {
             PromiseDispatch<ResType>::call(resolve, reject, handler, value);
@@ -252,17 +244,15 @@ struct PromiseHandler
     }
 };
 
-template <typename T, typename THandler>
+template<typename T, typename THandler>
 struct PromiseHandler<T, THandler, void>
 {
     using ResType = typename std::result_of<THandler()>::type;
     using Promise = typename PromiseDeduce<ResType>::Type;
 
-    template <typename TResolve, typename TReject>
-    static std::function<void(const T&)> create(
-        const THandler& handler,
-        const TResolve& resolve,
-        const TReject& reject)
+    template<typename TResolve, typename TReject>
+    static std::function<void(const T&)>
+    create(const THandler& handler, const TResolve& resolve, const TReject& reject)
     {
         return [=](const T&) {
             PromiseDispatch<ResType>::call(resolve, reject, handler);
@@ -270,17 +260,15 @@ struct PromiseHandler<T, THandler, void>
     }
 };
 
-template <typename THandler>
+template<typename THandler>
 struct PromiseHandler<void, THandler, void>
 {
     using ResType = typename std::result_of<THandler()>::type;
     using Promise = typename PromiseDeduce<ResType>::Type;
 
-    template <typename TResolve, typename TReject>
-    static std::function<void()> create(
-        const THandler& handler,
-        const TResolve& resolve,
-        const TReject& reject)
+    template<typename TResolve, typename TReject>
+    static std::function<void()>
+    create(const THandler& handler, const TResolve& resolve, const TReject& reject)
     {
         return [=]() {
             PromiseDispatch<ResType>::call(resolve, reject, handler);
@@ -288,16 +276,14 @@ struct PromiseHandler<void, THandler, void>
     }
 };
 
-template <typename T>
+template<typename T>
 struct PromiseHandler<T, std::nullptr_t, void>
 {
     using Promise = QtPromise::QPromise<T>;
 
-    template <typename TResolve, typename TReject>
-    static std::function<void(const T&)> create(
-        std::nullptr_t,
-        const TResolve& resolve,
-        const TReject& reject)
+    template<typename TResolve, typename TReject>
+    static std::function<void(const T&)>
+    create(std::nullptr_t, const TResolve& resolve, const TReject& reject)
     {
         return [=](const T& value) {
             // 2.2.7.3. If onFulfilled is not a function and promise1 is fulfilled,
@@ -307,16 +293,13 @@ struct PromiseHandler<T, std::nullptr_t, void>
     }
 };
 
-template <>
+template<>
 struct PromiseHandler<void, std::nullptr_t, void>
 {
     using Promise = QtPromise::QPromise<void>;
 
-    template <typename TResolve, typename TReject>
-    static std::function<void()> create(
-        std::nullptr_t,
-        const TResolve& resolve,
-        const TReject&)
+    template<typename TResolve, typename TReject>
+    static std::function<void()> create(std::nullptr_t, const TResolve& resolve, const TReject&)
     {
         return [=]() {
             // 2.2.7.3. If onFulfilled is not a function and promise1 is fulfilled,
@@ -326,16 +309,14 @@ struct PromiseHandler<void, std::nullptr_t, void>
     }
 };
 
-template <typename T, typename THandler, typename TArg = typename ArgsOf<THandler>::first>
+template<typename T, typename THandler, typename TArg = typename ArgsOf<THandler>::first>
 struct PromiseCatcher
 {
     using ResType = typename std::result_of<THandler(TArg)>::type;
 
-    template <typename TResolve, typename TReject>
-    static std::function<void(const PromiseError&)> create(
-        const THandler& handler,
-        const TResolve& resolve,
-        const TReject& reject)
+    template<typename TResolve, typename TReject>
+    static std::function<void(const PromiseError&)>
+    create(const THandler& handler, const TResolve& resolve, const TReject& reject)
     {
         return [=](const PromiseError& error) {
             try {
@@ -349,16 +330,14 @@ struct PromiseCatcher
     }
 };
 
-template <typename T, typename THandler>
+template<typename T, typename THandler>
 struct PromiseCatcher<T, THandler, void>
 {
     using ResType = typename std::result_of<THandler()>::type;
 
-    template <typename TResolve, typename TReject>
-    static std::function<void(const PromiseError&)> create(
-        const THandler& handler,
-        const TResolve& resolve,
-        const TReject& reject)
+    template<typename TResolve, typename TReject>
+    static std::function<void(const PromiseError&)>
+    create(const THandler& handler, const TResolve& resolve, const TReject& reject)
     {
         return [=](const PromiseError& error) {
             try {
@@ -370,14 +349,12 @@ struct PromiseCatcher<T, THandler, void>
     }
 };
 
-template <typename T>
+template<typename T>
 struct PromiseCatcher<T, std::nullptr_t, void>
 {
-    template <typename TResolve, typename TReject>
-    static std::function<void(const PromiseError&)> create(
-        std::nullptr_t,
-        const TResolve&,
-        const TReject& reject)
+    template<typename TResolve, typename TReject>
+    static std::function<void(const PromiseError&)>
+    create(std::nullptr_t, const TResolve&, const TReject& reject)
     {
         return [=](const PromiseError& error) {
             // 2.2.7.4. If onRejected is not a function and promise1 is rejected,
@@ -387,11 +364,11 @@ struct PromiseCatcher<T, std::nullptr_t, void>
     }
 };
 
-template <typename T, typename F>
+template<typename T, typename F>
 struct PromiseMapper
 { };
 
-template <typename T, typename F, template <typename, typename...> class Sequence, typename ...Args>
+template<typename T, typename F, template<typename, typename...> class Sequence, typename... Args>
 struct PromiseMapper<Sequence<T, Args...>, F>
 {
     using ReturnType = typename std::result_of<F(T, int)>::type;
@@ -399,26 +376,20 @@ struct PromiseMapper<Sequence<T, Args...>, F>
     using PromiseType = QtPromise::QPromise<ResultType>;
 };
 
-template <typename T> class PromiseData;
+template<typename T>
+class PromiseData;
 
-template <typename T, typename F>
+template<typename T, typename F>
 class PromiseDataBase : public QSharedData
 {
 public:
     using Handler = std::pair<QPointer<QThread>, std::function<F>>;
     using Catcher = std::pair<QPointer<QThread>, std::function<void(const PromiseError&)>>;
 
-    virtual ~PromiseDataBase() {}
+    virtual ~PromiseDataBase() { }
 
-    bool isFulfilled() const
-    {
-        return !isPending() && m_error.isNull();
-    }
-
-    bool isRejected() const
-    {
-        return !isPending() && !m_error.isNull();
-    }
+    bool isFulfilled() const { return !isPending() && m_error.isNull(); }
+    bool isRejected() const { return !isPending() && !m_error.isNull(); }
 
     bool isPending() const
     {
@@ -438,7 +409,7 @@ public:
         m_catchers.append({QThread::currentThread(), std::move(catcher)});
     }
 
-    template <typename E>
+    template<typename E>
     void reject(E&& error)
     {
         Q_ASSERT(isPending());
@@ -479,11 +450,13 @@ public:
         PromiseError error = m_error;
         Q_ASSERT(!error.isNull());
 
-        for (const auto& catcher: catchers) {
+        for (const auto& catcher : catchers) {
             const auto& fn = catcher.second;
-            qtpromise_defer([=]() {
-                fn(error);
-            }, catcher.first);
+            qtpromise_defer(
+                [=]() {
+                    fn(error);
+                },
+                catcher.first);
         }
     }
 
@@ -506,13 +479,13 @@ private:
     PromiseError m_error;
 };
 
-template <typename T>
+template<typename T>
 class PromiseData : public PromiseDataBase<T, void(const T&)>
 {
     using Handler = typename PromiseDataBase<T, void(const T&)>::Handler;
 
 public:
-    template <typename V>
+    template<typename V>
     void resolve(V&& value)
     {
         Q_ASSERT(this->isPending());
@@ -532,11 +505,13 @@ public:
         PromiseValue<T> value = m_value;
         Q_ASSERT(!value.isNull());
 
-        for (const auto& handler: handlers) {
+        for (const auto& handler : handlers) {
             const auto& fn = handler.second;
-            qtpromise_defer([=]() {
-                fn(value.data());
-            }, handler.first);
+            qtpromise_defer(
+                [=]() {
+                    fn(value.data());
+                },
+                handler.first);
         }
     }
 
@@ -544,21 +519,18 @@ private:
     PromiseValue<T> m_value;
 };
 
-template <>
+template<>
 class PromiseData<void> : public PromiseDataBase<void, void()>
 {
     using Handler = PromiseDataBase<void, void()>::Handler;
 
 public:
-    void resolve()
-    {
-        setSettled();
-    }
+    void resolve() { setSettled(); }
 
 protected:
     void notify(const QVector<Handler>& handlers) Q_DECL_OVERRIDE
     {
-        for (const auto& handler: handlers) {
+        for (const auto& handler : handlers) {
             qtpromise_defer(handler.second, handler.first);
         }
     }
@@ -566,7 +538,7 @@ protected:
 
 struct PromiseInspect
 {
-    template <typename T>
+    template<typename T>
     static inline PromiseData<T>* get(const QtPromise::QPromise<T>& p)
     {
         return p.m_d.data();
diff --git a/src/qtpromise/qpromiseconnections.h b/src/qtpromise/qpromiseconnections.h
index ecc7510..fe0e009 100644
--- a/src/qtpromise/qpromiseconnections.h
+++ b/src/qtpromise/qpromiseconnections.h
@@ -31,15 +31,17 @@ private:
     {
         QVector<QMetaObject::Connection> connections;
 
-        ~Data() {
+        ~Data()
+        {
             if (!connections.empty()) {
                 qWarning("QPromiseConnections: destroyed with unhandled connections.");
                 disconnect();
             }
         }
 
-        void disconnect() {
-            for (const auto& connection: connections) {
+        void disconnect()
+        {
+            for (const auto& connection : connections) {
                 QObject::disconnect(connection);
             }
             connections.clear();
diff --git a/src/qtpromise/qpromisefuture.h b/src/qtpromise/qpromisefuture.h
index 9272b3d..03bfee4 100644
--- a/src/qtpromise/qpromisefuture.h
+++ b/src/qtpromise/qpromisefuture.h
@@ -15,18 +15,16 @@
 
 namespace QtPromisePrivate {
 
-template <typename T>
-struct PromiseDeduce<QFuture<T>>
-    : public PromiseDeduce<T>
+template<typename T>
+struct PromiseDeduce<QFuture<T>> : public PromiseDeduce<T>
 { };
 
-template <typename T>
+template<typename T>
 struct PromiseFulfill<QFuture<T>>
 {
-    static void call(
-        const QFuture<T>& future,
-        const QtPromise::QPromiseResolve<T>& resolve,
-        const QtPromise::QPromiseReject<T>& reject)
+    static void call(const QFuture<T>& future,
+                     const QtPromise::QPromiseResolve<T>& resolve,
+                     const QtPromise::QPromiseReject<T>& reject)
     {
         using Watcher = QFutureWatcher<T>;
 
@@ -55,13 +53,12 @@ struct PromiseFulfill<QFuture<T>>
     }
 };
 
-template <>
+template<>
 struct PromiseFulfill<QFuture<void>>
 {
-    static void call(
-        const QFuture<void>& future,
-        const QtPromise::QPromiseResolve<void>& resolve,
-        const QtPromise::QPromiseReject<void>& reject)
+    static void call(const QFuture<void>& future,
+                     const QtPromise::QPromiseResolve<void>& resolve,
+                     const QtPromise::QPromiseReject<void>& reject)
     {
         using Watcher = QFutureWatcher<void>;
 
diff --git a/src/qtpromise/qpromiseglobal.h b/src/qtpromise/qpromiseglobal.h
index d7cc074..680eac6 100644
--- a/src/qtpromise/qpromiseglobal.h
+++ b/src/qtpromise/qpromiseglobal.h
@@ -13,21 +13,25 @@
 #include <array>
 #include <functional>
 
-namespace QtPromisePrivate
-{
+namespace QtPromisePrivate {
+
 // https://rmf.io/cxx11/even-more-traits#unqualified_types
-template <typename T>
+template<typename T>
 using Unqualified = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
 
 /*!
  * \struct HasCallOperator
  * http://stackoverflow.com/a/5117641
  */
-template <typename T>
+template<typename T>
 struct HasCallOperator
 {
-    template <typename U> static char check(decltype(&U::operator(), char(0)));
-    template <typename U> static char (&check(...))[2];
+    template<typename U>
+    static char check(decltype(&U::operator(), char(0)));
+
+    template<typename U>
+    static char (&check(...))[2];
+
     static const bool value = (sizeof(check<T>(0)) == 1);
 };
 
@@ -36,7 +40,7 @@ struct HasCallOperator
  * http://stackoverflow.com/a/7943765
  * http://stackoverflow.com/a/27885283
  */
-template <typename... Args>
+template<typename... Args>
 struct ArgsTraits
 {
     using types = std::tuple<Args...>;
@@ -44,7 +48,7 @@ struct ArgsTraits
     static const size_t count = std::tuple_size<types>::value;
 };
 
-template <>
+template<>
 struct ArgsTraits<>
 {
     using types = std::tuple<>;
@@ -53,56 +57,56 @@ struct ArgsTraits<>
 };
 
 // Fallback implementation (type not supported).
-template <typename T, typename Enabled = void>
+template<typename T, typename Enabled = void>
 struct ArgsOf
 { };
 
 // Partial specialization for null function.
-template <>
+template<>
 struct ArgsOf<std::nullptr_t> : public ArgsTraits<>
 { };
 
 // Partial specialization for type with a non-overloaded operator().
 // This applies to lambda, std::function but not to std::bind result.
-template <typename T>
+template<typename T>
 struct ArgsOf<T, typename std::enable_if<HasCallOperator<T>::value>::type>
     : public ArgsOf<decltype(&T::operator())>
 { };
 
 // Partial specialization to remove reference and rvalue (e.g. lambda, std::function, etc.).
-template <typename T>
+template<typename T>
 struct ArgsOf<T&> : public ArgsOf<T>
 { };
 
-template <typename T>
+template<typename T>
 struct ArgsOf<T&&> : public ArgsOf<T>
 { };
 
 // Partial specialization for function type.
-template <typename R, typename... Args>
+template<typename R, typename... Args>
 struct ArgsOf<R(Args...)> : public ArgsTraits<Args...>
 { };
 
 // Partial specialization for function pointer.
-template <typename R, typename... Args>
-struct ArgsOf<R(*)(Args...)> : public ArgsTraits<Args...>
+template<typename R, typename... Args>
+struct ArgsOf<R (*)(Args...)> : public ArgsTraits<Args...>
 { };
 
 // Partial specialization for pointer-to-member-function (i.e. operator()'s).
-template <typename R, typename T, typename... Args>
-struct ArgsOf<R(T::*)(Args...)> : public ArgsTraits<Args...>
+template<typename R, typename T, typename... Args>
+struct ArgsOf<R (T::*)(Args...)> : public ArgsTraits<Args...>
 { };
 
-template <typename R, typename T, typename... Args>
-struct ArgsOf<R(T::*)(Args...) const> : public ArgsTraits<Args...>
+template<typename R, typename T, typename... Args>
+struct ArgsOf<R (T::*)(Args...) const> : public ArgsTraits<Args...>
 { };
 
-template <typename R, typename T, typename... Args>
-struct ArgsOf<R(T::*)(Args...) volatile> : public ArgsTraits<Args...>
+template<typename R, typename T, typename... Args>
+struct ArgsOf<R (T::*)(Args...) volatile> : public ArgsTraits<Args...>
 { };
 
-template <typename R, typename T, typename... Args>
-struct ArgsOf<R(T::*)(Args...) const volatile> : public ArgsTraits<Args...>
+template<typename R, typename T, typename... Args>
+struct ArgsOf<R (T::*)(Args...) const volatile> : public ArgsTraits<Args...>
 { };
 
 } // namespace QtPromisePrivate
diff --git a/src/qtpromise/qpromisehelpers.h b/src/qtpromise/qpromisehelpers.h
index 652abd2..7b9ddf0 100644
--- a/src/qtpromise/qpromisehelpers.h
+++ b/src/qtpromise/qpromisehelpers.h
@@ -13,9 +13,8 @@
 
 namespace QtPromise {
 
-template <typename T>
-static inline typename QtPromisePrivate::PromiseDeduce<T>::Type
-resolve(T&& value)
+template<typename T>
+static inline typename QtPromisePrivate::PromiseDeduce<T>::Type resolve(T&& value)
 {
     using namespace QtPromisePrivate;
     using PromiseType = typename PromiseDeduce<T>::Type;
@@ -24,94 +23,89 @@ resolve(T&& value)
     using RejectType = QPromiseReject<ValueType>;
 
     return PromiseType{[&](ResolveType&& resolve, RejectType&& reject) {
-        PromiseFulfill<Unqualified<T>>::call(
-            std::forward<T>(value),
-            std::forward<ResolveType>(resolve),
-            std::forward<RejectType>(reject));
+        PromiseFulfill<Unqualified<T>>::call(std::forward<T>(value),
+                                             std::forward<ResolveType>(resolve),
+                                             std::forward<RejectType>(reject));
     }};
 }
 
-template <typename T>
-static inline QPromise<T>
-resolve(QPromise<T> value)
+template<typename T>
+static inline QPromise<T> resolve(QPromise<T> value)
 {
     return std::move(value);
 }
 
-static inline QPromise<void>
-resolve()
+static inline QPromise<void> resolve()
 {
     return QPromise<void>{[](const QPromiseResolve<void>& resolve) {
         resolve();
     }};
 }
 
-template <typename T, template <typename, typename...> class Sequence = QVector, typename ...Args>
-static inline QPromise<QVector<T>>
-all(const Sequence<QPromise<T>, Args...>& promises)
+template<typename T, template<typename, typename...> class Sequence = QVector, typename... Args>
+static inline QPromise<QVector<T>> all(const Sequence<QPromise<T>, Args...>& promises)
 {
     const int count = static_cast<int>(promises.size());
     if (count == 0) {
         return QtPromise::resolve(QVector<T>{});
     }
 
-    return QPromise<QVector<T>>{[=](
-        const QPromiseResolve<QVector<T>>& resolve,
-        const QPromiseReject<QVector<T>>& reject) {
+    return QPromise<QVector<T>>{
+        [=](const QPromiseResolve<QVector<T>>& resolve, const QPromiseReject<QVector<T>>& reject) {
+            auto remaining = QSharedPointer<int>::create(count);
+            auto results = QSharedPointer<QVector<T>>::create(count);
 
-        auto remaining = QSharedPointer<int>::create(count);
-        auto results = QSharedPointer<QVector<T>>::create(count);
+            int i = 0;
+            for (const auto& promise : promises) {
+                promise.then(
+                    [=](const T& res) mutable {
+                        (*results)[i] = res;
+                        if (--(*remaining) == 0) {
+                            resolve(*results);
+                        }
+                    },
+                    [=]() mutable {
+                        if (*remaining != -1) {
+                            *remaining = -1;
+                            reject(std::current_exception());
+                        }
+                    });
 
-        int i = 0;
-        for (const auto& promise: promises) {
-            promise.then([=](const T& res) mutable {
-                (*results)[i] = res;
-                if (--(*remaining) == 0) {
-                    resolve(*results);
-                }
-            }, [=]() mutable {
-                if (*remaining != -1) {
-                    *remaining = -1;
-                    reject(std::current_exception());
-                }
-            });
-
-            i++;
-        }
-    }};
+                i++;
+            }
+        }};
 }
 
-template <template <typename, typename...> class Sequence = QVector, typename ...Args>
-static inline QPromise<void>
-all(const Sequence<QPromise<void>, Args...>& promises)
+template<template<typename, typename...> class Sequence = QVector, typename... Args>
+static inline QPromise<void> all(const Sequence<QPromise<void>, Args...>& promises)
 {
     const int count = static_cast<int>(promises.size());
     if (count == 0) {
         return QtPromise::resolve();
     }
 
-    return QPromise<void>{[=](
-        const QPromiseResolve<void>& resolve,
-        const QPromiseReject<void>& reject) {
+    return QPromise<void>{
+        [=](const QPromiseResolve<void>& resolve, const QPromiseReject<void>& reject) {
+            auto remaining = QSharedPointer<int>::create(count);
 
-        auto remaining = QSharedPointer<int>::create(count);
-
-        for (const auto& promise: promises) {
-            promise.then([=]() {
-                if (--(*remaining) == 0) {
-                    resolve();
-                }
-            }, [=]() {
-                if (*remaining != -1) {
-                    *remaining = -1;
-                    reject(std::current_exception());
-                }
-            });
-        }
-    }};
+            for (const auto& promise : promises) {
+                promise.then(
+                    [=]() {
+                        if (--(*remaining) == 0) {
+                            resolve();
+                        }
+                    },
+                    [=]() {
+                        if (*remaining != -1) {
+                            *remaining = -1;
+                            reject(std::current_exception());
+                        }
+                    });
+            }
+        }};
 }
 
-template <typename Functor, typename... Args>
+template<typename Functor, typename... Args>
 static inline typename QtPromisePrivate::PromiseFunctor<Functor, Args...>::PromiseType
 attempt(Functor&& fn, Args&&... args)
 {
@@ -127,62 +121,57 @@ attempt(Functor&& fn, Args&&... args)
     using ResolveType = QPromiseResolve<ValueType>;
     using RejectType = QPromiseReject<ValueType>;
 
-    return PromiseType{
-        [&](ResolveType&& resolve, RejectType&& reject) {
-            PromiseDispatch<typename FunctorType::ResultType>::call(
-                std::forward<ResolveType>(resolve),
-                std::forward<RejectType>(reject),
-                std::forward<Functor>(fn),
-                std::forward<Args>(args)...);
-        }};
+    return PromiseType{[&](ResolveType&& resolve, RejectType&& reject) {
+        PromiseDispatch<typename FunctorType::ResultType>::call(std::forward<ResolveType>(resolve),
+                                                                std::forward<RejectType>(reject),
+                                                                std::forward<Functor>(fn),
+                                                                std::forward<Args>(args)...);
+    }};
 }
 
-template <typename Sender, typename Signal>
+template<typename Sender, typename Signal>
 static inline typename QtPromisePrivate::PromiseFromSignal<Signal>
 connect(const Sender* sender, Signal signal)
 {
     using namespace QtPromisePrivate;
     using T = typename PromiseFromSignal<Signal>::Type;
 
-    return QPromise<T>{
-        [&](const QPromiseResolve<T>& resolve, const QPromiseReject<T>& reject) {
-            QPromiseConnections connections;
-            connectSignalToResolver(connections, resolve, sender, signal);
-            connectDestroyedToReject(connections, reject, sender);
-        }};
+    return QPromise<T>{[&](const QPromiseResolve<T>& resolve, const QPromiseReject<T>& reject) {
+        QPromiseConnections connections;
+        connectSignalToResolver(connections, resolve, sender, signal);
+        connectDestroyedToReject(connections, reject, sender);
+    }};
 }
 
-template <typename FSender, typename FSignal, typename RSender, typename RSignal>
+template<typename FSender, typename FSignal, typename RSender, typename RSignal>
 static inline typename QtPromisePrivate::PromiseFromSignal<FSignal>
 connect(const FSender* fsender, FSignal fsignal, const RSender* rsender, RSignal rsignal)
 {
     using namespace QtPromisePrivate;
     using T = typename PromiseFromSignal<FSignal>::Type;
 
-    return QPromise<T>{
-        [&](const QPromiseResolve<T>& resolve, const QPromiseReject<T>& reject) {
-            QPromiseConnections connections;
-            connectSignalToResolver(connections, resolve, fsender, fsignal);
-            connectSignalToResolver(connections, reject, rsender, rsignal);
-            connectDestroyedToReject(connections, reject, fsender);
-        }};
+    return QPromise<T>{[&](const QPromiseResolve<T>& resolve, const QPromiseReject<T>& reject) {
+        QPromiseConnections connections;
+        connectSignalToResolver(connections, resolve, fsender, fsignal);
+        connectSignalToResolver(connections, reject, rsender, rsignal);
+        connectDestroyedToReject(connections, reject, fsender);
+    }};
 }
 
-template <typename Sender, typename FSignal, typename RSignal>
+template<typename Sender, typename FSignal, typename RSignal>
 static inline typename QtPromisePrivate::PromiseFromSignal<FSignal>
 connect(const Sender* sender, FSignal fsignal, RSignal rsignal)
 {
     return connect(sender, fsignal, sender, rsignal);
 }
 
-template <typename Sequence, typename Functor>
-static inline QPromise<Sequence>
-each(const Sequence& values, Functor&& fn)
+template<typename Sequence, typename Functor>
+static inline QPromise<Sequence> each(const Sequence& values, Functor&& fn)
 {
     return QPromise<Sequence>::resolve(values).each(std::forward<Functor>(fn));
 }
 
-template <typename Sequence, typename Functor>
+template<typename Sequence, typename Functor>
 static inline typename QtPromisePrivate::PromiseMapper<Sequence, Functor>::PromiseType
 map(const Sequence& values, Functor fn)
 {
@@ -195,9 +184,8 @@ map(const Sequence& values, Functor fn)
 
     std::vector<QPromise<ResType>> promises;
     for (const auto& v : values) {
-        promises.push_back(QPromise<ResType>{[&](
-            const QPromiseResolve<ResType>& resolve,
-            const QPromiseReject<ResType>& reject) {
+        promises.push_back(QPromise<ResType>{
+            [&](const QPromiseResolve<ResType>& resolve, const QPromiseReject<ResType>& reject) {
                 PromiseFulfill<RetType>::call(fn(v, i), resolve, reject);
             }});
 
@@ -207,28 +195,30 @@ map(const Sequence& values, Functor fn)
     return QtPromise::all(promises);
 }
 
-template <typename Sequence, typename Functor>
-static inline QPromise<Sequence>
-filter(const Sequence& values, Functor fn)
+template<typename Sequence, typename Functor>
+static inline QPromise<Sequence> filter(const Sequence& values, Functor fn)
 {
-    return QtPromise::map(values, fn)
-        .then([=](const QVector<bool>& filters) {
-            Sequence filtered;
+    return QtPromise::map(values, fn).then([=](const QVector<bool>& filters) {
+        Sequence filtered;
 
-            auto filter = filters.begin();
-            for (auto& value : values) {
-                if (*filter) {
-                    filtered.push_back(std::move(value));
-                }
-
-                filter++;
+        auto filter = filters.begin();
+        for (auto& value : values) {
+            if (*filter) {
+                filtered.push_back(std::move(value));
             }
 
-            return filtered;
-        });
+            filter++;
+        }
+
+        return filtered;
+    });
 }
 
-template <typename T, template <typename...> class Sequence = QVector, typename Reducer, typename Input, typename ...Args>
+template<typename T,
+         template<typename...> class Sequence = QVector,
+         typename Reducer,
+         typename Input,
+         typename... Args>
 static inline typename QtPromisePrivate::PromiseDeduce<Input>::Type
 reduce(const Sequence<T, Args...>& values, Reducer fn, Input initial)
 {
@@ -253,7 +243,10 @@ reduce(const Sequence<T, Args...>& values, Reducer fn, Input initial)
     return promise;
 }
 
-template <typename T, template <typename...> class Sequence = QVector, typename Reducer, typename ...Args>
+template<typename T,
+         template<typename...> class Sequence = QVector,
+         typename Reducer,
+         typename... Args>
 static inline typename QtPromisePrivate::PromiseDeduce<T>::Type
 reduce(const Sequence<T, Args...>& values, Reducer fn)
 {
@@ -283,19 +276,17 @@ reduce(const Sequence<T, Args...>& values, Reducer fn)
 
 // DEPRECATIONS (remove at version 1)
 
-template <typename... Args>
+template<typename... Args>
 Q_DECL_DEPRECATED_X("Use QtPromise::resolve instead")
-static inline auto
-qPromise(Args&&... args)
+static inline auto qPromise(Args&&... args)
     -> decltype(QtPromise::resolve(std::forward<Args>(args)...))
 {
     return QtPromise::resolve(std::forward<Args>(args)...);
 }
 
-template <typename... Args>
+template<typename... Args>
 Q_DECL_DEPRECATED_X("Use QtPromise::all instead")
-static inline auto
-qPromiseAll(Args&&... args)
+static inline auto qPromiseAll(Args&&... args)
     -> decltype(QtPromise::all(std::forward<Args>(args)...))
 {
     return QtPromise::all(std::forward<Args>(args)...);
diff --git a/src/qtpromise/qpromisehelpers_p.h b/src/qtpromise/qpromisehelpers_p.h
index cd2a544..9090cba 100644
--- a/src/qtpromise/qpromisehelpers_p.h
+++ b/src/qtpromise/qpromisehelpers_p.h
@@ -16,17 +16,16 @@ namespace QtPromisePrivate {
 // TODO: Suppress QPrivateSignal trailing private signal args
 // TODO: Support deducing tuple from args (might require MSVC2017)
 
-template <typename Signal>
+template<typename Signal>
 using PromiseFromSignal = typename QtPromise::QPromise<Unqualified<typename ArgsOf<Signal>::first>>;
 
 // Connect signal() to QPromiseResolve
-template <typename Sender, typename Signal>
+template<typename Sender, typename Signal>
 typename std::enable_if<(ArgsOf<Signal>::count == 0)>::type
-connectSignalToResolver(
-    const QtPromise::QPromiseConnections& connections,
-    const QtPromise::QPromiseResolve<void>& resolve,
-    const Sender* sender,
-    Signal signal)
+connectSignalToResolver(const QtPromise::QPromiseConnections& connections,
+                        const QtPromise::QPromiseResolve<void>& resolve,
+                        const Sender* sender,
+                        Signal signal)
 {
     connections << QObject::connect(sender, signal, [=]() {
         connections.disconnect();
@@ -35,13 +34,12 @@ connectSignalToResolver(
 }
 
 // Connect signal() to QPromiseReject
-template <typename T, typename Sender, typename Signal>
+template<typename T, typename Sender, typename Signal>
 typename std::enable_if<(ArgsOf<Signal>::count == 0)>::type
-connectSignalToResolver(
-    const QtPromise::QPromiseConnections& connections,
-    const QtPromise::QPromiseReject<T>& reject,
-    const Sender* sender,
-    Signal signal)
+connectSignalToResolver(const QtPromise::QPromiseConnections& connections,
+                        const QtPromise::QPromiseReject<T>& reject,
+                        const Sender* sender,
+                        Signal signal)
 {
     connections << QObject::connect(sender, signal, [=]() {
         connections.disconnect();
@@ -50,13 +48,12 @@ connectSignalToResolver(
 }
 
 // Connect signal(args...) to QPromiseResolve
-template <typename T, typename Sender, typename Signal>
+template<typename T, typename Sender, typename Signal>
 typename std::enable_if<(ArgsOf<Signal>::count >= 1)>::type
-connectSignalToResolver(
-    const QtPromise::QPromiseConnections& connections,
-    const QtPromise::QPromiseResolve<T>& resolve,
-    const Sender* sender,
-    Signal signal)
+connectSignalToResolver(const QtPromise::QPromiseConnections& connections,
+                        const QtPromise::QPromiseResolve<T>& resolve,
+                        const Sender* sender,
+                        Signal signal)
 {
     connections << QObject::connect(sender, signal, [=](const T& value) {
         connections.disconnect();
@@ -65,13 +62,12 @@ connectSignalToResolver(
 }
 
 // Connect signal(args...) to QPromiseReject
-template <typename T, typename Sender, typename Signal>
+template<typename T, typename Sender, typename Signal>
 typename std::enable_if<(ArgsOf<Signal>::count >= 1)>::type
-connectSignalToResolver(
-    const QtPromise::QPromiseConnections& connections,
-    const QtPromise::QPromiseReject<T>& reject,
-    const Sender* sender,
-    Signal signal)
+connectSignalToResolver(const QtPromise::QPromiseConnections& connections,
+                        const QtPromise::QPromiseReject<T>& reject,
+                        const Sender* sender,
+                        Signal signal)
 {
     using V = Unqualified<typename ArgsOf<Signal>::first>;
     connections << QObject::connect(sender, signal, [=](const V& value) {
@@ -81,11 +77,10 @@ connectSignalToResolver(
 }
 
 // Connect QObject::destroyed signal to QPromiseReject
-template <typename T, typename Sender>
-void connectDestroyedToReject(
-    const QtPromise::QPromiseConnections& connections,
-    const QtPromise::QPromiseReject<T>& reject,
-    const Sender* sender)
+template<typename T, typename Sender>
+void connectDestroyedToReject(const QtPromise::QPromiseConnections& connections,
+                              const QtPromise::QPromiseReject<T>& reject,
+                              const Sender* sender)
 {
     connections << QObject::connect(sender, &QObject::destroyed, [=]() {
         connections.disconnect();
diff --git a/src/qtpromise/qpromiseresolver.h b/src/qtpromise/qpromiseresolver.h
index db230d5..4521137 100644
--- a/src/qtpromise/qpromiseresolver.h
+++ b/src/qtpromise/qpromiseresolver.h
@@ -14,23 +14,23 @@
 
 namespace QtPromise {
 
-template <typename T> class QPromise;
+template<typename T>
+class QPromise;
 
 } // namespace QtPromise
 
 namespace QtPromisePrivate {
 
-template <typename T>
+template<typename T>
 class PromiseResolver
 {
 public:
-    PromiseResolver(QtPromise::QPromise<T> promise)
-        : m_d{new Data{}}
+    PromiseResolver(QtPromise::QPromise<T> promise) : m_d{new Data{}}
     {
         m_d->promise = new QtPromise::QPromise<T>{std::move(promise)};
     }
 
-    template <typename E>
+    template<typename E>
     void reject(E&& error)
     {
         auto promise = m_d->promise;
@@ -53,7 +53,7 @@ public:
         }
     }
 
-    template <typename V>
+    template<typename V>
     void resolve(V&& value)
     {
         auto promise = m_d->promise;
@@ -93,51 +93,43 @@ private:
     }
 };
 
-} // QtPromisePrivate
+} // namespace QtPromisePrivate
 
 namespace QtPromise {
 
-template <class T>
+template<class T>
 class QPromiseResolve
 {
 public:
-    QPromiseResolve(QtPromisePrivate::PromiseResolver<T> resolver)
-        : m_resolver{std::move(resolver)}
+    QPromiseResolve(QtPromisePrivate::PromiseResolver<T> resolver) : m_resolver{std::move(resolver)}
     { }
 
-    template <typename V>
+    template<typename V>
     void operator()(V&& value) const
     {
         m_resolver.resolve(std::forward<V>(value));
     }
 
-    void operator()() const
-    {
-        m_resolver.resolve();
-    }
+    void operator()() const { m_resolver.resolve(); }
 
 private:
     mutable QtPromisePrivate::PromiseResolver<T> m_resolver;
 };
 
-template <class T>
+template<class T>
 class QPromiseReject
 {
 public:
-    QPromiseReject(QtPromisePrivate::PromiseResolver<T> resolver)
-        : m_resolver{std::move(resolver)}
+    QPromiseReject(QtPromisePrivate::PromiseResolver<T> resolver) : m_resolver{std::move(resolver)}
     { }
 
-    template <typename E>
+    template<typename E>
     void operator()(E&& error) const
     {
         m_resolver.reject(std::forward<E>(error));
     }
 
-    void operator()() const
-    {
-        m_resolver.reject();
-    }
+    void operator()() const { m_resolver.reject(); }
 
 private:
     mutable QtPromisePrivate::PromiseResolver<T> m_resolver;
diff --git a/tests/auto/qtpromise/benchmark/tst_benchmark.cpp b/tests/auto/qtpromise/benchmark/tst_benchmark.cpp
index 20ccda4..29a62e6 100644
--- a/tests/auto/qtpromise/benchmark/tst_benchmark.cpp
+++ b/tests/auto/qtpromise/benchmark/tst_benchmark.cpp
@@ -11,11 +11,11 @@
 #include <QtTest>
 
 #ifdef Q_CC_MSVC
-    // MSVC calls the copy constructor on std::current_exception AND std::rethrow_exception
-    // https://stackoverflow.com/a/31820854
-    #define EXCEPT_CALL_COPY_CTOR 1
+// MSVC calls the copy constructor on std::current_exception AND std::rethrow_exception
+// https://stackoverflow.com/a/31820854
+#    define EXCEPT_CALL_COPY_CTOR 1
 #else
-    #define EXCEPT_CALL_COPY_CTOR 0
+#    define EXCEPT_CALL_COPY_CTOR 0
 #endif
 
 using namespace QtPromise;
@@ -41,7 +41,7 @@ QTEST_MAIN(tst_benchmark)
 
 void tst_benchmark::valueResolve()
 {
-    {   // should move the value when resolved by rvalue
+    { // should move the value when resolved by rvalue
         Data::logs().reset();
         QPromise<Data>{[&](const QPromiseResolve<Data>& resolve) {
             resolve(Data{42});
@@ -49,10 +49,10 @@ void tst_benchmark::valueResolve()
 
         QCOMPARE(Data::logs().ctor, 1);
         QCOMPARE(Data::logs().copy, 0);
-        QCOMPARE(Data::logs().move, 1);     // move value to the promise data
+        QCOMPARE(Data::logs().move, 1); // move value to the promise data
         QCOMPARE(Data::logs().refs, 0);
     }
-    {   // should create one copy of the value when resolved by lvalue
+    { // should create one copy of the value when resolved by lvalue
         Data::logs().reset();
         QPromise<Data>{[&](const QPromiseResolve<Data>& resolve) {
             Data value{42};
@@ -60,7 +60,7 @@ void tst_benchmark::valueResolve()
         }}.wait();
 
         QCOMPARE(Data::logs().ctor, 1);
-        QCOMPARE(Data::logs().copy, 1);     // copy value to the promise data
+        QCOMPARE(Data::logs().copy, 1); // copy value to the promise data
         QCOMPARE(Data::logs().move, 0);
         QCOMPARE(Data::logs().refs, 0);
     }
@@ -68,7 +68,7 @@ void tst_benchmark::valueResolve()
 
 void tst_benchmark::valueReject()
 {
-    {   // should not create any data if rejected
+    { // should not create any data if rejected
         Data::logs().reset();
         QPromise<Data>{[&](const QPromiseResolve<Data>&, const QPromiseReject<Data>& reject) {
             reject(QString{"foo"});
@@ -83,28 +83,34 @@ void tst_benchmark::valueReject()
 
 void tst_benchmark::valueThen()
 {
-    {   // should not copy value on continutation if fulfilled
+    { // should not copy value on continutation if fulfilled
         int value = -1;
         Data::logs().reset();
-        QPromise<Data>::resolve(Data{42}).then([&](const Data& res) {
-            value = res.value();
-        }).wait();
+        QPromise<Data>::resolve(Data{42})
+            .then([&](const Data& res) {
+                value = res.value();
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 1);
         QCOMPARE(Data::logs().copy, 0);
-        QCOMPARE(Data::logs().move, 1);     // move value to the promise data
+        QCOMPARE(Data::logs().move, 1); // move value to the promise data
         QCOMPARE(Data::logs().refs, 0);
         QCOMPARE(value, 42);
     }
-    {   // should not create value on continutation if rejected
+    { // should not create value on continutation if rejected
         int value = -1;
         QString error;
         Data::logs().reset();
-        QPromise<Data>::reject(QString{"foo"}).then([&](const Data& res) {
-            value = res.value();
-        }, [&](const QString& err) {
-            error = err;
-        }).wait();
+        QPromise<Data>::reject(QString{"foo"})
+            .then(
+                [&](const Data& res) {
+                    value = res.value();
+                },
+                [&](const QString& err) {
+                    error = err;
+                })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 0);
         QCOMPARE(Data::logs().copy, 0);
@@ -113,27 +119,32 @@ void tst_benchmark::valueThen()
         QCOMPARE(error, QString{"foo"});
         QCOMPARE(value, -1);
     }
-    {   // should move the returned value when fulfilled
+    { // should move the returned value when fulfilled
         int value = -1;
         Data::logs().reset();
-        QPromise<int>::resolve(42).then([&](int res) {
-            return Data{res+2};
-        }).then([&](const Data& res) {
-            value = res.value();
-        }).wait();
+        QPromise<int>::resolve(42)
+            .then([&](int res) {
+                return Data{res + 2};
+            })
+            .then([&](const Data& res) {
+                value = res.value();
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 1);
         QCOMPARE(Data::logs().copy, 0);
-        QCOMPARE(Data::logs().move, 1);     // move values to the next promise data
+        QCOMPARE(Data::logs().move, 1); // move values to the next promise data
         QCOMPARE(Data::logs().refs, 0);
         QCOMPARE(value, 44);
     }
-    {   // should not create any data if handler throws
+    { // should not create any data if handler throws
         Data::logs().reset();
-        QPromise<int>::resolve(42).then([&](int res) {
-            throw QString{"foo"};
-            return Data{res+2};
-        }).wait();
+        QPromise<int>::resolve(42)
+            .then([&](int res) {
+                throw QString{"foo"};
+                return Data{res + 2};
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 0);
         QCOMPARE(Data::logs().copy, 0);
@@ -144,26 +155,31 @@ void tst_benchmark::valueThen()
 
 void tst_benchmark::valueDelayed()
 {
-    {   // should not copy the value on continutation if fulfilled
+    { // should not copy the value on continutation if fulfilled
         int value = -1;
         Data::logs().reset();
-        QPromise<int>::resolve(42).then([&](int res) {
-            return QPromise<Data>::resolve(Data{res + 1});
-        }).then([&](const Data& res) {
-            value = res.value();
-        }).wait();
+        QPromise<int>::resolve(42)
+            .then([&](int res) {
+                return QPromise<Data>::resolve(Data{res + 1});
+            })
+            .then([&](const Data& res) {
+                value = res.value();
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 1);
         QCOMPARE(Data::logs().copy, 0);
-        QCOMPARE(Data::logs().move, 1);     // move value to the input promise data
+        QCOMPARE(Data::logs().move, 1); // move value to the input promise data
         QCOMPARE(Data::logs().refs, 0);
         QCOMPARE(value, 43);
     }
-    {   // should not create value on continutation if rejected
+    { // should not create value on continutation if rejected
         Data::logs().reset();
-        QPromise<int>::resolve(42).then([&]() {
-            return QPromise<Data>::reject(QString{"foo"});
-        }).wait();
+        QPromise<int>::resolve(42)
+            .then([&]() {
+                return QPromise<Data>::reject(QString{"foo"});
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 0);
         QCOMPARE(Data::logs().copy, 0);
@@ -174,25 +190,29 @@ void tst_benchmark::valueDelayed()
 
 void tst_benchmark::valueFinally()
 {
-    {   // should not copy the value on continutation if fulfilled
+    { // should not copy the value on continutation if fulfilled
         int value = -1;
         Data::logs().reset();
-        QPromise<Data>::resolve(Data{42}).finally([&]() {
-            value = 42;
-        }).wait();
+        QPromise<Data>::resolve(Data{42})
+            .finally([&]() {
+                value = 42;
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 1);
         QCOMPARE(Data::logs().copy, 0);
-        QCOMPARE(Data::logs().move, 1);     // move value to the input and output promise data
+        QCOMPARE(Data::logs().move, 1); // move value to the input and output promise data
         QCOMPARE(Data::logs().refs, 0);
         QCOMPARE(value, 42);
     }
-    {   // should not create value on continutation if rejected
+    { // should not create value on continutation if rejected
         int value = -1;
         Data::logs().reset();
-        QPromise<Data>::reject(QString{"foo"}).finally([&]() {
-            value = 42;
-        }).wait();
+        QPromise<Data>::reject(QString{"foo"})
+            .finally([&]() {
+                value = 42;
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 0);
         QCOMPARE(Data::logs().copy, 0);
@@ -204,25 +224,29 @@ void tst_benchmark::valueFinally()
 
 void tst_benchmark::valueTap()
 {
-    {   // should not copy the value on continutation if fulfilled
+    { // should not copy the value on continutation if fulfilled
         int value = -1;
         Data::logs().reset();
-        QPromise<Data>::resolve(Data{42}).tap([&](const Data& res) {
-            value = res.value();
-        }).wait();
+        QPromise<Data>::resolve(Data{42})
+            .tap([&](const Data& res) {
+                value = res.value();
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 1);
         QCOMPARE(Data::logs().copy, 0);
-        QCOMPARE(Data::logs().move, 1);     // move value to the input and output promise data
+        QCOMPARE(Data::logs().move, 1); // move value to the input and output promise data
         QCOMPARE(Data::logs().refs, 0);
         QCOMPARE(value, 42);
     }
-    {   // should not create value on continutation if rejected
+    { // should not create value on continutation if rejected
         int value = -1;
         Data::logs().reset();
-        QPromise<Data>::reject(QString{"foo"}).tap([&](const Data& res) {
-            value = res.value();
-        }).wait();
+        QPromise<Data>::reject(QString{"foo"})
+            .tap([&](const Data& res) {
+                value = res.value();
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 0);
         QCOMPARE(Data::logs().copy, 0);
@@ -234,18 +258,18 @@ void tst_benchmark::valueTap()
 
 void tst_benchmark::errorReject()
 {
-    {   // should create one copy of the error when rejected by rvalue
+    { // should create one copy of the error when rejected by rvalue
         Data::logs().reset();
         QPromise<int>{[&](const QPromiseResolve<int>&, const QPromiseReject<int>& reject) {
             reject(Data{42});
         }}.wait();
 
         QCOMPARE(Data::logs().ctor, 1);
-        QCOMPARE(Data::logs().copy, 1 + EXCEPT_CALL_COPY_CTOR);  // copy value in std::exception_ptr
+        QCOMPARE(Data::logs().copy, 1 + EXCEPT_CALL_COPY_CTOR); // copy value in std::exception_ptr
         QCOMPARE(Data::logs().move, 0);
         QCOMPARE(Data::logs().refs, 0);
     }
-    {   // should create one copy of the error when rejected by lvalue (no extra copy)
+    { // should create one copy of the error when rejected by lvalue (no extra copy)
         Data::logs().reset();
         QPromise<int>{[&](const QPromiseResolve<int>&, const QPromiseReject<int>& reject) {
             Data error{42};
@@ -253,7 +277,7 @@ void tst_benchmark::errorReject()
         }}.wait();
 
         QCOMPARE(Data::logs().ctor, 1);
-        QCOMPARE(Data::logs().copy, 1 + EXCEPT_CALL_COPY_CTOR);  // copy value to the promise data
+        QCOMPARE(Data::logs().copy, 1 + EXCEPT_CALL_COPY_CTOR); // copy value to the promise data
         QCOMPARE(Data::logs().move, 0);
         QCOMPARE(Data::logs().refs, 0);
     }
@@ -261,30 +285,37 @@ void tst_benchmark::errorReject()
 
 void tst_benchmark::errorThen()
 {
-    {   // should not copy error on continutation if rejected
+    { // should not copy error on continutation if rejected
         int value = -1;
         Data::logs().reset();
-        QPromise<void>::reject(Data{42}).fail([&](const Data& res) {
-            value = res.value();
-        }).wait();
+        QPromise<void>::reject(Data{42})
+            .fail([&](const Data& res) {
+                value = res.value();
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 1);
-        QCOMPARE(Data::logs().copy, 1 + 2 * EXCEPT_CALL_COPY_CTOR);  // (initial) copy value in std::exception_ptr
+        QCOMPARE(Data::logs().copy,
+                 1 + 2 * EXCEPT_CALL_COPY_CTOR); // (initial) copy value in std::exception_ptr
         QCOMPARE(Data::logs().move, 0);
         QCOMPARE(Data::logs().refs, 0);
         QCOMPARE(value, 42);
     }
-    {   // should not copy error on continutation if rethrown
+    { // should not copy error on continutation if rethrown
         int value = -1;
         Data::logs().reset();
-        QPromise<void>::reject(Data{42}).fail([](const Data&) {
-            throw;
-        }).fail([&](const Data& res) {
-            value = res.value();
-        }).wait();
+        QPromise<void>::reject(Data{42})
+            .fail([](const Data&) {
+                throw;
+            })
+            .fail([&](const Data& res) {
+                value = res.value();
+            })
+            .wait();
 
         QCOMPARE(Data::logs().ctor, 1);
-        QCOMPARE(Data::logs().copy, 1 + 4 * EXCEPT_CALL_COPY_CTOR);  // (initial) copy value in std::exception_ptr
+        QCOMPARE(Data::logs().copy,
+                 1 + 4 * EXCEPT_CALL_COPY_CTOR); // (initial) copy value in std::exception_ptr
         QCOMPARE(Data::logs().move, 0);
         QCOMPARE(Data::logs().refs, 0);
         QCOMPARE(value, 42);
diff --git a/tests/auto/qtpromise/deprecations/tst_helpers_qpromise.cpp b/tests/auto/qtpromise/deprecations/tst_helpers_qpromise.cpp
index 8dfe026..f4bb173 100644
--- a/tests/auto/qtpromise/deprecations/tst_helpers_qpromise.cpp
+++ b/tests/auto/qtpromise/deprecations/tst_helpers_qpromise.cpp
@@ -175,7 +175,7 @@ void tst_deprecations_helpers_qpromise::stdSharedPtr()
 void tst_deprecations_helpers_qpromise::typedPromise()
 {
     auto resolver = [](const QPromiseResolve<int>& resolve) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             resolve(42);
         });
     };
@@ -202,7 +202,7 @@ void tst_deprecations_helpers_qpromise::typedPromise()
 void tst_deprecations_helpers_qpromise::voidPromise()
 {
     auto resolver = [](const QPromiseResolve<void>& resolve) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             resolve();
         });
     };
@@ -228,7 +228,9 @@ void tst_deprecations_helpers_qpromise::voidPromise()
 
 void tst_deprecations_helpers_qpromise::typedFuture()
 {
-    auto fn = [](){ return 42; };
+    auto fn = []() {
+        return 42;
+    };
     QFuture<int> v0 = QtConcurrent::run(fn);
     const QFuture<int> v1 = v0;
 
@@ -250,7 +252,7 @@ void tst_deprecations_helpers_qpromise::typedFuture()
 
 void tst_deprecations_helpers_qpromise::voidFuture()
 {
-    auto fn = [](){ };
+    auto fn = []() {};
     QFuture<void> v0 = QtConcurrent::run(fn);
     const QFuture<void> v1 = v0;
 
diff --git a/tests/auto/qtpromise/deprecations/tst_helpers_qpromiseall.cpp b/tests/auto/qtpromise/deprecations/tst_helpers_qpromiseall.cpp
index ae769e7..2f0f36a 100644
--- a/tests/auto/qtpromise/deprecations/tst_helpers_qpromiseall.cpp
+++ b/tests/auto/qtpromise/deprecations/tst_helpers_qpromiseall.cpp
@@ -33,18 +33,14 @@ QTEST_MAIN(tst_deprecations_helpers_qpromiseall)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     Q_STATIC_ASSERT((std::is_same<typename Sequence::value_type, QPromise<int>>::value));
 
     static void exec()
     {
-        Sequence promises{
-            QtPromise::resolve(42),
-            QtPromise::resolve(43),
-            QtPromise::resolve(44)
-        };
+        Sequence promises{QtPromise::resolve(42), QtPromise::resolve(43), QtPromise::resolve(44)};
 
         promises.push_back(QtPromise::resolve(45));
         promises.insert(++promises.begin(), QtPromise::resolve(46));
@@ -58,16 +54,14 @@ struct SequenceTester
     }
 };
 
-template <template <typename, typename...> class Sequence, typename ...Args>
+template<template<typename, typename...> class Sequence, typename... Args>
 struct SequenceTester<Sequence<QPromise<void>, Args...>>
 {
     static void exec()
     {
-        Sequence<QPromise<void>, Args...> promises{
-            QtPromise::resolve(),
-            QtPromise::resolve(),
-            QtPromise::resolve()
-        };
+        Sequence<QPromise<void>, Args...> promises{QtPromise::resolve(),
+                                                   QtPromise::resolve(),
+                                                   QtPromise::resolve()};
 
         promises.push_back(QtPromise::resolve());
         promises.insert(++promises.begin(), QtPromise::resolve());
@@ -106,7 +100,7 @@ void tst_deprecations_helpers_qpromiseall::allPromisesSucceed()
     auto p0 = QtPromise::resolve(42);
     auto p1 = QtPromise::resolve(44);
     auto p2 = QPromise<int>{[](const QPromiseResolve<int>& resolve) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             resolve(43);
         });
     }};
@@ -127,7 +121,7 @@ void tst_deprecations_helpers_qpromiseall::allPromisesSucceed_void()
     auto p0 = QtPromise::resolve();
     auto p1 = QtPromise::resolve();
     auto p2 = QPromise<void>{[](const QPromiseResolve<void>& resolve) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             resolve();
         });
     }};
@@ -148,7 +142,7 @@ void tst_deprecations_helpers_qpromiseall::atLeastOnePromiseReject()
     auto p0 = QtPromise::resolve(42);
     auto p1 = QtPromise::resolve(44);
     auto p2 = QPromise<int>{[](const QPromiseResolve<int>&, const QPromiseReject<int>& reject) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             reject(QString{"foo"});
         });
     }};
@@ -169,7 +163,7 @@ void tst_deprecations_helpers_qpromiseall::atLeastOnePromiseReject_void()
     auto p0 = QtPromise::resolve();
     auto p1 = QtPromise::resolve();
     auto p2 = QPromise<void>{[](const QPromiseResolve<void>&, const QPromiseReject<void>& reject) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             reject(QString{"foo"});
         });
     }};
@@ -210,7 +204,7 @@ void tst_deprecations_helpers_qpromiseall::preserveOrder()
 void tst_deprecations_helpers_qpromiseall::sequenceTypes()
 {
     SequenceTester<QList<QPromise<int>>>::exec();
-    //SequenceTester<QVector<QPromise<int>>>::exec();
+    // SequenceTester<QVector<QPromise<int>>>::exec();
     SequenceTester<std::list<QPromise<int>>>::exec();
     SequenceTester<std::vector<QPromise<int>>>::exec();
 }
@@ -218,7 +212,7 @@ void tst_deprecations_helpers_qpromiseall::sequenceTypes()
 void tst_deprecations_helpers_qpromiseall::sequenceTypes_void()
 {
     SequenceTester<QList<QPromise<void>>>::exec();
-    //SequenceTester<QVector<QPromise<void>>>::exec();
+    // SequenceTester<QVector<QPromise<void>>>::exec();
     SequenceTester<std::list<QPromise<void>>>::exec();
     SequenceTester<std::vector<QPromise<void>>>::exec();
 }
diff --git a/tests/auto/qtpromise/deprecations/tst_qpromise_all.cpp b/tests/auto/qtpromise/deprecations/tst_qpromise_all.cpp
index 740661e..f6606c2 100644
--- a/tests/auto/qtpromise/deprecations/tst_qpromise_all.cpp
+++ b/tests/auto/qtpromise/deprecations/tst_qpromise_all.cpp
@@ -33,18 +33,14 @@ QTEST_MAIN(tst_deprecations_qpromise_all)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     Q_STATIC_ASSERT((std::is_same<typename Sequence::value_type, QPromise<int>>::value));
 
     static void exec()
     {
-        Sequence promises{
-            QtPromise::resolve(42),
-            QtPromise::resolve(43),
-            QtPromise::resolve(44)
-        };
+        Sequence promises{QtPromise::resolve(42), QtPromise::resolve(43), QtPromise::resolve(44)};
 
         promises.push_back(QtPromise::resolve(45));
         promises.insert(++promises.begin(), QtPromise::resolve(46));
@@ -59,16 +55,14 @@ struct SequenceTester
     }
 };
 
-template <template <typename, typename...> class Sequence, typename ...Args>
+template<template<typename, typename...> class Sequence, typename... Args>
 struct SequenceTester<Sequence<QPromise<void>, Args...>>
 {
     static void exec()
     {
-        Sequence<QPromise<void>, Args...> promises{
-            QtPromise::resolve(),
-            QtPromise::resolve(),
-            QtPromise::resolve()
-        };
+        Sequence<QPromise<void>, Args...> promises{QtPromise::resolve(),
+                                                   QtPromise::resolve(),
+                                                   QtPromise::resolve()};
 
         promises.push_back(QtPromise::resolve());
         promises.insert(++promises.begin(), QtPromise::resolve());
@@ -110,7 +104,7 @@ void tst_deprecations_qpromise_all::allPromisesSucceed()
     auto p0 = QtPromise::resolve(42);
     auto p1 = QtPromise::resolve(44);
     auto p2 = QPromise<int>{[](const QPromiseResolve<int>& resolve) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             resolve(43);
         });
     }};
@@ -132,7 +126,7 @@ void tst_deprecations_qpromise_all::allPromisesSucceed_void()
     auto p0 = QtPromise::resolve();
     auto p1 = QtPromise::resolve();
     auto p2 = QPromise<void>{[](const QPromiseResolve<void>& resolve) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             resolve();
         });
     }};
@@ -154,7 +148,7 @@ void tst_deprecations_qpromise_all::atLeastOnePromiseReject()
     auto p0 = QtPromise::resolve(42);
     auto p1 = QtPromise::resolve(44);
     auto p2 = QPromise<int>{[](const QPromiseResolve<int>&, const QPromiseReject<int>& reject) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             reject(QString{"foo"});
         });
     }};
@@ -176,7 +170,7 @@ void tst_deprecations_qpromise_all::atLeastOnePromiseReject_void()
     auto p0 = QtPromise::resolve();
     auto p1 = QtPromise::resolve();
     auto p2 = QPromise<void>{[](const QPromiseResolve<void>&, const QPromiseReject<void>& reject) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             reject(QString{"foo"});
         });
     }};
@@ -219,7 +213,7 @@ void tst_deprecations_qpromise_all::preserveOrder()
 void tst_deprecations_qpromise_all::sequenceTypes()
 {
     SequenceTester<QList<QPromise<int>>>::exec();
-    //SequenceTester<QVector<QPromise<int>>>::exec();
+    // SequenceTester<QVector<QPromise<int>>>::exec();
     SequenceTester<std::list<QPromise<int>>>::exec();
     SequenceTester<std::vector<QPromise<int>>>::exec();
 }
@@ -227,7 +221,7 @@ void tst_deprecations_qpromise_all::sequenceTypes()
 void tst_deprecations_qpromise_all::sequenceTypes_void()
 {
     SequenceTester<QList<QPromise<void>>>::exec();
-    //SequenceTester<QVector<QPromise<void>>>::exec();
+    // SequenceTester<QVector<QPromise<void>>>::exec();
     SequenceTester<std::list<QPromise<void>>>::exec();
     SequenceTester<std::vector<QPromise<void>>>::exec();
 }
diff --git a/tests/auto/qtpromise/exceptions/tst_exceptions.cpp b/tests/auto/qtpromise/exceptions/tst_exceptions.cpp
index 03300e9..5d9a8aa 100644
--- a/tests/auto/qtpromise/exceptions/tst_exceptions.cpp
+++ b/tests/auto/qtpromise/exceptions/tst_exceptions.cpp
@@ -30,10 +30,12 @@ QTEST_MAIN(tst_exceptions)
 
 namespace {
 
-template <class E>
+template<class E>
 void verify()
 {
-    auto p = QtPromise::resolve(QtConcurrent::run([]() { throw E(); }));
+    auto p = QtPromise::resolve(QtConcurrent::run([]() {
+        throw E();
+    }));
     QCOMPARE(p.isPending(), true);
     QCOMPARE(waitForRejected<E>(p), true);
     QCOMPARE(p.isRejected(), true);
diff --git a/tests/auto/qtpromise/future/tst_future.cpp b/tests/auto/qtpromise/future/tst_future.cpp
index 65e6a58..ac2821c 100644
--- a/tests/auto/qtpromise/future/tst_future.cpp
+++ b/tests/auto/qtpromise/future/tst_future.cpp
@@ -37,9 +37,7 @@ private Q_SLOTS:
 class MyException : public QException
 {
 public:
-    MyException(const QString& error)
-        : m_error{error}
-    { }
+    MyException(const QString& error) : m_error{error} { }
 
     const QString& error() const { return m_error; }
 
@@ -64,8 +62,8 @@ void tst_future::fulfilled()
     QCOMPARE(p.isPending(), true);
 
     p.then([&](int res) {
-        result = res;
-    }).wait();
+         result = res;
+     }).wait();
 
     QCOMPARE(p.isFulfilled(), true);
     QCOMPARE(result, 42);
@@ -74,14 +72,14 @@ void tst_future::fulfilled()
 void tst_future::fulfilled_void()
 {
     int result = -1;
-    auto p = QtPromise::resolve(QtConcurrent::run([]() { }));
+    auto p = QtPromise::resolve(QtConcurrent::run([]() {}));
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<void>>::value));
     QCOMPARE(p.isPending(), true);
 
     p.then([&]() {
-        result = 42;
-    }).wait();
+         result = 42;
+     }).wait();
 
     QCOMPARE(p.isFulfilled(), true);
     QCOMPARE(result, 42);
@@ -99,9 +97,9 @@ void tst_future::rejected()
     QCOMPARE(p.isPending(), true);
 
     p.fail([&](const MyException& e) {
-        error = e.error();
-        return -1;
-    }).wait();
+         error = e.error();
+         return -1;
+     }).wait();
 
     QCOMPARE(p.isRejected(), true);
     QCOMPARE(error, QString{"foo"});
@@ -119,8 +117,8 @@ void tst_future::rejected_void()
     QCOMPARE(p.isPending(), true);
 
     p.fail([&](const MyException& e) {
-        error = e.error();
-    }).wait();
+         error = e.error();
+     }).wait();
 
     QCOMPARE(p.isRejected(), true);
     QCOMPARE(error, QString{"foo"});
@@ -139,12 +137,14 @@ void tst_future::unhandled()
     QCOMPARE(p.isPending(), true);
 
     p.fail([&](const QString& err) {
-        error += err;
-        return -1;
-    }).fail([&](const QUnhandledException&) {
-        error += "bar";
-        return -1;
-    }).wait();
+         error += err;
+         return -1;
+     })
+        .fail([&](const QUnhandledException&) {
+            error += "bar";
+            return -1;
+        })
+        .wait();
 
     QCOMPARE(p.isRejected(), true);
     QCOMPARE(error, QString{"bar"});
@@ -161,10 +161,12 @@ void tst_future::unhandled_void()
     QCOMPARE(p.isPending(), true);
 
     p.fail([&](const QString& err) {
-        error += err;
-    }).fail([&](const QUnhandledException&) {
-        error += "bar";
-    }).wait();
+         error += err;
+     })
+        .fail([&](const QUnhandledException&) {
+            error += "bar";
+        })
+        .wait();
 
     QCOMPARE(p.isRejected(), true);
     QCOMPARE(error, QString{"bar"});
@@ -173,14 +175,14 @@ void tst_future::unhandled_void()
 void tst_future::canceled()
 {
     QString error;
-    auto p = QtPromise::resolve(QFuture<int>());  // Constructs an empty, canceled future.
+    auto p = QtPromise::resolve(QFuture<int>()); // Constructs an empty, canceled future.
 
     QCOMPARE(p.isPending(), true);
 
     p.fail([&](const QPromiseCanceledException&) {
-        error = "canceled";
-        return -1;
-    }).wait();
+         error = "canceled";
+         return -1;
+     }).wait();
 
     QCOMPARE(p.isRejected(), true);
     QCOMPARE(error, QString{"canceled"});
@@ -189,13 +191,13 @@ void tst_future::canceled()
 void tst_future::canceled_void()
 {
     QString error;
-    auto p = QtPromise::resolve(QFuture<void>());  // Constructs an empty, canceled future.
+    auto p = QtPromise::resolve(QFuture<void>()); // Constructs an empty, canceled future.
 
     QCOMPARE(p.isPending(), true);
 
     p.fail([&](const QPromiseCanceledException&) {
-        error = "canceled";
-    }).wait();
+         error = "canceled";
+     }).wait();
 
     QCOMPARE(p.isRejected(), true);
     QCOMPARE(error, QString{"canceled"});
@@ -211,8 +213,8 @@ void tst_future::canceledFromThread()
     QCOMPARE(p.isPending(), true);
 
     p.fail([&](const QPromiseCanceledException&) {
-        error = "bar";
-    }).wait();
+         error = "bar";
+     }).wait();
 
     QCOMPARE(p.isRejected(), true);
     QCOMPARE(error, QString{"bar"});
@@ -231,9 +233,11 @@ void tst_future::then()
     QCOMPARE(input.isFulfilled(), true);
     QCOMPARE(output.isPending(), true);
 
-    output.then([&](const QString& res) {
-        result = res;
-    }).wait();
+    output
+        .then([&](const QString& res) {
+            result = res;
+        })
+        .wait();
 
     QCOMPARE(output.isFulfilled(), true);
     QCOMPARE(result, QString{"foo42"});
@@ -252,9 +256,11 @@ void tst_future::then_void()
     QCOMPARE(input.isFulfilled(), true);
     QCOMPARE(output.isPending(), true);
 
-    output.then([&]() {
-        result += "bar";
-    }).wait();
+    output
+        .then([&]() {
+            result += "bar";
+        })
+        .wait();
 
     QCOMPARE(input.isFulfilled(), true);
     QCOMPARE(result, QString{"foobar"});
@@ -265,17 +271,21 @@ void tst_future::fail()
     QString result;
     auto input = QPromise<QString>::reject(MyException{"bar"});
     auto output = input.fail([](const MyException& e) {
-        return QtConcurrent::run([](const QString& error) {
-            return QString{"foo%1"}.arg(error);
-        }, e.error());
+        return QtConcurrent::run(
+            [](const QString& error) {
+                return QString{"foo%1"}.arg(error);
+            },
+            e.error());
     });
 
     QCOMPARE(input.isRejected(), true);
     QCOMPARE(output.isPending(), true);
 
-    output.then([&](const QString& res) {
-        result = res;
-    }).wait();
+    output
+        .then([&](const QString& res) {
+            result = res;
+        })
+        .wait();
 
     QCOMPARE(output.isFulfilled(), true);
     QCOMPARE(result, QString{"foobar"});
@@ -286,17 +296,21 @@ void tst_future::fail_void()
     QString result;
     auto input = QPromise<void>::reject(MyException{"bar"});
     auto output = input.fail([&](const MyException& e) {
-        return QtConcurrent::run([&](const QString& error) {
-            result = error;
-        }, e.error());
+        return QtConcurrent::run(
+            [&](const QString& error) {
+                result = error;
+            },
+            e.error());
     });
 
     QCOMPARE(input.isRejected(), true);
     QCOMPARE(output.isPending(), true);
 
-    output.then([&]() {
-        result = result.prepend("foo");
-    }).wait();
+    output
+        .then([&]() {
+            result = result.prepend("foo");
+        })
+        .wait();
 
     QCOMPARE(output.isFulfilled(), true);
     QCOMPARE(result, QString{"foobar"});
@@ -317,9 +331,11 @@ void tst_future::finally()
     QCOMPARE(output.isPending(), true);
 
     int value = -1;
-    output.then([&](int res) {
-        value = res;
-    }).wait();
+    output
+        .then([&](int res) {
+            value = res;
+        })
+        .wait();
 
     QCOMPARE(output.isFulfilled(), true);
     QCOMPARE(value, 42);
@@ -340,10 +356,12 @@ void tst_future::finallyRejected()
     QCOMPARE(output.isPending(), true);
 
     QString error;
-    output.fail([&](const MyException& e) {
-        error = e.error();
-        return -1;
-    }).wait();
+    output
+        .fail([&](const MyException& e) {
+            error = e.error();
+            return -1;
+        })
+        .wait();
 
     QCOMPARE(output.isRejected(), true);
     QCOMPARE(error, QString{"foo"});
diff --git a/tests/auto/qtpromise/helpers/tst_all.cpp b/tests/auto/qtpromise/helpers/tst_all.cpp
index 19a5209..6b86696 100644
--- a/tests/auto/qtpromise/helpers/tst_all.cpp
+++ b/tests/auto/qtpromise/helpers/tst_all.cpp
@@ -33,18 +33,14 @@ QTEST_MAIN(tst_helpers_all)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     Q_STATIC_ASSERT((std::is_same<typename Sequence::value_type, QPromise<int>>::value));
 
     static void exec()
     {
-        Sequence promises{
-            QtPromise::resolve(42),
-            QtPromise::resolve(43),
-            QtPromise::resolve(44)
-        };
+        Sequence promises{QtPromise::resolve(42), QtPromise::resolve(43), QtPromise::resolve(44)};
 
         promises.push_back(QtPromise::resolve(45));
         promises.insert(++promises.begin(), QtPromise::resolve(46));
@@ -58,16 +54,14 @@ struct SequenceTester
     }
 };
 
-template <template <typename, typename...> class Sequence, typename ...Args>
+template<template<typename, typename...> class Sequence, typename... Args>
 struct SequenceTester<Sequence<QPromise<void>, Args...>>
 {
     static void exec()
     {
-        Sequence<QPromise<void>, Args...> promises{
-            QtPromise::resolve(),
-            QtPromise::resolve(),
-            QtPromise::resolve()
-        };
+        Sequence<QPromise<void>, Args...> promises{QtPromise::resolve(),
+                                                   QtPromise::resolve(),
+                                                   QtPromise::resolve()};
 
         promises.push_back(QtPromise::resolve());
         promises.insert(++promises.begin(), QtPromise::resolve());
@@ -106,7 +100,7 @@ void tst_helpers_all::allPromisesSucceed()
     auto p0 = QtPromise::resolve(42);
     auto p1 = QtPromise::resolve(44);
     auto p2 = QPromise<int>{[](const QPromiseResolve<int>& resolve) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             resolve(43);
         });
     }};
@@ -127,7 +121,7 @@ void tst_helpers_all::allPromisesSucceed_void()
     auto p0 = QtPromise::resolve();
     auto p1 = QtPromise::resolve();
     auto p2 = QPromise<void>{[](const QPromiseResolve<void>& resolve) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             resolve();
         });
     }};
@@ -148,7 +142,7 @@ void tst_helpers_all::atLeastOnePromiseReject()
     auto p0 = QtPromise::resolve(42);
     auto p1 = QtPromise::resolve(44);
     auto p2 = QPromise<int>{[](const QPromiseResolve<int>&, const QPromiseReject<int>& reject) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             reject(QString{"foo"});
         });
     }};
@@ -169,7 +163,7 @@ void tst_helpers_all::atLeastOnePromiseReject_void()
     auto p0 = QtPromise::resolve();
     auto p1 = QtPromise::resolve();
     auto p2 = QPromise<void>{[](const QPromiseResolve<void>&, const QPromiseReject<void>& reject) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             reject(QString{"foo"});
         });
     }};
@@ -210,7 +204,7 @@ void tst_helpers_all::preserveOrder()
 void tst_helpers_all::sequenceTypes()
 {
     SequenceTester<QList<QPromise<int>>>::exec();
-    //SequenceTester<QVector<QPromise<int>>>::exec();
+    // SequenceTester<QVector<QPromise<int>>>::exec();
     SequenceTester<std::list<QPromise<int>>>::exec();
     SequenceTester<std::vector<QPromise<int>>>::exec();
 }
@@ -218,7 +212,7 @@ void tst_helpers_all::sequenceTypes()
 void tst_helpers_all::sequenceTypes_void()
 {
     SequenceTester<QList<QPromise<void>>>::exec();
-    //SequenceTester<QVector<QPromise<void>>>::exec();
+    // SequenceTester<QVector<QPromise<void>>>::exec();
     SequenceTester<std::list<QPromise<void>>>::exec();
     SequenceTester<std::vector<QPromise<void>>>::exec();
 }
diff --git a/tests/auto/qtpromise/helpers/tst_attempt.cpp b/tests/auto/qtpromise/helpers/tst_attempt.cpp
index 44631f9..f601d75 100644
--- a/tests/auto/qtpromise/helpers/tst_attempt.cpp
+++ b/tests/auto/qtpromise/helpers/tst_attempt.cpp
@@ -91,9 +91,12 @@ void tst_helpers_attempt::functorThrows()
 
 void tst_helpers_attempt::callWithParams()
 {
-    auto p = QtPromise::attempt([&](int i, const QString& s) {
-        return QString{"%1:%2"}.arg(i).arg(s);
-    }, 42, "foo");
+    auto p = QtPromise::attempt(
+        [&](int i, const QString& s) {
+            return QString{"%1:%2"}.arg(i).arg(s);
+        },
+        42,
+        "foo");
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<QString>>::value));
     QCOMPARE(p.isFulfilled(), true);
diff --git a/tests/auto/qtpromise/helpers/tst_each.cpp b/tests/auto/qtpromise/helpers/tst_each.cpp
index 7f9d817..52699cf 100644
--- a/tests/auto/qtpromise/helpers/tst_each.cpp
+++ b/tests/auto/qtpromise/helpers/tst_each.cpp
@@ -32,7 +32,7 @@ QTEST_MAIN(tst_helpers_each)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     static void exec()
@@ -92,11 +92,11 @@ void tst_helpers_each::delayedFulfilled()
     QMap<int, int> values;
     auto p = QtPromise::each(QVector<int>{42, 43, 44}, [&](int v, int index) {
         return QPromise<int>{[&](const QPromiseResolve<int>& resolve) {
-                QtPromisePrivate::qtpromise_defer([=, &values]() {
-                    values[v] = index;
-                    resolve(42);
-                });
-            }};
+            QtPromisePrivate::qtpromise_defer([=, &values]() {
+                values[v] = index;
+                resolve(42);
+            });
+        }};
     });
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<QVector<int>>>::value));
@@ -108,9 +108,8 @@ void tst_helpers_each::delayedFulfilled()
 void tst_helpers_each::delayedRejected()
 {
     auto p = QtPromise::each(QVector<int>{42, 43, 44}, [](int v, ...) {
-        return QPromise<int>{[&](
-            const QPromiseResolve<int>& resolve,
-            const QPromiseReject<int>& reject) {
+        return QPromise<int>{
+            [&](const QPromiseResolve<int>& resolve, const QPromiseReject<int>& reject) {
                 QtPromisePrivate::qtpromise_defer([=]() {
                     if (v == 43) {
                         reject(QString{"foo"});
diff --git a/tests/auto/qtpromise/helpers/tst_filter.cpp b/tests/auto/qtpromise/helpers/tst_filter.cpp
index 02e5593..fdd9509 100644
--- a/tests/auto/qtpromise/helpers/tst_filter.cpp
+++ b/tests/auto/qtpromise/helpers/tst_filter.cpp
@@ -33,7 +33,7 @@ QTEST_MAIN(tst_helpers_filter)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     static void exec()
@@ -74,10 +74,10 @@ void tst_helpers_filter::delayedFulfilled()
 {
     auto p = QtPromise::filter(QVector<int>{42, 43, 44}, [](int v, ...) {
         return QPromise<bool>{[&](const QPromiseResolve<bool>& resolve) {
-                QtPromisePrivate::qtpromise_defer([=]() {
-                    resolve(v % 2 == 0);
-                });
-            }};
+            QtPromisePrivate::qtpromise_defer([=]() {
+                resolve(v % 2 == 0);
+            });
+        }};
     });
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<QVector<int>>>::value));
@@ -87,9 +87,8 @@ void tst_helpers_filter::delayedFulfilled()
 void tst_helpers_filter::delayedRejected()
 {
     auto p = QtPromise::filter(QVector<int>{42, 43, 44}, [](int v, ...) {
-        return QPromise<bool>{[&](
-            const QPromiseResolve<bool>& resolve,
-            const QPromiseReject<bool>& reject) {
+        return QPromise<bool>{
+            [&](const QPromiseResolve<bool>& resolve, const QPromiseReject<bool>& reject) {
                 QtPromisePrivate::qtpromise_defer([=]() {
                     if (v == 44) {
                         reject(QString{"foo"});
@@ -119,7 +118,7 @@ void tst_helpers_filter::functorThrows()
 void tst_helpers_filter::functorArguments()
 {
     QMap<int, int> args;
-     auto p = QtPromise::filter(QVector<int>{42, 43, 44}, [&](int v, int i) {
+    auto p = QtPromise::filter(QVector<int>{42, 43, 44}, [&](int v, int i) {
         args[v] = i;
         return i % 2 == 0;
     });
diff --git a/tests/auto/qtpromise/helpers/tst_map.cpp b/tests/auto/qtpromise/helpers/tst_map.cpp
index 02b6b22..72f8b88 100644
--- a/tests/auto/qtpromise/helpers/tst_map.cpp
+++ b/tests/auto/qtpromise/helpers/tst_map.cpp
@@ -33,7 +33,7 @@ QTEST_MAIN(tst_helpers_map)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     static void exec()
@@ -83,10 +83,10 @@ void tst_helpers_map::delayedFulfilled()
 {
     auto p = QtPromise::map(QVector<int>{42, 43, 44}, [](int v, ...) {
         return QPromise<int>{[&](const QPromiseResolve<int>& resolve) {
-                QtPromisePrivate::qtpromise_defer([=]() {
-                    resolve(v + 1);
-                });
-            }};
+            QtPromisePrivate::qtpromise_defer([=]() {
+                resolve(v + 1);
+            });
+        }};
     });
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<QVector<int>>>::value));
@@ -96,9 +96,8 @@ void tst_helpers_map::delayedFulfilled()
 void tst_helpers_map::delayedRejected()
 {
     auto p = QtPromise::map(QVector<int>{42, 43, 44}, [](int v, ...) {
-        return QPromise<int>{[&](
-            const QPromiseResolve<int>& resolve,
-            const QPromiseReject<int>& reject) {
+        return QPromise<int>{
+            [&](const QPromiseResolve<int>& resolve, const QPromiseReject<int>& reject) {
                 QtPromisePrivate::qtpromise_defer([=]() {
                     if (v == 43) {
                         reject(QString{"foo"});
diff --git a/tests/auto/qtpromise/helpers/tst_reduce.cpp b/tests/auto/qtpromise/helpers/tst_reduce.cpp
index dbcd34c..0793af5 100644
--- a/tests/auto/qtpromise/helpers/tst_reduce.cpp
+++ b/tests/auto/qtpromise/helpers/tst_reduce.cpp
@@ -34,16 +34,14 @@ QTEST_MAIN(tst_helpers_reduce)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     static void exec()
     {
-        Sequence inputs{
-            QtPromise::resolve(4).delay(400),
-            QtPromise::resolve(6).delay(300),
-            QtPromise::resolve(8).delay(200)
-        };
+        Sequence inputs{QtPromise::resolve(4).delay(400),
+                        QtPromise::resolve(6).delay(300),
+                        QtPromise::resolve(8).delay(200)};
         QVector<int> v0;
         QVector<int> v1;
 
@@ -51,10 +49,13 @@ struct SequenceTester
             v0 << acc << cur << idx;
             return acc + cur + idx;
         });
-        auto p1 = QtPromise::reduce(inputs, [&](int acc, int cur, int idx) {
-            v1 << acc << cur << idx;
-            return acc + cur + idx;
-        }, QtPromise::resolve(2).delay(100));
+        auto p1 = QtPromise::reduce(
+            inputs,
+            [&](int acc, int cur, int idx) {
+                v1 << acc << cur << idx;
+                return acc + cur + idx;
+            },
+            QtPromise::resolve(2).delay(100));
 
         Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
         Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
@@ -74,10 +75,13 @@ void tst_helpers_reduce::emptySequence()
 {
     bool called = false;
 
-    auto p = QtPromise::reduce(QVector<int>{}, [&](...) {
-        called = true;
-        return 43;
-    }, 42);
+    auto p = QtPromise::reduce(
+        QVector<int>{},
+        [&](...) {
+            called = true;
+            return 43;
+        },
+        42);
 
     // NOTE(SB): reduce() on an empty sequence without an initial value is an error!
 
@@ -97,10 +101,13 @@ void tst_helpers_reduce::regularValues()
         v0 << acc << cur << idx;
         return acc + cur + idx;
     });
-    auto p1 = QtPromise::reduce(inputs, [&](int acc, int cur, int idx) {
-        v1 << acc << cur << idx;
-        return acc + cur + idx;
-    }, 2);
+    auto p1 = QtPromise::reduce(
+        inputs,
+        [&](int acc, int cur, int idx) {
+            v1 << acc << cur << idx;
+            return acc + cur + idx;
+        },
+        2);
 
     Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
     Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
@@ -115,11 +122,9 @@ void tst_helpers_reduce::regularValues()
 
 void tst_helpers_reduce::promiseValues()
 {
-    QVector<QPromise<int>> inputs{
-        QtPromise::resolve(4).delay(400),
-        QtPromise::resolve(6).delay(300),
-        QtPromise::resolve(8).delay(200)
-    };
+    QVector<QPromise<int>> inputs{QtPromise::resolve(4).delay(400),
+                                  QtPromise::resolve(6).delay(300),
+                                  QtPromise::resolve(8).delay(200)};
     QVector<int> v0;
     QVector<int> v1;
 
@@ -127,10 +132,13 @@ void tst_helpers_reduce::promiseValues()
         v0 << acc << cur << idx;
         return acc + cur + idx;
     });
-    auto p1 = QtPromise::reduce(inputs, [&](int acc, int cur, int idx) {
-        v1 << acc << cur << idx;
-        return acc + cur + idx;
-    }, 2);
+    auto p1 = QtPromise::reduce(
+        inputs,
+        [&](int acc, int cur, int idx) {
+            v1 << acc << cur << idx;
+            return acc + cur + idx;
+        },
+        2);
 
     Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
     Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
@@ -147,9 +155,12 @@ void tst_helpers_reduce::convertResultType()
 {
     QVector<int> inputs{4, 6, 8};
 
-    auto p = QtPromise::reduce(inputs, [&](const QString& acc, int cur, int idx) {
-        return QString{"%1:%2:%3"}.arg(acc).arg(cur).arg(idx);
-    }, QString{"foo"});
+    auto p = QtPromise::reduce(
+        inputs,
+        [&](const QString& acc, int cur, int idx) {
+            return QString{"%1:%2:%3"}.arg(acc).arg(cur).arg(idx);
+        },
+        QString{"foo"});
 
     // NOTE(SB): when no initial value is given, the result type is the sequence type.
 
@@ -163,10 +174,13 @@ void tst_helpers_reduce::delayedInitialValue()
 {
     QVector<int> values;
 
-    auto p = QtPromise::reduce(QVector<int>{4, 6, 8}, [&](int acc, int cur, int idx) {
-        values << acc << cur << idx;
-        return acc + cur + idx;
-    }, QtPromise::resolve(2).delay(100));
+    auto p = QtPromise::reduce(
+        QVector<int>{4, 6, 8},
+        [&](int acc, int cur, int idx) {
+            values << acc << cur << idx;
+            return acc + cur + idx;
+        },
+        QtPromise::resolve(2).delay(100));
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<int>>::value));
 
@@ -185,10 +199,13 @@ void tst_helpers_reduce::delayedFulfilled()
         v0 << acc << cur << idx;
         return QtPromise::resolve(acc + cur + idx).delay(100);
     });
-    auto p1 = QtPromise::reduce(inputs, [&](int acc, int cur, int idx) {
-        v1 << acc << cur << idx;
-        return QtPromise::resolve(acc + cur + idx).delay(100);
-    }, 2);
+    auto p1 = QtPromise::reduce(
+        inputs,
+        [&](int acc, int cur, int idx) {
+            v1 << acc << cur << idx;
+            return QtPromise::resolve(acc + cur + idx).delay(100);
+        },
+        2);
 
     Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
     Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
@@ -214,13 +231,16 @@ void tst_helpers_reduce::delayedRejected()
         }
         return QtPromise::resolve(acc + cur + idx);
     });
-    auto p1 = QtPromise::reduce(inputs, [&](int acc, int cur, int idx) {
-        v1 << acc << cur << idx;
-        if (cur == 6) {
-            return QPromise<int>::reject(QString{"bar"});
-        }
-        return QtPromise::resolve(acc + cur + idx);
-    }, 2);
+    auto p1 = QtPromise::reduce(
+        inputs,
+        [&](int acc, int cur, int idx) {
+            v1 << acc << cur << idx;
+            if (cur == 6) {
+                return QPromise<int>::reject(QString{"bar"});
+            }
+            return QtPromise::resolve(acc + cur + idx);
+        },
+        2);
 
     Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
     Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
@@ -246,13 +266,16 @@ void tst_helpers_reduce::functorThrows()
         }
         return acc + cur + idx;
     });
-    auto p1 = QtPromise::reduce(inputs, [&](int acc, int cur, int idx) {
-        v1 << acc << cur << idx;
-        if (cur == 6) {
-            throw QString{"bar"};
-        }
-        return acc + cur + idx;
-    }, 2);
+    auto p1 = QtPromise::reduce(
+        inputs,
+        [&](int acc, int cur, int idx) {
+            v1 << acc << cur << idx;
+            if (cur == 6) {
+                throw QString{"bar"};
+            }
+            return acc + cur + idx;
+        },
+        2);
 
     Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
     Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
diff --git a/tests/auto/qtpromise/helpers/tst_resolve.cpp b/tests/auto/qtpromise/helpers/tst_resolve.cpp
index be23ea0..f04b891 100644
--- a/tests/auto/qtpromise/helpers/tst_resolve.cpp
+++ b/tests/auto/qtpromise/helpers/tst_resolve.cpp
@@ -8,8 +8,8 @@
 #include "../shared/data.h"
 #include "../shared/utils.h"
 
-#include <QtPromise>
 #include <QtConcurrent>
+#include <QtPromise>
 #include <QtTest>
 
 #include <memory>
@@ -175,7 +175,7 @@ void tst_helpers_resolve::stdSharedPtr()
 void tst_helpers_resolve::typedPromise()
 {
     auto resolver = [](const QPromiseResolve<int>& resolve) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             resolve(42);
         });
     };
@@ -202,7 +202,7 @@ void tst_helpers_resolve::typedPromise()
 void tst_helpers_resolve::voidPromise()
 {
     auto resolver = [](const QPromiseResolve<void>& resolve) {
-        QtPromisePrivate::qtpromise_defer([=](){
+        QtPromisePrivate::qtpromise_defer([=]() {
             resolve();
         });
     };
@@ -228,7 +228,9 @@ void tst_helpers_resolve::voidPromise()
 
 void tst_helpers_resolve::typedFuture()
 {
-    auto fn = [](){ return 42; };
+    auto fn = []() {
+        return 42;
+    };
     QFuture<int> v0 = QtConcurrent::run(fn);
     const QFuture<int> v1 = v0;
 
@@ -250,7 +252,7 @@ void tst_helpers_resolve::typedFuture()
 
 void tst_helpers_resolve::voidFuture()
 {
-    auto fn = [](){ };
+    auto fn = []() {};
     QFuture<void> v0 = QtConcurrent::run(fn);
     const QFuture<void> v1 = v0;
 
diff --git a/tests/auto/qtpromise/internals/tst_argsof.cpp b/tests/auto/qtpromise/internals/tst_argsof.cpp
index d87a538..01a1eff 100644
--- a/tests/auto/qtpromise/internals/tst_argsof.cpp
+++ b/tests/auto/qtpromise/internals/tst_argsof.cpp
@@ -27,43 +27,88 @@ private Q_SLOTS:
 QTEST_MAIN(tst_internals_argsof)
 #include "tst_argsof.moc"
 
-#define TEST_ARGS_FOR_TYPE(T, E)                                                            \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<T>::first, E>::value));                   \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<T&>::first, E>::value));                  \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<T&&>::first, E>::value));                 \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const T>::first, E>::value));             \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const T&>::first, E>::value));            \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const T&&>::first, E>::value));           \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<volatile T>::first, E>::value));          \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<volatile T&>::first, E>::value));         \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<volatile T&&>::first, E>::value));        \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const volatile T>::first, E>::value));    \
-    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const volatile T&>::first, E>::value));   \
+#define TEST_ARGS_FOR_TYPE(T, E)                                                                   \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<T>::first, E>::value));                          \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<T&>::first, E>::value));                         \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<T&&>::first, E>::value));                        \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const T>::first, E>::value));                    \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const T&>::first, E>::value));                   \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const T&&>::first, E>::value));                  \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<volatile T>::first, E>::value));                 \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<volatile T&>::first, E>::value));                \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<volatile T&&>::first, E>::value));               \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const volatile T>::first, E>::value));           \
+    Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const volatile T&>::first, E>::value));          \
     Q_STATIC_ASSERT((std::is_same<typename ArgsOf<const volatile T&&>::first, E>::value));
 
 namespace {
 
 const float kRes = 0.42f;
 
-float fnNoArg() { return kRes; }
-float fnOneArg(float v) { return v; }
-float fnManyArgs(const float& v0, int, char*) { return v0; }
+float fnNoArg()
+{
+    return kRes;
+}
+float fnOneArg(float v)
+{
+    return v;
+}
+float fnManyArgs(const float& v0, int, char*)
+{
+    return v0;
+}
 
-struct OpNoArg { float operator()() { return kRes; } };
-struct OpOneArg { float operator()(float v) { return v; } };
-struct OpManyArgs { float operator()(const float& v, int, char*) { return v; } };
+struct OpNoArg
+{
+    float operator()() { return kRes; }
+};
+struct OpOneArg
+{
+    float operator()(float v) { return v; }
+};
+struct OpManyArgs
+{
+    float operator()(const float& v, int, char*) { return v; }
+};
 
-struct OpCNoArg { float operator()() const { return kRes; } };
-struct OpCOneArg { float operator()(float v) const { return v; } };
-struct OpCManyArgs { float operator()(const float& v, int, char*) const { return v; } };
+struct OpCNoArg
+{
+    float operator()() const { return kRes; }
+};
+struct OpCOneArg
+{
+    float operator()(float v) const { return v; }
+};
+struct OpCManyArgs
+{
+    float operator()(const float& v, int, char*) const { return v; }
+};
 
-struct OpVNoArg { float operator()() volatile { return kRes; } };
-struct OpVOneArg { float operator()(float v) volatile { return v; } };
-struct OpVManyArgs { float operator()(const float& v, int, char*) volatile { return v; } };
+struct OpVNoArg
+{
+    float operator()() volatile { return kRes; }
+};
+struct OpVOneArg
+{
+    float operator()(float v) volatile { return v; }
+};
+struct OpVManyArgs
+{
+    float operator()(const float& v, int, char*) volatile { return v; }
+};
 
-struct OpCVNoArg { float operator()() const volatile { return kRes; } };
-struct OpCVOneArg { float operator()(float v) const volatile { return v; } };
-struct OpCVManyArgs { float operator()(const float& v, int, char*) const volatile { return v; } };
+struct OpCVNoArg
+{
+    float operator()() const volatile { return kRes; }
+};
+struct OpCVOneArg
+{
+    float operator()(float v) const volatile { return v; }
+};
+struct OpCVManyArgs
+{
+    float operator()(const float& v, int, char*) const volatile { return v; }
+};
 
 } // namespace
 
diff --git a/tests/auto/qtpromise/qpromise/tst_construct.cpp b/tests/auto/qtpromise/qpromise/tst_construct.cpp
index 6860432..18ace65 100644
--- a/tests/auto/qtpromise/qpromise/tst_construct.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_construct.cpp
@@ -270,23 +270,23 @@ void tst_qpromise_construct::connectAndResolve()
     std::weak_ptr<int> wptr;
 
     {
-        auto p = QPromise<std::shared_ptr<int>>{[&](
-            const QPromiseResolve<std::shared_ptr<int>>& resolve,
-            const QPromiseReject<std::shared_ptr<int>>& reject) {
+        auto p =
+            QPromise<std::shared_ptr<int>>{[&](const QPromiseResolve<std::shared_ptr<int>>& resolve,
+                                               const QPromiseReject<std::shared_ptr<int>>& reject) {
+                connect(object.data(),
+                        &QObject::objectNameChanged,
+                        [=, &wptr](const QString& name) {
+                            auto sptr = std::make_shared<int>(42);
 
-            connect(object.data(), &QObject::objectNameChanged,
-                [=, &wptr](const QString& name) {
-                    auto sptr = std::make_shared<int>(42);
+                            wptr = sptr;
 
-                    wptr = sptr;
-
-                    if (name == "foobar") {
-                        resolve(sptr);
-                    } else {
-                        reject(42);
-                    }
-                });
-        }};
+                            if (name == "foobar") {
+                                resolve(sptr);
+                            } else {
+                                reject(42);
+                            }
+                        });
+            }};
 
         QCOMPARE(p.isPending(), true);
 
@@ -307,22 +307,19 @@ void tst_qpromise_construct::connectAndReject()
     std::weak_ptr<int> wptr;
 
     {
-        auto p = QPromise<int>{[&](
-            const QPromiseResolve<int>& resolve,
-            const QPromiseReject<int>& reject) {
+        auto p = QPromise<int>{[&](const QPromiseResolve<int>& resolve,
+                                   const QPromiseReject<int>& reject) {
+            connect(object.data(), &QObject::objectNameChanged, [=, &wptr](const QString& name) {
+                auto sptr = std::make_shared<int>(42);
 
-            connect(object.data(), &QObject::objectNameChanged,
-                [=, &wptr](const QString& name) {
-                    auto sptr = std::make_shared<int>(42);
+                wptr = sptr;
 
-                    wptr = sptr;
-
-                    if (name == "foobar") {
-                        reject(sptr);
-                    } else {
-                        resolve(42);
-                    }
-                });
+                if (name == "foobar") {
+                    reject(sptr);
+                } else {
+                    resolve(42);
+                }
+            });
         }};
 
         QCOMPARE(p.isPending(), true);
diff --git a/tests/auto/qtpromise/qpromise/tst_each.cpp b/tests/auto/qtpromise/qpromise/tst_each.cpp
index 22cd78c..7650e1e 100644
--- a/tests/auto/qtpromise/qpromise/tst_each.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_each.cpp
@@ -32,36 +32,34 @@ QTEST_MAIN(tst_qpromise_each)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     static void exec()
     {
         QVector<int> values;
-        auto p = QtPromise::resolve(Sequence{42, 43, 44}).each([&](int v, int i) {
-            values << i << v;
-        }).each([&](int v, ...) {
-            values << v;
-            return QString{"foo"};
-        }).each([&](int v, ...) {
-            values << v + 1;
-            return QtPromise::resolve(QString{"foo"}).then([&](){
-                values << -1;
-            });
-        }).each([&](int v, ...) {
-            values << v + 2;
-        });
+        auto p = QtPromise::resolve(Sequence{42, 43, 44})
+                     .each([&](int v, int i) {
+                         values << i << v;
+                     })
+                     .each([&](int v, ...) {
+                         values << v;
+                         return QString{"foo"};
+                     })
+                     .each([&](int v, ...) {
+                         values << v + 1;
+                         return QtPromise::resolve(QString{"foo"}).then([&]() {
+                             values << -1;
+                         });
+                     })
+                     .each([&](int v, ...) {
+                         values << v + 2;
+                     });
 
         Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<Sequence>>::value));
         QCOMPARE(waitForValue(p, Sequence{}), (Sequence{42, 43, 44}));
 
-        QVector<int> expected{
-            0, 42, 1, 43, 2, 44,
-            42, 43, 44,
-            43, 44, 45,
-            -1, -1, -1,
-            44, 45, 46
-        };
+        QVector<int> expected{0, 42, 1, 43, 2, 44, 42, 43, 44, 43, 44, 45, -1, -1, -1, 44, 45, 46};
         QCOMPARE(values, expected);
     }
 };
@@ -124,9 +122,8 @@ void tst_qpromise_each::delayedFulfilled()
 void tst_qpromise_each::delayedRejected()
 {
     auto p = QPromise<QVector<int>>::resolve({42, 43, 44}).each([](int v, ...) {
-        return QPromise<int>{[&](
-            const QPromiseResolve<int>& resolve,
-            const QPromiseReject<int>& reject) {
+        return QPromise<int>{
+            [&](const QPromiseResolve<int>& resolve, const QPromiseReject<int>& reject) {
                 QtPromisePrivate::qtpromise_defer([=]() {
                     if (v == 44) {
                         reject(QString{"foo"});
diff --git a/tests/auto/qtpromise/qpromise/tst_fail.cpp b/tests/auto/qtpromise/qpromise/tst_fail.cpp
index e33eb63..d5578a5 100644
--- a/tests/auto/qtpromise/qpromise/tst_fail.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_fail.cpp
@@ -36,18 +36,28 @@ const QString kErr{"0.42"};
 const float kRes = 0.42f;
 const float kFail = -1.f;
 
-float fnNoArg() { return kErr.toFloat(); }
-float fnArgByVal(QString e) { return e.toFloat(); }
-float fnArgByRef(const QString& e) { return e.toFloat(); }
+float fnNoArg()
+{
+    return kErr.toFloat();
+}
+float fnArgByVal(QString e)
+{
+    return e.toFloat();
+}
+float fnArgByRef(const QString& e)
+{
+    return e.toFloat();
+}
 
-class Klass {
+class Klass
+{
 public: // STATICS
     static float kFnNoArg() { return kErr.toFloat(); }
     static float kFnArgByVal(QString e) { return e.toFloat(); }
     static float kFnArgByRef(const QString& e) { return e.toFloat(); }
 
 public:
-    Klass(float v) : m_v{v} {}
+    Klass(float v) : m_v{v} { }
 
     float fnNoArg() const { return m_v; }
     float fnArgByVal(QString v) const { return v.toFloat() + m_v; }
@@ -66,15 +76,18 @@ void tst_qpromise_fail::sameType()
 
     QString error;
     p.fail([&](const std::domain_error& e) {
-        error += QString{e.what()} + "0";
-        return -1;
-    }).fail([&](const std::out_of_range& e) {
-        error += QString{e.what()} + "1";
-        return -1;
-    }).fail([&](const std::exception& e) {
-        error += QString{e.what()} + "2";
-        return -1;
-    }).wait();
+         error += QString{e.what()} + "0";
+         return -1;
+     })
+        .fail([&](const std::out_of_range& e) {
+            error += QString{e.what()} + "1";
+            return -1;
+        })
+        .fail([&](const std::exception& e) {
+            error += QString{e.what()} + "2";
+            return -1;
+        })
+        .wait();
 
     QCOMPARE(error, QString{"foo1"});
 }
@@ -86,15 +99,18 @@ void tst_qpromise_fail::baseClass()
 
     QString error;
     p.fail([&](const std::runtime_error& e) {
-        error += QString{e.what()} + "0";
-        return -1;
-    }).fail([&](const std::logic_error& e) {
-        error += QString{e.what()} + "1";
-        return -1;
-    }).fail([&](const std::exception& e) {
-        error += QString{e.what()} + "2";
-        return -1;
-    }).wait();
+         error += QString{e.what()} + "0";
+         return -1;
+     })
+        .fail([&](const std::logic_error& e) {
+            error += QString{e.what()} + "1";
+            return -1;
+        })
+        .fail([&](const std::exception& e) {
+            error += QString{e.what()} + "2";
+            return -1;
+        })
+        .wait();
 
     QCOMPARE(error, QString{"foo1"});
 }
@@ -105,22 +121,25 @@ void tst_qpromise_fail::catchAll()
 
     QString error;
     p.fail([&](const std::runtime_error& e) {
-        error += QString{e.what()} + "0";
-        return -1;
-    }).fail([&]() {
-        error += "bar";
-        return -1;
-    }).fail([&](const std::exception& e) {
-        error += QString{e.what()} + "2";
-        return -1;
-    }).wait();
+         error += QString{e.what()} + "0";
+         return -1;
+     })
+        .fail([&]() {
+            error += "bar";
+            return -1;
+        })
+        .fail([&](const std::exception& e) {
+            error += QString{e.what()} + "2";
+            return -1;
+        })
+        .wait();
 
     QCOMPARE(error, QString{"bar"});
 }
 
 void tst_qpromise_fail::functionPtrHandlers()
 {
-    {   // Global functions.
+    { // Global functions.
         auto p0 = QPromise<float>::reject(kErr).fail(&fnNoArg);
         auto p1 = QPromise<float>::reject(kErr).fail(&fnArgByVal);
         auto p2 = QPromise<float>::reject(kErr).fail(&fnArgByRef);
@@ -129,7 +148,7 @@ void tst_qpromise_fail::functionPtrHandlers()
         QCOMPARE(waitForValue(p1, kFail), kRes);
         QCOMPARE(waitForValue(p2, kFail), kRes);
     }
-    {   // Static member functions.
+    { // Static member functions.
         auto p0 = QPromise<float>::reject(kErr).fail(&Klass::kFnNoArg);
         auto p1 = QPromise<float>::reject(kErr).fail(&Klass::kFnArgByVal);
         auto p2 = QPromise<float>::reject(kErr).fail(&Klass::kFnArgByRef);
@@ -143,7 +162,7 @@ void tst_qpromise_fail::functionPtrHandlers()
 // https://github.com/simonbrunel/qtpromise/issues/29
 void tst_qpromise_fail::stdFunctionHandlers()
 {
-    {   // lvalue.
+    { // lvalue.
         std::function<float()> stdFnNoArg = fnNoArg;
         std::function<float(QString)> stdFnArgByVal = fnArgByVal;
         std::function<float(const QString&)> stdFnArgByRef = fnArgByRef;
@@ -156,7 +175,7 @@ void tst_qpromise_fail::stdFunctionHandlers()
         QCOMPARE(waitForValue(p1, kFail), kRes);
         QCOMPARE(waitForValue(p2, kFail), kRes);
     }
-    {   // const lvalue.
+    { // const lvalue.
         const std::function<float()> stdFnNoArg = fnNoArg;
         const std::function<float(QString)> stdFnArgByVal = fnArgByVal;
         const std::function<float(const QString&)> stdFnArgByRef = fnArgByRef;
@@ -169,10 +188,11 @@ void tst_qpromise_fail::stdFunctionHandlers()
         QCOMPARE(waitForValue(p1, kFail), kRes);
         QCOMPARE(waitForValue(p2, kFail), kRes);
     }
-    {   // rvalue.
+    { // rvalue.
         auto p0 = QPromise<float>::reject(kErr).fail(std::function<float()>{fnNoArg});
         auto p1 = QPromise<float>::reject(kErr).fail(std::function<float(QString)>{fnArgByVal});
-        auto p2 = QPromise<float>::reject(kErr).fail(std::function<float(const QString&)>{fnArgByRef});
+        auto p2 =
+            QPromise<float>::reject(kErr).fail(std::function<float(const QString&)>{fnArgByRef});
 
         QCOMPARE(waitForValue(p0, kFail), kRes);
         QCOMPARE(waitForValue(p1, kFail), kRes);
@@ -190,7 +210,8 @@ void tst_qpromise_fail::stdBindHandlers()
 
     const std::function<float()> bindNoArg = std::bind(&Klass::fnNoArg, &obj);
     const std::function<float(QString)> bindArgByVal = std::bind(&Klass::fnArgByVal, &obj, _1);
-    const std::function<float(const QString&)> bindArgByRef = std::bind(&Klass::fnArgByRef, &obj, _1);
+    const std::function<float(const QString&)> bindArgByRef =
+        std::bind(&Klass::fnArgByRef, &obj, _1);
 
     auto p0 = QPromise<float>::reject(kErr).fail(bindNoArg);
     auto p1 = QPromise<float>::reject(kErr).fail(bindArgByVal);
@@ -203,10 +224,16 @@ void tst_qpromise_fail::stdBindHandlers()
 
 void tst_qpromise_fail::lambdaHandlers()
 {
-    {   // lvalue.
-        auto lambdaNoArg = []() { return kRes; };
-        auto lambdaArgByVal = [](QString v) { return v.toFloat(); };
-        auto lambdaArgByRef = [](const QString& v) { return v.toFloat(); };
+    { // lvalue.
+        auto lambdaNoArg = []() {
+            return kRes;
+        };
+        auto lambdaArgByVal = [](QString v) {
+            return v.toFloat();
+        };
+        auto lambdaArgByRef = [](const QString& v) {
+            return v.toFloat();
+        };
 
         auto p0 = QPromise<float>::reject(kErr).fail(lambdaNoArg);
         auto p1 = QPromise<float>::reject(kErr).fail(lambdaArgByVal);
@@ -216,10 +243,16 @@ void tst_qpromise_fail::lambdaHandlers()
         QCOMPARE(waitForValue(p1, kFail), kRes);
         QCOMPARE(waitForValue(p2, kFail), kRes);
     }
-    {   // const lvalue.
-        const auto lambdaNoArg = []() { return kRes; };
-        const auto lambdaArgByVal = [](QString v) { return v.toFloat(); };
-        const auto lambdaArgByRef = [](const QString& v) { return v.toFloat(); };
+    { // const lvalue.
+        const auto lambdaNoArg = []() {
+            return kRes;
+        };
+        const auto lambdaArgByVal = [](QString v) {
+            return v.toFloat();
+        };
+        const auto lambdaArgByRef = [](const QString& v) {
+            return v.toFloat();
+        };
 
         auto p0 = QPromise<float>::reject(kErr).fail(lambdaNoArg);
         auto p1 = QPromise<float>::reject(kErr).fail(lambdaArgByVal);
@@ -229,10 +262,16 @@ void tst_qpromise_fail::lambdaHandlers()
         QCOMPARE(waitForValue(p1, kFail), kRes);
         QCOMPARE(waitForValue(p2, kFail), kRes);
     }
-    {   // rvalue.
-        auto p0 = QPromise<float>::reject(kErr).fail([]() { return kRes; });
-        auto p1 = QPromise<float>::reject(kErr).fail([](QString v) { return v.toFloat(); });
-        auto p2 = QPromise<float>::reject(kErr).fail([](const QString& v) { return v.toFloat(); });
+    { // rvalue.
+        auto p0 = QPromise<float>::reject(kErr).fail([]() {
+            return kRes;
+        });
+        auto p1 = QPromise<float>::reject(kErr).fail([](QString v) {
+            return v.toFloat();
+        });
+        auto p2 = QPromise<float>::reject(kErr).fail([](const QString& v) {
+            return v.toFloat();
+        });
 
         QCOMPARE(waitForValue(p0, kFail), kRes);
         QCOMPARE(waitForValue(p1, kFail), kRes);
diff --git a/tests/auto/qtpromise/qpromise/tst_filter.cpp b/tests/auto/qtpromise/qpromise/tst_filter.cpp
index a7dd469..ffede75 100644
--- a/tests/auto/qtpromise/qpromise/tst_filter.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_filter.cpp
@@ -33,20 +33,21 @@ QTEST_MAIN(tst_qpromise_filter)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     static void exec()
     {
-        auto p = QtPromise::resolve(Sequence{
-            42, 43, 44, 45, 46, 47, 48, 49, 50, 51
-        }).filter([](int v, ...) {
-            return v > 42 && v < 51;
-        }).filter([](int, int i) {
-            return QPromise<bool>::resolve(i % 2 == 0);
-        }).filter([](int v, ...) {
-            return v != 45;
-        });
+        auto p = QtPromise::resolve(Sequence{42, 43, 44, 45, 46, 47, 48, 49, 50, 51})
+                     .filter([](int v, ...) {
+                         return v > 42 && v < 51;
+                     })
+                     .filter([](int, int i) {
+                         return QPromise<bool>::resolve(i % 2 == 0);
+                     })
+                     .filter([](int v, ...) {
+                         return v != 45;
+                     });
 
         Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<Sequence>>::value));
         QCOMPARE(waitForValue(p, Sequence{}), (Sequence{43, 47, 49}));
@@ -79,10 +80,10 @@ void tst_qpromise_filter::delayedFulfilled()
 {
     auto p = QPromise<QVector<int>>::resolve({42, 43, 44}).filter([](int v, ...) {
         return QPromise<bool>{[&](const QPromiseResolve<bool>& resolve) {
-                QtPromisePrivate::qtpromise_defer([=]() {
-                    resolve(v % 2 == 0);
-                });
-            }};
+            QtPromisePrivate::qtpromise_defer([=]() {
+                resolve(v % 2 == 0);
+            });
+        }};
     });
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<QVector<int>>>::value));
@@ -92,9 +93,8 @@ void tst_qpromise_filter::delayedFulfilled()
 void tst_qpromise_filter::delayedRejected()
 {
     auto p = QPromise<QVector<int>>::resolve({42, 43, 44}).filter([](int v, ...) {
-        return QPromise<bool>{[&](
-            const QPromiseResolve<bool>& resolve,
-            const QPromiseReject<bool>& reject) {
+        return QPromise<bool>{
+            [&](const QPromiseResolve<bool>& resolve, const QPromiseReject<bool>& reject) {
                 QtPromisePrivate::qtpromise_defer([=]() {
                     if (v == 43) {
                         reject(QString{"foo"});
diff --git a/tests/auto/qtpromise/qpromise/tst_finally.cpp b/tests/auto/qtpromise/qpromise/tst_finally.cpp
index b17ff30..299c70a 100644
--- a/tests/auto/qtpromise/qpromise/tst_finally.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_finally.cpp
@@ -184,8 +184,8 @@ void tst_qpromise_finally::rejectedAsyncResolve()
     });
 
     p.then([&](int r) {
-        values << r;
-    }).wait();
+         values << r;
+     }).wait();
 
     QCOMPARE(waitForError(p, QString{}), QString{"foo"});
     QCOMPARE(p.isRejected(), true);
diff --git a/tests/auto/qtpromise/qpromise/tst_map.cpp b/tests/auto/qtpromise/qpromise/tst_map.cpp
index f741a94..7d5fc7a 100644
--- a/tests/auto/qtpromise/qpromise/tst_map.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_map.cpp
@@ -33,23 +33,28 @@ QTEST_MAIN(tst_qpromise_map)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     static void exec()
     {
-        auto p = QtPromise::resolve(Sequence{42, 43, 44}).map([](int v, ...) {
-            return QString::number(v + 1);
-        }).map([](const QString& v, int i) {
-            return QtPromise::resolve(QString{"%1:%2"}.arg(i).arg(v));
-        }).map([](const QString& v, ...) {
-            return QtPromise::resolve((v + "!").toUtf8());
-        }).map([](const QByteArray& v, ...) {
-            return QString::fromUtf8(v);
-        });
+        auto p = QtPromise::resolve(Sequence{42, 43, 44})
+                     .map([](int v, ...) {
+                         return QString::number(v + 1);
+                     })
+                     .map([](const QString& v, int i) {
+                         return QtPromise::resolve(QString{"%1:%2"}.arg(i).arg(v));
+                     })
+                     .map([](const QString& v, ...) {
+                         return QtPromise::resolve((v + "!").toUtf8());
+                     })
+                     .map([](const QByteArray& v, ...) {
+                         return QString::fromUtf8(v);
+                     });
 
         Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<QVector<QString>>>::value));
-        QCOMPARE(waitForValue(p, QVector<QString>{}), (QVector<QString>{"0:43!", "1:44!", "2:45!"}));
+        QCOMPARE(waitForValue(p, QVector<QString>{}),
+                 (QVector<QString>{"0:43!", "1:44!", "2:45!"}));
     }
 };
 
@@ -89,10 +94,10 @@ void tst_qpromise_map::delayedFulfilled()
 {
     auto p = QtPromise::resolve(QVector<int>{42, 43, 44}).map([](int v, ...) {
         return QPromise<int>{[&](const QPromiseResolve<int>& resolve) {
-                QtPromisePrivate::qtpromise_defer([=]() {
-                    resolve(v + 1);
-                });
-            }};
+            QtPromisePrivate::qtpromise_defer([=]() {
+                resolve(v + 1);
+            });
+        }};
     });
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<QVector<int>>>::value));
@@ -102,9 +107,8 @@ void tst_qpromise_map::delayedFulfilled()
 void tst_qpromise_map::delayedRejected()
 {
     auto p = QtPromise::resolve(QVector<int>{42, 43, 44}).map([](int v, ...) {
-        return QPromise<int>{[&](
-            const QPromiseResolve<int>& resolve,
-            const QPromiseReject<int>& reject) {
+        return QPromise<int>{
+            [&](const QPromiseResolve<int>& resolve, const QPromiseReject<int>& reject) {
                 QtPromisePrivate::qtpromise_defer([=]() {
                     if (v == 43) {
                         reject(QString{"foo"});
diff --git a/tests/auto/qtpromise/qpromise/tst_operators.cpp b/tests/auto/qtpromise/qpromise/tst_operators.cpp
index 9719b93..dca0a2e 100644
--- a/tests/auto/qtpromise/qpromise/tst_operators.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_operators.cpp
@@ -204,7 +204,7 @@ void tst_qpromise_operators::notEqualTo_void()
 void tst_qpromise_operators::chaining()
 {
     auto p = QPromise<int>::resolve(1);
-    for (int i=0; i<4; ++i) {
+    for (int i = 0; i < 4; ++i) {
         p = p.then([](int res) {
             return QPromise<int>::resolve(res * 2);
         });
@@ -220,7 +220,7 @@ void tst_qpromise_operators::chaining_void()
 
     auto p = QPromise<void>::resolve();
 
-    for (int i=0; i<4; ++i) {
+    for (int i = 0; i < 4; ++i) {
         p = p.then([i, &values]() {
             values.append(i * 2);
             return QPromise<void>::resolve();
diff --git a/tests/auto/qtpromise/qpromise/tst_reduce.cpp b/tests/auto/qtpromise/qpromise/tst_reduce.cpp
index a5c9932..d1a50bb 100644
--- a/tests/auto/qtpromise/qpromise/tst_reduce.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_reduce.cpp
@@ -34,16 +34,14 @@ QTEST_MAIN(tst_qpromise_reduce)
 
 namespace {
 
-template <class Sequence>
+template<class Sequence>
 struct SequenceTester
 {
     static void exec()
     {
-        Sequence inputs{
-            QtPromise::resolve(4).delay(400),
-            QtPromise::resolve(6).delay(300),
-            QtPromise::resolve(8).delay(200)
-        };
+        Sequence inputs{QtPromise::resolve(4).delay(400),
+                        QtPromise::resolve(6).delay(300),
+                        QtPromise::resolve(8).delay(200)};
         QVector<int> v0;
         QVector<int> v1;
 
@@ -51,10 +49,12 @@ struct SequenceTester
             v0 << acc << cur << idx;
             return acc + cur + idx;
         });
-        auto p1 = QtPromise::resolve(inputs).reduce([&](int acc, int cur, int idx) {
-            v1 << acc << cur << idx;
-            return acc + cur + idx;
-        }, QtPromise::resolve(2).delay(100));
+        auto p1 = QtPromise::resolve(inputs).reduce(
+            [&](int acc, int cur, int idx) {
+                v1 << acc << cur << idx;
+                return acc + cur + idx;
+            },
+            QtPromise::resolve(2).delay(100));
 
         Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
         Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
@@ -74,10 +74,13 @@ void tst_qpromise_reduce::emptySequence()
 {
     bool called = false;
 
-    auto p = QtPromise::resolve(QVector<int>{}).reduce([&](...) {
-        called = true;
-        return 43;
-    }, 42);
+    auto p = QtPromise::resolve(QVector<int>{})
+                 .reduce(
+                     [&](...) {
+                         called = true;
+                         return 43;
+                     },
+                     42);
 
     // NOTE(SB): reduce() on an empty sequence without an initial value is an error!
 
@@ -97,10 +100,12 @@ void tst_qpromise_reduce::regularValues()
         v0 << acc << cur << idx;
         return acc + cur + idx;
     });
-    auto p1 = QtPromise::resolve(inputs).reduce([&](int acc, int cur, int idx) {
-        v1 << acc << cur << idx;
-        return acc + cur + idx;
-    }, 2);
+    auto p1 = QtPromise::resolve(inputs).reduce(
+        [&](int acc, int cur, int idx) {
+            v1 << acc << cur << idx;
+            return acc + cur + idx;
+        },
+        2);
 
     Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
     Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
@@ -115,11 +120,9 @@ void tst_qpromise_reduce::regularValues()
 
 void tst_qpromise_reduce::promiseValues()
 {
-    QVector<QPromise<int>> inputs{
-        QtPromise::resolve(4).delay(400),
-        QtPromise::resolve(6).delay(300),
-        QtPromise::resolve(8).delay(200)
-    };
+    QVector<QPromise<int>> inputs{QtPromise::resolve(4).delay(400),
+                                  QtPromise::resolve(6).delay(300),
+                                  QtPromise::resolve(8).delay(200)};
     QVector<int> v0;
     QVector<int> v1;
 
@@ -127,10 +130,12 @@ void tst_qpromise_reduce::promiseValues()
         v0 << acc << cur << idx;
         return acc + cur + idx;
     });
-    auto p1 = QtPromise::resolve(inputs).reduce([&](int acc, int cur, int idx) {
-        v1 << acc << cur << idx;
-        return acc + cur + idx;
-    }, 2);
+    auto p1 = QtPromise::resolve(inputs).reduce(
+        [&](int acc, int cur, int idx) {
+            v1 << acc << cur << idx;
+            return acc + cur + idx;
+        },
+        2);
 
     Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
     Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
@@ -147,9 +152,11 @@ void tst_qpromise_reduce::convertResultType()
 {
     QVector<int> inputs{4, 6, 8};
 
-    auto p = QtPromise::resolve(inputs).reduce([&](const QString& acc, int cur, int idx) {
-        return QString{"%1:%2:%3"}.arg(acc).arg(cur).arg(idx);
-    }, QString{"foo"});
+    auto p = QtPromise::resolve(inputs).reduce(
+        [&](const QString& acc, int cur, int idx) {
+            return QString{"%1:%2:%3"}.arg(acc).arg(cur).arg(idx);
+        },
+        QString{"foo"});
 
     // NOTE(SB): when no initial value is given, the result type is the sequence type.
 
@@ -163,10 +170,13 @@ void tst_qpromise_reduce::delayedInitialValue()
 {
     QVector<int> values;
 
-    auto p = QtPromise::resolve(QVector<int>{4, 6, 8}).reduce([&](int acc, int cur, int idx) {
-        values << acc << cur << idx;
-        return acc + cur + idx;
-    }, QtPromise::resolve(2).delay(100));
+    auto p = QtPromise::resolve(QVector<int>{4, 6, 8})
+                 .reduce(
+                     [&](int acc, int cur, int idx) {
+                         values << acc << cur << idx;
+                         return acc + cur + idx;
+                     },
+                     QtPromise::resolve(2).delay(100));
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<int>>::value));
 
@@ -185,10 +195,12 @@ void tst_qpromise_reduce::delayedFulfilled()
         v0 << acc << cur << idx;
         return QtPromise::resolve(acc + cur + idx).delay(100);
     });
-    auto p1 = QtPromise::resolve(inputs).reduce([&](int acc, int cur, int idx) {
-        v1 << acc << cur << idx;
-        return QtPromise::resolve(acc + cur + idx).delay(100);
-    }, 2);
+    auto p1 = QtPromise::resolve(inputs).reduce(
+        [&](int acc, int cur, int idx) {
+            v1 << acc << cur << idx;
+            return QtPromise::resolve(acc + cur + idx).delay(100);
+        },
+        2);
 
     Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
     Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
@@ -214,13 +226,15 @@ void tst_qpromise_reduce::delayedRejected()
         }
         return QtPromise::resolve(acc + cur + idx);
     });
-    auto p1 = QtPromise::resolve(inputs).reduce([&](int acc, int cur, int idx) {
-        v1 << acc << cur << idx;
-        if (cur == 6) {
-            return QPromise<int>::reject(QString{"bar"});
-        }
-        return QtPromise::resolve(acc + cur + idx);
-    }, 2);
+    auto p1 = QtPromise::resolve(inputs).reduce(
+        [&](int acc, int cur, int idx) {
+            v1 << acc << cur << idx;
+            if (cur == 6) {
+                return QPromise<int>::reject(QString{"bar"});
+            }
+            return QtPromise::resolve(acc + cur + idx);
+        },
+        2);
 
     Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
     Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
@@ -246,13 +260,15 @@ void tst_qpromise_reduce::functorThrows()
         }
         return acc + cur + idx;
     });
-    auto p1 = QtPromise::resolve(inputs).reduce([&](int acc, int cur, int idx) {
-        v1 << acc << cur << idx;
-        if (cur == 6) {
-            throw QString{"bar"};
-        }
-        return acc + cur + idx;
-    }, 2);
+    auto p1 = QtPromise::resolve(inputs).reduce(
+        [&](int acc, int cur, int idx) {
+            v1 << acc << cur << idx;
+            if (cur == 6) {
+                throw QString{"bar"};
+            }
+            return acc + cur + idx;
+        },
+        2);
 
     Q_STATIC_ASSERT((std::is_same<decltype(p0), QPromise<int>>::value));
     Q_STATIC_ASSERT((std::is_same<decltype(p1), QPromise<int>>::value));
diff --git a/tests/auto/qtpromise/qpromise/tst_tap.cpp b/tests/auto/qtpromise/qpromise/tst_tap.cpp
index 69c40a3..aebee92 100644
--- a/tests/auto/qtpromise/qpromise/tst_tap.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_tap.cpp
@@ -92,8 +92,8 @@ void tst_qpromise_tap::fulfilledAsyncResolve()
     });
 
     p.then([&](int r) {
-        values << r;
-    }).wait();
+         values << r;
+     }).wait();
 
     QCOMPARE(p.isFulfilled(), true);
     QCOMPARE(values, (QVector<int>{2, 3, 1}));
@@ -115,8 +115,8 @@ void tst_qpromise_tap::fulfilledAsyncReject()
     });
 
     p.then([&](int r) {
-        values << r;
-    }).wait();
+         values << r;
+     }).wait();
 
     QCOMPARE(waitForError(p, QString{}), QString{"foo"});
     QCOMPARE(p.isRejected(), true);
diff --git a/tests/auto/qtpromise/qpromise/tst_tapfail.cpp b/tests/auto/qtpromise/qpromise/tst_tapfail.cpp
index 451286a..8e0b55d 100644
--- a/tests/auto/qtpromise/qpromise/tst_tapfail.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_tapfail.cpp
@@ -58,16 +58,14 @@ void tst_qpromise_tapfail::rejected()
 {
     QStringList errors;
 
-    auto p0 = QPromise<int>::reject(QString{"foo"})
-        .tapFail([&](const QString& err) {
-            errors << "1:" + err;
-        });
+    auto p0 = QPromise<int>::reject(QString{"foo"}).tapFail([&](const QString& err) {
+        errors << "1:" + err;
+    });
 
-    auto p1 = p0
-        .fail([&](const QString& err) {
-            errors << "2:" + err;
-            return 43;
-        });
+    auto p1 = p0.fail([&](const QString& err) {
+        errors << "2:" + err;
+        return 43;
+    });
 
     QCOMPARE(waitForError(p0, QString{}), QString{"foo"});
     QCOMPARE(waitForValue(p1, -1), 43);
@@ -80,15 +78,13 @@ void tst_qpromise_tapfail::rejected_void()
 {
     QStringList errors;
 
-    auto p0 = QPromise<void>::reject(QString{"foo"})
-        .tapFail([&](const QString& err) {
-            errors << "1:" + err;
-        });
+    auto p0 = QPromise<void>::reject(QString{"foo"}).tapFail([&](const QString& err) {
+        errors << "1:" + err;
+    });
 
-    auto p1 = p0
-        .fail([&](const QString& err) {
-            errors << "2:" + err;
-        });
+    auto p1 = p0.fail([&](const QString& err) {
+        errors << "2:" + err;
+    });
 
     QCOMPARE(waitForError(p0, QString{}), QString{"foo"});
     QCOMPARE(waitForValue(p1, -1, 43), 43);
@@ -99,10 +95,9 @@ void tst_qpromise_tapfail::rejected_void()
 
 void tst_qpromise_tapfail::throws()
 {
-    auto p = QPromise<int>::reject(QString{"foo"})
-        .tapFail([&]() {
-            throw QString{"bar"};
-        });
+    auto p = QPromise<int>::reject(QString{"foo"}).tapFail([&]() {
+        throw QString{"bar"};
+    });
 
     QCOMPARE(waitForError(p, QString{}), QString{"bar"});
     QCOMPARE(p.isRejected(), true);
@@ -110,10 +105,9 @@ void tst_qpromise_tapfail::throws()
 
 void tst_qpromise_tapfail::throws_void()
 {
-    auto p = QPromise<void>::reject(QString{"foo"})
-        .tapFail([&]() {
-            throw QString{"bar"};
-        });
+    auto p = QPromise<void>::reject(QString{"foo"}).tapFail([&]() {
+        throw QString{"bar"};
+    });
 
     QCOMPARE(waitForError(p, QString{}), QString{"bar"});
     QCOMPARE(p.isRejected(), true);
@@ -122,18 +116,17 @@ void tst_qpromise_tapfail::throws_void()
 void tst_qpromise_tapfail::delayedResolved()
 {
     QVector<int> values;
-    auto p = QPromise<int>::reject(QString{"foo"})
-        .tapFail([&]() {
-            QPromise<void> p{[&](const QPromiseResolve<void>& resolve) {
-                    QtPromisePrivate::qtpromise_defer([=, &values]() {
-                        values << 3;
-                        resolve(); // ignored!
-                    });
-                }};
+    auto p = QPromise<int>::reject(QString{"foo"}).tapFail([&]() {
+        QPromise<void> p{[&](const QPromiseResolve<void>& resolve) {
+            QtPromisePrivate::qtpromise_defer([=, &values]() {
+                values << 3;
+                resolve(); // ignored!
+            });
+        }};
 
-            values << 2;
-            return p;
-        });
+        values << 2;
+        return p;
+    });
 
     QCOMPARE(waitForError(p, QString{}), QString{"foo"});
     QCOMPARE(values, (QVector<int>{2, 3}));
@@ -142,20 +135,17 @@ void tst_qpromise_tapfail::delayedResolved()
 void tst_qpromise_tapfail::delayedRejected()
 {
     QVector<int> values;
-    auto p = QPromise<int>::reject(QString{"foo"})
-        .tapFail([&]() {
-            QPromise<void> p{[&](
-                const QPromiseResolve<void>&,
-                const QPromiseReject<void>& reject){
-                    QtPromisePrivate::qtpromise_defer([=, &values]() {
-                        values << 3;
-                        reject(QString{"bar"});
-                    });
-                }};
+    auto p = QPromise<int>::reject(QString{"foo"}).tapFail([&]() {
+        QPromise<void> p{[&](const QPromiseResolve<void>&, const QPromiseReject<void>& reject) {
+            QtPromisePrivate::qtpromise_defer([=, &values]() {
+                values << 3;
+                reject(QString{"bar"});
+            });
+        }};
 
-            values << 2;
-            return p;
-        });
+        values << 2;
+        return p;
+    });
 
     QCOMPARE(waitForError(p, QString{}), QString{"bar"});
     QCOMPARE(values, (QVector<int>{2, 3}));
diff --git a/tests/auto/qtpromise/qpromise/tst_then.cpp b/tests/auto/qtpromise/qpromise/tst_then.cpp
index 00edbbd..fc21c96 100644
--- a/tests/auto/qtpromise/qpromise/tst_then.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_then.cpp
@@ -39,18 +39,28 @@ namespace {
 const float kRes = 0.42f;
 const float kFail = -1.f;
 
-float fnNoArg() { return kRes; }
-float fnArgByVal(float v) { return v; }
-float fnArgByRef(const float& v) { return v; }
+float fnNoArg()
+{
+    return kRes;
+}
+float fnArgByVal(float v)
+{
+    return v;
+}
+float fnArgByRef(const float& v)
+{
+    return v;
+}
 
-class Klass {
+class Klass
+{
 public: // STATICS
     static float kFnNoArg() { return kRes; }
     static float kFnArgByVal(float v) { return v; }
     static float kFnArgByRef(const float& v) { return v; }
 
 public:
-    Klass(float v) : m_v{v} {}
+    Klass(float v) : m_v{v} { }
 
     float fnNoArg() const { return m_v; }
     float fnArgByVal(float v) const { return v + m_v; }
@@ -69,14 +79,17 @@ void tst_qpromise_then::resolveSync()
     auto input = QPromise<int>::resolve(42);
     auto output = input.then([&](int res) {
         values << res;
-        return QString::number(res+1);
+        return QString::number(res + 1);
     });
 
-    output.then([&](const QString& res) {
-        values << res;
-    }).then([&]() {
-        values << 44;
-    }).wait();
+    output
+        .then([&](const QString& res) {
+            values << res;
+        })
+        .then([&]() {
+            values << 44;
+        })
+        .wait();
 
     QCOMPARE(values, (QVariantList{42, QString{"43"}, 44}));
     QCOMPARE(input.isFulfilled(), true);
@@ -107,11 +120,14 @@ void tst_qpromise_then::rejectSync()
     });
 
     QString error;
-    output.then([&](int res) {
-        error += "bar" + QString::number(res);
-    }).fail([&](const QString& err) {
-        error += err;
-    }).wait();
+    output
+        .then([&](int res) {
+            error += "bar" + QString::number(res);
+        })
+        .fail([&](const QString& err) {
+            error += err;
+        })
+        .wait();
 
     QCOMPARE(error, QString{"foo42"});
     QCOMPARE(input.isFulfilled(), true);
@@ -121,11 +137,12 @@ void tst_qpromise_then::rejectSync()
 void tst_qpromise_then::rejectAsync()
 {
     auto p = QPromise<int>::resolve(42).then([](int res) {
-        return QPromise<void>{[=](const QPromiseResolve<void>&, const QPromiseReject<void>& reject) {
-            QtPromisePrivate::qtpromise_defer([=]() {
-                reject(QString{"foo%1"}.arg(res));
-            });
-        }};
+        return QPromise<void>{
+            [=](const QPromiseResolve<void>&, const QPromiseReject<void>& reject) {
+                QtPromisePrivate::qtpromise_defer([=]() {
+                    reject(QString{"foo%1"}.arg(res));
+                });
+            }};
     });
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<void>>::value));
@@ -139,8 +156,8 @@ void tst_qpromise_then::skipResult()
 
     int value = -1;
     p.then([&]() {
-        value = 43;
-    }).wait();
+         value = 43;
+     }).wait();
 
     Q_STATIC_ASSERT((std::is_same<decltype(p), QPromise<int>>::value));
     QCOMPARE(value, 43);
@@ -148,13 +165,13 @@ void tst_qpromise_then::skipResult()
 
 void tst_qpromise_then::nullHandler()
 {
-    {   // resolved
+    { // resolved
         auto p = QPromise<int>::resolve(42).then(nullptr);
 
         QCOMPARE(waitForValue(p, -1), 42);
         QCOMPARE(p.isFulfilled(), true);
     }
-    {   // rejected
+    { // rejected
         auto p = QPromise<int>::reject(QString{"foo"}).then(nullptr);
 
         QCOMPARE(waitForError(p, QString{}), QString{"foo"});
@@ -164,7 +181,7 @@ void tst_qpromise_then::nullHandler()
 
 void tst_qpromise_then::functionPtrHandlers()
 {
-    {   // Global functions.
+    { // Global functions.
         auto p0 = QtPromise::resolve().then(&fnNoArg);
         auto p1 = QtPromise::resolve(kRes).then(&fnArgByVal);
         auto p2 = QtPromise::resolve(kRes).then(&fnArgByRef);
@@ -173,7 +190,7 @@ void tst_qpromise_then::functionPtrHandlers()
         QCOMPARE(waitForValue(p1, kFail), kRes);
         QCOMPARE(waitForValue(p2, kFail), kRes);
     }
-    {   // Static member functions.
+    { // Static member functions.
         auto p0 = QtPromise::resolve().then(&Klass::kFnNoArg);
         auto p1 = QtPromise::resolve(kRes).then(&Klass::kFnArgByVal);
         auto p2 = QtPromise::resolve(kRes).then(&Klass::kFnArgByRef);
@@ -187,7 +204,7 @@ void tst_qpromise_then::functionPtrHandlers()
 // https://github.com/simonbrunel/qtpromise/issues/29
 void tst_qpromise_then::stdFunctionHandlers()
 {
-    {   // lvalue.
+    { // lvalue.
         std::function<float()> stdFnNoArg = fnNoArg;
         std::function<float(float)> stdFnArgByVal = fnArgByVal;
         std::function<float(const float&)> stdFnArgByRef = fnArgByRef;
@@ -200,7 +217,7 @@ void tst_qpromise_then::stdFunctionHandlers()
         QCOMPARE(waitForValue(p1, kFail), kRes);
         QCOMPARE(waitForValue(p2, kFail), kRes);
     }
-    {   // const lvalue.
+    { // const lvalue.
         const std::function<float()> stdFnNoArg = fnNoArg;
         const std::function<float(float)> stdFnArgByVal = fnArgByVal;
         const std::function<float(const float&)> stdFnArgByRef = fnArgByRef;
@@ -213,7 +230,7 @@ void tst_qpromise_then::stdFunctionHandlers()
         QCOMPARE(waitForValue(p1, kFail), kRes);
         QCOMPARE(waitForValue(p2, kFail), kRes);
     }
-    {   // rvalue.
+    { // rvalue.
         auto p0 = QtPromise::resolve().then(std::function<float()>{fnNoArg});
         auto p1 = QtPromise::resolve(kRes).then(std::function<float(float)>{fnArgByVal});
         auto p2 = QtPromise::resolve(kRes).then(std::function<float(const float&)>{fnArgByRef});
@@ -247,10 +264,16 @@ void tst_qpromise_then::stdBindHandlers()
 
 void tst_qpromise_then::lambdaHandlers()
 {
-    {   // lvalue.
-        auto lambdaNoArg = []() { return kRes; };
-        auto lambdaArgByVal = [](float v) { return v; };
-        auto lambdaArgByRef = [](const float& v) { return v; };
+    { // lvalue.
+        auto lambdaNoArg = []() {
+            return kRes;
+        };
+        auto lambdaArgByVal = [](float v) {
+            return v;
+        };
+        auto lambdaArgByRef = [](const float& v) {
+            return v;
+        };
 
         auto p0 = QtPromise::resolve().then(lambdaNoArg);
         auto p1 = QtPromise::resolve(kRes).then(lambdaArgByVal);
@@ -260,10 +283,16 @@ void tst_qpromise_then::lambdaHandlers()
         QCOMPARE(waitForValue(p1, kFail), kRes);
         QCOMPARE(waitForValue(p2, kFail), kRes);
     }
-    {   // const lvalue.
-        const auto lambdaNoArg = []() { return kRes; };
-        const auto lambdaArgByVal = [](float v) { return v; };
-        const auto lambdaArgByRef = [](const float& v) { return v; };
+    { // const lvalue.
+        const auto lambdaNoArg = []() {
+            return kRes;
+        };
+        const auto lambdaArgByVal = [](float v) {
+            return v;
+        };
+        const auto lambdaArgByRef = [](const float& v) {
+            return v;
+        };
 
         auto p0 = QtPromise::resolve().then(lambdaNoArg);
         auto p1 = QtPromise::resolve(kRes).then(lambdaArgByVal);
@@ -273,10 +302,16 @@ void tst_qpromise_then::lambdaHandlers()
         QCOMPARE(waitForValue(p1, kFail), kRes);
         QCOMPARE(waitForValue(p2, kFail), kRes);
     }
-    {   // rvalue.
-        auto p0 = QtPromise::resolve().then([]() { return kRes; });
-        auto p1 = QtPromise::resolve(kRes).then([](float v) { return v; });
-        auto p2 = QtPromise::resolve(kRes).then([](const float& v) { return v; });
+    { // rvalue.
+        auto p0 = QtPromise::resolve().then([]() {
+            return kRes;
+        });
+        auto p1 = QtPromise::resolve(kRes).then([](float v) {
+            return v;
+        });
+        auto p2 = QtPromise::resolve(kRes).then([](const float& v) {
+            return v;
+        });
 
         QCOMPARE(waitForValue(p0, kFail), kRes);
         QCOMPARE(waitForValue(p1, kFail), kRes);
diff --git a/tests/auto/qtpromise/qpromise/tst_timeout.cpp b/tests/auto/qtpromise/qpromise/tst_timeout.cpp
index b943883..fd62ed0 100644
--- a/tests/auto/qtpromise/qpromise/tst_timeout.cpp
+++ b/tests/auto/qtpromise/qpromise/tst_timeout.cpp
@@ -39,12 +39,13 @@ void tst_qpromise_timeout::fulfilled()
     timer.start();
 
     auto p = QPromise<int>{[](const QPromiseResolve<int>& resolve) {
-        QTimer::singleShot(1000, [=]() {
-            resolve(42);
-        });
-    }}.timeout(2000).finally([&]() {
-        elapsed = timer.elapsed();
-    });
+                 QTimer::singleShot(1000, [=]() {
+                     resolve(42);
+                 });
+             }}.timeout(2000)
+                 .finally([&]() {
+                     elapsed = timer.elapsed();
+                 });
 
     QCOMPARE(waitForValue(p, -1), 42);
     QCOMPARE(p.isFulfilled(), true);
@@ -59,13 +60,13 @@ void tst_qpromise_timeout::rejected()
     timer.start();
 
     auto p = QPromise<int>{[](const QPromiseResolve<int>&, const QPromiseReject<int>& reject) {
-        QTimer::singleShot(1000, [=]() {
-            reject(QString{"foo"});
-        });
-    }}.timeout(2000).finally([&]() {
-        elapsed = timer.elapsed();
-    });
-
+                 QTimer::singleShot(1000, [=]() {
+                     reject(QString{"foo"});
+                 });
+             }}.timeout(2000)
+                 .finally([&]() {
+                     elapsed = timer.elapsed();
+                 });
 
     QCOMPARE(waitForError(p, QString{}), QString{"foo"});
     QCOMPARE(p.isRejected(), true);
@@ -81,17 +82,18 @@ void tst_qpromise_timeout::timeout()
     timer.start();
 
     auto p = QPromise<int>{[](const QPromiseResolve<int>& resolve) {
-        QTimer::singleShot(4000, [=]() {
-            resolve(42);
-        });
-    }}.timeout(2000).finally([&]() {
-        elapsed = timer.elapsed();
-    });
+                 QTimer::singleShot(4000, [=]() {
+                     resolve(42);
+                 });
+             }}.timeout(2000)
+                 .finally([&]() {
+                     elapsed = timer.elapsed();
+                 });
 
     p.fail([&](const QPromiseTimeoutException&) {
-        failed = true;
-        return -1;
-    }).wait();
+         failed = true;
+         return -1;
+     }).wait();
 
     QCOMPARE(waitForValue(p, -1), -1);
     QCOMPARE(p.isRejected(), true);
@@ -112,12 +114,13 @@ void tst_qpromise_timeout::fulfilledStdChrono()
     timer.start();
 
     auto p = QPromise<int>{[](const QPromiseResolve<int>& resolve) {
-        QTimer::singleShot(1000, [=]() {
-            resolve(42);
-        });
-    }}.timeout(std::chrono::seconds{2}).finally([&]() {
-        elapsed = timer.elapsed();
-    });
+                 QTimer::singleShot(1000, [=]() {
+                     resolve(42);
+                 });
+             }}.timeout(std::chrono::seconds{2})
+                 .finally([&]() {
+                     elapsed = timer.elapsed();
+                 });
 
     QCOMPARE(waitForValue(p, -1), 42);
     QCOMPARE(p.isFulfilled(), true);
@@ -132,13 +135,13 @@ void tst_qpromise_timeout::rejectedStdChrono()
     timer.start();
 
     auto p = QPromise<int>{[](const QPromiseResolve<int>&, const QPromiseReject<int>& reject) {
-        QTimer::singleShot(1000, [=]() {
-            reject(QString{"foo"});
-        });
-    }}.timeout(std::chrono::seconds{2}).finally([&]() {
-        elapsed = timer.elapsed();
-    });
-
+                 QTimer::singleShot(1000, [=]() {
+                     reject(QString{"foo"});
+                 });
+             }}.timeout(std::chrono::seconds{2})
+                 .finally([&]() {
+                     elapsed = timer.elapsed();
+                 });
 
     QCOMPARE(waitForError(p, QString{}), QString{"foo"});
     QCOMPARE(p.isRejected(), true);
@@ -154,17 +157,18 @@ void tst_qpromise_timeout::timeoutStdChrono()
     timer.start();
 
     auto p = QPromise<int>{[](const QPromiseResolve<int>& resolve) {
-        QTimer::singleShot(4000, [=]() {
-            resolve(42);
-        });
-    }}.timeout(std::chrono::seconds{2}).finally([&]() {
-        elapsed = timer.elapsed();
-    });
+                 QTimer::singleShot(4000, [=]() {
+                     resolve(42);
+                 });
+             }}.timeout(std::chrono::seconds{2})
+                 .finally([&]() {
+                     elapsed = timer.elapsed();
+                 });
 
     p.fail([&](const QPromiseTimeoutException&) {
-        failed = true;
-        return -1;
-    }).wait();
+         failed = true;
+         return -1;
+     }).wait();
 
     QCOMPARE(waitForValue(p, -1), -1);
     QCOMPARE(p.isRejected(), true);
diff --git a/tests/auto/qtpromise/requirements/tst_requirements.cpp b/tests/auto/qtpromise/requirements/tst_requirements.cpp
index 16a92b6..83a31f3 100644
--- a/tests/auto/qtpromise/requirements/tst_requirements.cpp
+++ b/tests/auto/qtpromise/requirements/tst_requirements.cpp
@@ -18,18 +18,18 @@ class tst_requirements : public QObject
 private Q_SLOTS:
 
     // 2.1. Promise States
-    void statePending();        // 2.1.1.
-    void stateFulfilled();      // 2.1.2.
-    void stateRejected();       // 2.1.3.
+    void statePending();   // 2.1.1.
+    void stateFulfilled(); // 2.1.2.
+    void stateRejected();  // 2.1.3.
 
     // 2.2. The then Method
-    void thenArguments();       // 2.2.1.
-    void thenOnFulfilled();     // 2.2.2.
-    void thenOnRejected();      // 2.2.3.
-    void thenAsynchronous();    // 2.2.4.
-                                // 2.2.5. NOT APPLICABLE
-    void thenMultipleCalls();   // 2.2.6.
-    void thenHandlers();        // 2.2.7.
+    void thenArguments();     // 2.2.1.
+    void thenOnFulfilled();   // 2.2.2.
+    void thenOnRejected();    // 2.2.3.
+    void thenAsynchronous();  // 2.2.4.
+                              // 2.2.5. NOT APPLICABLE
+    void thenMultipleCalls(); // 2.2.6.
+    void thenHandlers();      // 2.2.7.
 
     // 2.3. The Promise Resolution Procedure
 
@@ -44,7 +44,9 @@ void tst_requirements::statePending()
     // 2.1.1.1. may transition to either the fulfilled state
     {
         QPromise<int> p{[&](const QPromiseResolve<int>& resolve) {
-            QtPromisePrivate::qtpromise_defer([=]() { resolve(42); });
+            QtPromisePrivate::qtpromise_defer([=]() {
+                resolve(42);
+            });
         }};
 
         QVERIFY(p.isPending());
@@ -59,9 +61,11 @@ void tst_requirements::statePending()
     }
 
     // 2.1.1.1. ... or the rejected state
-   {
+    {
         QPromise<int> p{[&](const QPromiseResolve<int>&, const QPromiseReject<int>& reject) {
-            QtPromisePrivate::qtpromise_defer([=]() { reject(QString{"foo"}); });
+            QtPromisePrivate::qtpromise_defer([=]() {
+                reject(QString{"foo"});
+            });
         }};
 
         QVERIFY(p.isPending());
@@ -82,9 +86,7 @@ void tst_requirements::stateFulfilled()
     int value = -1;
 
     // 2.1.2. When fulfilled, a promise:
-    QPromise<int> p{[](
-        const QPromiseResolve<int>& resolve,
-        const QPromiseReject<int>& reject) {
+    QPromise<int> p{[](const QPromiseResolve<int>& resolve, const QPromiseReject<int>& reject) {
         QtPromisePrivate::qtpromise_defer([=]() {
             // 2.1.2.2. must have a value, which must not change.
             resolve(42);
@@ -97,11 +99,14 @@ void tst_requirements::stateFulfilled()
 
     QVERIFY(p.isPending());
 
-    p.then([&](int res) {
-        value = res;
-    }, [&](const QString& err) {
-        error = err;
-    }).wait();
+    p.then(
+         [&](int res) {
+             value = res;
+         },
+         [&](const QString& err) {
+             error = err;
+         })
+        .wait();
 
     QVERIFY(p.isFulfilled());
     QVERIFY(!p.isRejected());
@@ -115,9 +120,7 @@ void tst_requirements::stateRejected()
     int value = -1;
 
     // 2.1.3 When rejected, a promise:
-    QPromise<int> p{[](
-        const QPromiseResolve<int>& resolve,
-        const QPromiseReject<int>& reject) {
+    QPromise<int> p{[](const QPromiseResolve<int>& resolve, const QPromiseReject<int>& reject) {
         QtPromisePrivate::qtpromise_defer([=]() {
             // 2.1.3.2. must have a reason, which must not change.
             reject(QString{"foo"});
@@ -130,11 +133,14 @@ void tst_requirements::stateRejected()
 
     QVERIFY(p.isPending());
 
-    p.then([&](int res) {
-        value = res;
-    }, [&](const QString& err) {
-        error = err;
-    }).wait();
+    p.then(
+         [&](int res) {
+             value = res;
+         },
+         [&](const QString& err) {
+             error = err;
+         })
+        .wait();
 
     QVERIFY(!p.isFulfilled());
     QVERIFY(p.isRejected());
@@ -148,10 +154,15 @@ void tst_requirements::thenArguments()
     {
         QString error;
         int value = -1;
-        QPromise<int>::resolve(42).then(
-            [&](int res) { value = res; },
-            [&](const QString& err) { error = err; }
-        ).wait();
+        QPromise<int>::resolve(42)
+            .then(
+                [&](int res) {
+                    value = res;
+                },
+                [&](const QString& err) {
+                    error = err;
+                })
+            .wait();
 
         QVERIFY(error.isEmpty());
         QCOMPARE(value, 42);
@@ -159,10 +170,15 @@ void tst_requirements::thenArguments()
     {
         QString error;
         int value = -1;
-        QPromise<int>::reject(QString{"foo"}).then(
-            [&](int res) { value = res; },
-            [&](const QString& err){ error = err; }
-        ).wait();
+        QPromise<int>::reject(QString{"foo"})
+            .then(
+                [&](int res) {
+                    value = res;
+                },
+                [&](const QString& err) {
+                    error = err;
+                })
+            .wait();
 
         QCOMPARE(error, QString{"foo"});
         QCOMPARE(value, -1);
@@ -171,10 +187,13 @@ void tst_requirements::thenArguments()
     // 2.2.1. onFulfilled is an optional arguments:
     {
         QString error;
-        QPromise<int>::reject(QString{"foo"}).then(
-            nullptr,
-            [&](const QString& err){ error = err; return 42; }
-        ).wait();
+        QPromise<int>::reject(QString{"foo"})
+            .then(nullptr,
+                  [&](const QString& err) {
+                      error = err;
+                      return 42;
+                  })
+            .wait();
 
         QCOMPARE(error, QString{"foo"});
     }
@@ -182,9 +201,11 @@ void tst_requirements::thenArguments()
     // 2.2.1. onRejected is an optional arguments:
     {
         int value = -1;
-        QPromise<int>::resolve(42).then(
-            [&value](int res) { value = res; }
-        ).wait();
+        QPromise<int>::resolve(42)
+            .then([&value](int res) {
+                value = res;
+            })
+            .wait();
 
         QCOMPARE(value, 42);
     }
@@ -206,7 +227,9 @@ void tst_requirements::thenOnFulfilled()
         });
     }};
 
-    auto p1 = p0.then([&](int res) { values << res; });
+    auto p1 = p0.then([&](int res) {
+        values << res;
+    });
 
     // 2.2.2.2. it must not be called before promise is fulfilled.
     QVERIFY(p0.isPending());
@@ -234,7 +257,9 @@ void tst_requirements::thenOnRejected()
         });
     }};
 
-    auto p1 = p0.then(nullptr, [&](const QString& err) { errors << err; });
+    auto p1 = p0.then(nullptr, [&](const QString& err) {
+        errors << err;
+    });
 
     // 2.2.3.2. it must not be called before promise is rejected.
     QVERIFY(p0.isPending());
@@ -260,7 +285,9 @@ void tst_requirements::thenAsynchronous()
     auto p0 = QPromise<int>::resolve(42);
     QVERIFY(p0.isFulfilled());
 
-    auto p1 = p0.then([&](int res){ value = res; });
+    auto p1 = p0.then([&](int res) {
+        value = res;
+    });
     QVERIFY(p1.isPending());
     QCOMPARE(value, -1);
 
@@ -283,11 +310,16 @@ void tst_requirements::thenMultipleCalls()
             });
         }};
 
-        QtPromise::all(QVector<QPromise<void>>{
-            p.then([&](int r) { values << r + 1; }),
-            p.then([&](int r) { values << r + 2; }),
-            p.then([&](int r) { values << r + 3; })
-        }).wait();
+        QtPromise::all(QVector<QPromise<void>>{p.then([&](int r) {
+                                                   values << r + 1;
+                                               }),
+                                               p.then([&](int r) {
+                                                   values << r + 2;
+                                               }),
+                                               p.then([&](int r) {
+                                                   values << r + 3;
+                                               })})
+            .wait();
 
         QCOMPARE(values, (QVector<int>{43, 44, 45}));
     }
@@ -302,11 +334,22 @@ void tst_requirements::thenMultipleCalls()
             });
         }};
 
-        QtPromise::all(QVector<QPromise<int>>{
-            p.then(nullptr, [&](int r) { values << r + 1; return r + 1; }),
-            p.then(nullptr, [&](int r) { values << r + 2; return r + 2; }),
-            p.then(nullptr, [&](int r) { values << r + 3; return r + 3; })
-        }).wait();
+        QtPromise::all(QVector<QPromise<int>>{p.then(nullptr,
+                                                     [&](int r) {
+                                                         values << r + 1;
+                                                         return r + 1;
+                                                     }),
+                                              p.then(nullptr,
+                                                     [&](int r) {
+                                                         values << r + 2;
+                                                         return r + 2;
+                                                     }),
+                                              p.then(nullptr,
+                                                     [&](int r) {
+                                                         values << r + 3;
+                                                         return r + 3;
+                                                     })})
+            .wait();
 
         QCOMPARE(values, (QVector<int>{9, 10, 11}));
     }
@@ -316,7 +359,9 @@ void tst_requirements::thenHandlers()
 {
     // 2.2.7. then must return a promise: p2 = p1.then(onFulfilled, onRejected);
     {
-        auto handler = [](){ return 42; };
+        auto handler = []() {
+            return 42;
+        };
         auto p1 = QPromise<int>::resolve(42);
         Q_STATIC_ASSERT((std::is_same<decltype(p1.then(handler, nullptr)), QPromise<int>>::value));
         Q_STATIC_ASSERT((std::is_same<decltype(p1.then(nullptr, handler)), QPromise<int>>::value));
@@ -331,8 +376,12 @@ void tst_requirements::thenHandlers()
     {
         QString reason;
         auto p1 = QPromise<int>::resolve(42);
-        auto p2 = p1.then([](){ throw QString{"foo"}; });
-        p2.then(nullptr, [&](const QString& e) { reason = e; }).wait();
+        auto p2 = p1.then([]() {
+            throw QString{"foo"};
+        });
+        p2.then(nullptr, [&](const QString& e) {
+              reason = e;
+          }).wait();
 
         QVERIFY(p1.isFulfilled());
         QVERIFY(p2.isRejected());
@@ -341,8 +390,14 @@ void tst_requirements::thenHandlers()
     {
         QString reason;
         auto p1 = QPromise<int>::reject(QString{"foo"});
-        auto p2 = p1.then(nullptr, [](){ throw QString{"bar"}; return 42; });
-        p2.then(nullptr, [&](const QString& e) { reason = e; return 0; }).wait();
+        auto p2 = p1.then(nullptr, []() {
+            throw QString{"bar"};
+            return 42;
+        });
+        p2.then(nullptr, [&](const QString& e) {
+              reason = e;
+              return 0;
+          }).wait();
 
         QVERIFY(p1.isRejected());
         QVERIFY(p2.isRejected());
@@ -354,9 +409,13 @@ void tst_requirements::thenHandlers()
     {
         QString value;
         auto p1 = QPromise<QString>::resolve("42");
-        auto p2 = p1.then(nullptr, [](){ return QString{}; });
+        auto p2 = p1.then(nullptr, []() {
+            return QString{};
+        });
         Q_STATIC_ASSERT((std::is_same<decltype(p2), QPromise<QString>>::value));
-        p2.then([&](const QString& e) { value = e; }).wait();
+        p2.then([&](const QString& e) {
+              value = e;
+          }).wait();
 
         QVERIFY(p1.isFulfilled());
         QVERIFY(p2.isFulfilled());
diff --git a/tests/auto/qtpromise/shared/data.h b/tests/auto/qtpromise/shared/data.h
index 612d7c4..13d9b07 100644
--- a/tests/auto/qtpromise/shared/data.h
+++ b/tests/auto/qtpromise/shared/data.h
@@ -10,13 +10,15 @@
 
 #include <utility>
 
-struct Logs {
+struct Logs
+{
     int ctor = 0;
     int copy = 0;
     int move = 0;
     int refs = 0;
 
-    void reset() {
+    void reset()
+    {
         ctor = 0;
         copy = 0;
         move = 0;
@@ -26,21 +28,45 @@ struct Logs {
 
 struct Logger
 {
-    Logger() { logs().ctor++; logs().refs++; }
-    Logger(const Logger&) { logs().copy++; logs().refs++; }
-    Logger(Logger&&) { logs().move++; logs().refs++; }
+    Logger()
+    {
+        logs().ctor++;
+        logs().refs++;
+    }
+    Logger(const Logger&)
+    {
+        logs().copy++;
+        logs().refs++;
+    }
+    Logger(Logger&&)
+    {
+        logs().move++;
+        logs().refs++;
+    }
     ~Logger() { logs().refs--; }
 
-    Logger& operator=(const Logger&) { logs().copy++; return *this; }
-    Logger& operator=(Logger&&) { logs().move++; return *this; }
+    Logger& operator=(const Logger&)
+    {
+        logs().copy++;
+        return *this;
+    }
+    Logger& operator=(Logger&&)
+    {
+        logs().move++;
+        return *this;
+    }
 
 public: // STATICS
-    static Logs& logs() { static Logs logs; return logs; }
+    static Logs& logs()
+    {
+        static Logs logs;
+        return logs;
+    }
 };
 
 struct Data : public Logger
 {
-    Data(int v) : Logger{}, m_value{v} {}
+    Data(int v) : Logger{}, m_value{v} { }
     int value() const { return m_value; }
 
     // MSVC 2013 doesn't support implicit generation of the move constructor and
@@ -48,15 +74,9 @@ struct Data : public Logger
     // constructor and operator also need to be explicitly defined (error C2280).
     // https://stackoverflow.com/a/26581337
 
-    Data(const Data& other)
-        : Logger{other}
-        , m_value{other.m_value}
-    { }
+    Data(const Data& other) : Logger{other}, m_value{other.m_value} { }
 
-    Data(Data&& other) : Logger{std::forward<Data>(other)}
-    {
-        std::swap(m_value, other.m_value);
-    }
+    Data(Data&& other) : Logger{std::forward<Data>(other)} { std::swap(m_value, other.m_value); }
 
     Data& operator=(const Data& other)
     {
diff --git a/tests/auto/qtpromise/shared/utils.h b/tests/auto/qtpromise/shared/utils.h
index ce27787..d86b490 100644
--- a/tests/auto/qtpromise/shared/utils.h
+++ b/tests/auto/qtpromise/shared/utils.h
@@ -10,54 +10,65 @@
 
 #include <QtPromise>
 
-template <typename T>
+template<typename T>
 static inline T waitForValue(const QtPromise::QPromise<T>& promise, const T& initial)
 {
     T value(initial);
-    promise.then([&](const T& res) {
-        value = res;
-    }).wait();
+    promise
+        .then([&](const T& res) {
+            value = res;
+        })
+        .wait();
     return value;
 }
 
-template <typename T>
-static inline T waitForValue(const QtPromise::QPromise<void>& promise, const T& initial, const T& expected)
+template<typename T>
+static inline T
+waitForValue(const QtPromise::QPromise<void>& promise, const T& initial, const T& expected)
 {
     T value(initial);
-    promise.then([&]() {
-        value = expected;
-    }).wait();
+    promise
+        .then([&]() {
+            value = expected;
+        })
+        .wait();
     return value;
 }
 
-template <typename T, typename E>
+template<typename T, typename E>
 static inline E waitForError(const QtPromise::QPromise<T>& promise, const E& initial)
 {
     E error(initial);
-    promise.fail([&](const E& err) {
-        error = err;
-        return T();
-    }).wait();
+    promise
+        .fail([&](const E& err) {
+            error = err;
+            return T();
+        })
+        .wait();
     return error;
 }
 
-template <typename E>
+template<typename E>
 static inline E waitForError(const QtPromise::QPromise<void>& promise, const E& initial)
 {
     E error(initial);
-    promise.fail([&](const E& err) {
-        error = err;
-    }).wait();
+    promise
+        .fail([&](const E& err) {
+            error = err;
+        })
+        .wait();
     return error;
 }
 
-template <typename E, typename T>
+template<typename E, typename T>
 static inline bool waitForRejected(const T& promise)
 {
     bool result = false;
-    promise.tapFail([&](const E&) {
-        result = true;
-    }).wait();
+    promise
+        .tapFail([&](const E&) {
+            result = true;
+        })
+        .wait();
     return result;
 }
 
diff --git a/tests/auto/qtpromise/thread/tst_thread.cpp b/tests/auto/qtpromise/thread/tst_thread.cpp
index 7ed3dbe..74dacd6 100644
--- a/tests/auto/qtpromise/thread/tst_thread.cpp
+++ b/tests/auto/qtpromise/thread/tst_thread.cpp
@@ -40,10 +40,12 @@ void tst_thread::resolve()
             source = QThread::currentThread();
             resolve(42);
         });
-    }}.then([&](int res) {
-        target = QThread::currentThread();
-        value = res;
-    }).wait();
+    }}
+        .then([&](int res) {
+            target = QThread::currentThread();
+            value = res;
+        })
+        .wait();
 
     QVERIFY(source != nullptr);
     QVERIFY(source != target);
@@ -62,10 +64,12 @@ void tst_thread::resolve_void()
             source = QThread::currentThread();
             resolve();
         });
-    }}.then([&]() {
-        target = QThread::currentThread();
-        value = 43;
-    }).wait();
+    }}
+        .then([&]() {
+            target = QThread::currentThread();
+            value = 43;
+        })
+        .wait();
 
     QVERIFY(source != nullptr);
     QVERIFY(source != target);
@@ -84,11 +88,13 @@ void tst_thread::reject()
             source = QThread::currentThread();
             reject(QString{"foo"});
         });
-    }}.fail([&](const QString& err) {
-        target = QThread::currentThread();
-        error = err;
-        return -1;
-    }).wait();
+    }}
+        .fail([&](const QString& err) {
+            target = QThread::currentThread();
+            error = err;
+            return -1;
+        })
+        .wait();
 
     QVERIFY(source != nullptr);
     QVERIFY(source != target);
@@ -106,12 +112,15 @@ void tst_thread::then()
 
     int value = -1;
     QThread* target = nullptr;
-    QtPromise::resolve(QtConcurrent::run([&](const QPromise<int>& p) {
-        p.then([&](int res) {
-            target = QThread::currentThread();
-            value = res;
-        }).wait();
-    }, p)).wait();
+    QtPromise::resolve(QtConcurrent::run(
+                           [&](const QPromise<int>& p) {
+                               p.then([&](int res) {
+                                    target = QThread::currentThread();
+                                    value = res;
+                                }).wait();
+                           },
+                           p))
+        .wait();
 
     QVERIFY(target != nullptr);
     QVERIFY(source != target);
@@ -129,12 +138,15 @@ void tst_thread::then_void()
 
     int value = -1;
     QThread* target = nullptr;
-    QtPromise::resolve(QtConcurrent::run([&](const QPromise<void>& p) {
-        p.then([&]() {
-            target = QThread::currentThread();
-            value = 43;
-        }).wait();
-    }, p)).wait();
+    QtPromise::resolve(QtConcurrent::run(
+                           [&](const QPromise<void>& p) {
+                               p.then([&]() {
+                                    target = QThread::currentThread();
+                                    value = 43;
+                                }).wait();
+                           },
+                           p))
+        .wait();
 
     QVERIFY(target != nullptr);
     QVERIFY(source != target);
@@ -152,13 +164,16 @@ void tst_thread::fail()
 
     QString error;
     QThread* target = nullptr;
-    QtPromise::resolve(QtConcurrent::run([&](const QPromise<int>& p) {
-        p.fail([&](const QString& err) {
-            target = QThread::currentThread();
-            error = err;
-            return -1;
-        }).wait();
-    }, p)).wait();
+    QtPromise::resolve(QtConcurrent::run(
+                           [&](const QPromise<int>& p) {
+                               p.fail([&](const QString& err) {
+                                    target = QThread::currentThread();
+                                    error = err;
+                                    return -1;
+                                }).wait();
+                           },
+                           p))
+        .wait();
 
     QVERIFY(target != nullptr);
     QVERIFY(source != target);
@@ -176,12 +191,15 @@ void tst_thread::finally()
 
     int value = -1;
     QThread* target = nullptr;
-    QtPromise::resolve(QtConcurrent::run([&](const QPromise<int>& p) {
-        p.finally([&]() {
-            target = QThread::currentThread();
-            value = 43;
-        }).wait();
-    }, p)).wait();
+    QtPromise::resolve(QtConcurrent::run(
+                           [&](const QPromise<int>& p) {
+                               p.finally([&]() {
+                                    target = QThread::currentThread();
+                                    value = 43;
+                                }).wait();
+                           },
+                           p))
+        .wait();
 
     QVERIFY(target != nullptr);
     QVERIFY(source != target);