diff --git a/folly/futures/Future-inl.h b/folly/futures/Future-inl.h index 5604ed0..135440a 100644 --- a/folly/futures/Future-inl.h +++ b/folly/futures/Future-inl.h @@ -469,7 +469,7 @@ Future makeFuture() { } template -auto makeFutureTry( +auto makeFutureWith( F&& func, typename std::enable_if::value, bool>::type sdf) -> Future { @@ -482,9 +482,9 @@ auto makeFutureTry( } template -auto makeFutureTry(F const& func) -> Future { +auto makeFutureWith(F const& func) -> Future { F copy = func; - return makeFutureTry(std::move(copy)); + return makeFutureWith(std::move(copy)); } template diff --git a/folly/futures/Future.h b/folly/futures/Future.h index 8e2b3f1..683c3cb 100644 --- a/folly/futures/Future.h +++ b/folly/futures/Future.h @@ -581,14 +581,14 @@ Future makeFuture(); /** Make a completed Future by executing a function. If the function throws we capture the exception, otherwise we capture the result. */ template -auto makeFutureTry( +auto makeFutureWith( F&& func, typename std::enable_if< !std::is_reference::value, bool>::type sdf = false) -> Future; template -auto makeFutureTry( +auto makeFutureWith( F const& func) -> Future; diff --git a/folly/futures/test/FutureTest.cpp b/folly/futures/test/FutureTest.cpp index ad99f3f..da3e1c5 100644 --- a/folly/futures/test/FutureTest.cpp +++ b/folly/futures/test/FutureTest.cpp @@ -536,12 +536,12 @@ TEST(Future, makeFuture) { EXPECT_EQ(42, makeFuture(42).value()); auto fun = [] { return 42; }; - EXPECT_TYPE(makeFutureTry(fun), Future); - EXPECT_EQ(42, makeFutureTry(fun).value()); + EXPECT_TYPE(makeFutureWith(fun), Future); + EXPECT_EQ(42, makeFutureWith(fun).value()); auto failfun = []() -> int { throw eggs; }; - EXPECT_TYPE(makeFutureTry(failfun), Future); - EXPECT_THROW(makeFutureTry(failfun).value(), eggs_t); + EXPECT_TYPE(makeFutureWith(failfun), Future); + EXPECT_THROW(makeFutureWith(failfun).value(), eggs_t); EXPECT_TYPE(makeFuture(), Future); } diff --git a/folly/wangle/channel/test/MockChannelHandler.h b/folly/wangle/channel/test/MockChannelHandler.h index f32fc03..15b88cb 100644 --- a/folly/wangle/channel/test/MockChannelHandler.h +++ b/folly/wangle/channel/test/MockChannelHandler.h @@ -57,13 +57,13 @@ class MockChannelHandler : public ChannelHandler { } Future write(Context* ctx, Win msg) override { - return makeFutureTry([&](){ + return makeFutureWith([&](){ write_(ctx, msg); }); } Future close(Context* ctx) override { - return makeFutureTry([&](){ + return makeFutureWith([&](){ close_(ctx); }); }