facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-04 22:07:44 +03:00
Code Issues Projects Releases Wiki Activity

utils: fix compilation in ImmediateFuture

Browse Source 
Summary:
When the ImmediateFuture is holding a SemiFuture, the compiler complains about
the use of `std::forward`, let's fix that and add few tests to verify that it
now compiles well.

Reviewed By: fanzeyi

Differential Revision: D37861191

fbshipit-source-id: 590f22f1fdbfda7e7106730a7d77ddfd5b08d815
This commit is contained in:
Xavier Deguillard 2022-07-14 13:51:39 -07:00 committed by Facebook GitHub Bot
parent aadf195913
commit 1df7efd261
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eden/fs/utils/ImmediateFuture-inl.h
View File

@ -99,10 +99,10 @@ makeImmediateFutureFromImmediate(Func&& func, Args... args) {
// In the case where Func returns void, force the return value to
// be folly::unit.
if constexpr (std::is_same_v<FuncRetType, void>) {
func(std::forward<Args...>(args...));
func(std::forward<Args>(args)...);
return folly::unit;
} else {
return func(std::forward<Args...>(args...));
return func(std::forward<Args>(args)...);
}
} catch (std::exception& ex) {
return folly::Try<NewType>(

27
eden/fs/utils/test/ImmediateFutureTest.cpp
View File

@ -549,7 +549,30 @@ TEST(ImmediateFuture, thenError) {
TEST(ImmediateFuture, thenErrorVoid) {
ImmediateFuture<folly::Unit> unitFut{folly::unit};
std::move(unitFut).thenError(
auto fut = std::move(unitFut).thenError(
[](folly::exception_wrapper exc) { exc.throw_exception(); });
EXPECT_EQ(std::move(unitFut).get(), folly::unit);
EXPECT_EQ(std::move(fut).get(), folly::unit);
}
TEST(ImmediateFuture, thenErrorSemiValue) {
auto [promise, semiFut] = folly::makePromiseContract<folly::Unit>();
ImmediateFuture<folly::Unit> fut{std::move(semiFut)};
auto thenErrorFut = std::move(fut).thenError(
[](folly::exception_wrapper exc) { exc.throw_exception(); });
promise.setValue(folly::unit);
EXPECT_EQ(std::move(thenErrorFut).get(), folly::unit);
}
TEST(ImmediateFuture, thenErrorSemiError) {
auto [promise, semiFut] = folly::makePromiseContract<folly::Unit>();
ImmediateFuture<folly::Unit> fut{std::move(semiFut)};
auto thenErrorFut =
std::move(fut).thenError([](folly::exception_wrapper exc) {
// Re-throw with a different type so we can test that the original
// exception was caught.
throw std::runtime_error(folly::exceptionStr(exc).toStdString());
});
promise.setException(std::logic_error("Test exception"));
EXPECT_THROW_RE(
std::move(thenErrorFut).get(), std::runtime_error, "Test exception");
}