0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibCore: Move the Promise::await() result instead of returning a ref

Browse source 
Returning a reference resulted in Mail's use of Promise causing a crash.
Also, awaiting an already-awaited promise is an odd thing to do anyway,
so let's just make it release the resolved/rejected value instead of
returning a reference to it.

Co-Authored-By: Valtteri Koskivuori <vkoskiv@gmail.com>
This commit is contained in:
Ali Mohammad Pur 2023-07-24 01:41:18 +03:30 • committed by Ali Mohammad Pur
parent 8ed3cc5f7b
commit 9f4feb7315
Notes: sideshowbarker 2024-07-17 00:57:24 +09:00
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Tests/LibCore/TestLibCorePromise.cpp
View file

@ -18,7 +18,7 @@ TEST_CASE(promise_await_async_event)
promise->resolve(42);
});
auto& result = promise->await();
auto result = promise->await();
EXPECT(!result.is_error());
EXPECT_EQ(result.value(), 42);
}
@ -33,7 +33,7 @@ TEST_CASE(promise_await_async_event_rejection)
promise->reject(AK::Error::from_string_literal("lol no"));
});
auto& result = promise->await();
auto result = promise->await();
EXPECT(result.is_error());
EXPECT_EQ(result.error().string_literal(), "lol no"sv);
}
@ -53,7 +53,7 @@ TEST_CASE(promise_chain_handlers)
promise->resolve(42);
});
promise->await();
(void)promise->await();
EXPECT(resolved);
EXPECT(!rejected);
}

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

@ -50,12 +50,12 @@ public:
return m_result_or_rejection.has_value() && !m_result_or_rejection->is_error();
}
ErrorOr<Result, ErrorType>& await()
ErrorOr<Result, ErrorType> await()
{
while (!m_result_or_rejection.has_value())
Core::EventLoop::current().pump();
return *m_result_or_rejection;
return m_result_or_rejection.release_value();
}
// Converts a Promise<A> to a Promise<B> using a function func: A -> B