beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-29 16:21:29 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibCore: Fix compilation of infallible Promise::when_resolved handlers

Browse source 
This overload is currently unused. When used, it doesn't compile due to
mismatched return types in the handler provided to the function and the
type of `on_resolution`.
This commit is contained in:
Timothy Flynn 2023-12-31 09:40:43 -05:00 committed by Andreas Kling
parent 75e60d3a68
commit c190294a76
Notes: sideshowbarker 2024-07-17 08:13:43 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/c190294a76
Pull-request: https://github.com/SerenityOS/serenity/pull/22519
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Tests/LibCore/TestLibCorePromise.cpp
View file

@ -61,6 +61,26 @@ TEST_CASE(promise_chain_handlers)
EXPECT(!rejected); EXPECT(!rejected);
} }
TEST_CASE(infallible_promise_chain_handlers)
{
Core::EventLoop loop;
bool resolved = false;
bool rejected = false;
NonnullRefPtr<Core::Promise<int>> promise = MUST(Core::Promise<int>::try_create())
->when_resolved([&](int&) { resolved = true; })
.when_rejected([&](AK::Error const&) { rejected = true; });
loop.deferred_invoke([=] {
promise->resolve(42);
});
(void)promise->await();
EXPECT(resolved);
EXPECT(!rejected);
}
TEST_CASE(promise_map) TEST_CASE(promise_map)
{ {
Core::EventLoop loop; Core::EventLoop loop;

11
Userland/Libraries/LibCore/Promise.h
View file

@ -82,13 +82,10 @@ public:
template<CallableAs<void, Result&> F> template<CallableAs<void, Result&> F>
Promise& when_resolved(F handler) Promise& when_resolved(F handler)
{ {
on_resolution = [handler = move(handler)](Result& result) { return handler(result); }; return when_resolved([handler = move(handler)](Result& result) -> ErrorOr<void> {
if (is_resolved()) { handler(result);
auto handler_result = on_resolution(m_result_or_rejection->value()); return {};
possibly_handle_rejection(handler_result); });
}
return *this;
} }
template<CallableAs<ErrorOr<void>, Result&> F> template<CallableAs<ErrorOr<void>, Result&> F>