makeFutureTry -> makeFutureWith

Summary: Similar to Promise::fulfil -> setWith change, this name is a lot clearer

Test Plan: tests

Reviewed By: hans@fb.com

Subscribers: netego-diffs@, fugalh, mwa, jgehring, fuegen, folly-diffs@, tingy, jsedgwick, yfeldblum, chalfant

FB internal diff: D2013124

Tasks: 6837405

Signature: t1:2013124:1429735106:e8861925dfeb6d7f0662c1057cbcf2ad8dcf008c

diff --git a/folly/futures/Future-inl.h b/folly/futures/Future-inl.h
index 5604ed06e953925c5d8233764fc4ec9f0cadcb61..135440a9e1ebfc49569c54bcb492c0884fb04833 100644 (file)
--- a/folly/futures/Future-inl.h
+++ b/folly/futures/Future-inl.h
@@ -469,7 +469,7 @@ Future<void> makeFuture() {
 }
 
 template <class F>
-auto makeFutureTry(
+auto makeFutureWith(
     F&& func,
     typename std::enable_if<!std::is_reference<F>::value, bool>::type sdf)
     -> Future<decltype(func())> {
@@ -482,9 +482,9 @@ auto makeFutureTry(
 }
 
 template <class F>
-auto makeFutureTry(F const& func) -> Future<decltype(func())> {
+auto makeFutureWith(F const& func) -> Future<decltype(func())> {
   F copy = func;
-  return makeFutureTry(std::move(copy));
+  return makeFutureWith(std::move(copy));
 }
 
 template <class T>

diff --git a/folly/futures/Future.h b/folly/futures/Future.h
index 8e2b3f1ee4d024c924fcc63b8fd055e8ba695a56..683c3cbbda985aeb1e949f51974be026fa2e53ce 100644 (file)
--- a/folly/futures/Future.h
+++ b/folly/futures/Future.h
@@ -581,14 +581,14 @@ Future<void> makeFuture();
 /** Make a completed Future by executing a function. If the function throws
   we capture the exception, otherwise we capture the result. */
 template <class F>
-auto makeFutureTry(
+auto makeFutureWith(
   F&& func,
   typename std::enable_if<
     !std::is_reference<F>::value, bool>::type sdf = false)
   -> Future<decltype(func())>;
 
 template <class F>
-auto makeFutureTry(
+auto makeFutureWith(
   F const& func)
   -> Future<decltype(func())>;
 

diff --git a/folly/futures/test/FutureTest.cpp b/folly/futures/test/FutureTest.cpp
index ad99f3fdb3c47389773d864a24e24636302a8ac7..da3e1c5cd17d323e0a6af8696657354b732b2087 100644 (file)
--- a/folly/futures/test/FutureTest.cpp
+++ b/folly/futures/test/FutureTest.cpp
@@ -536,12 +536,12 @@ TEST(Future, makeFuture) {
   EXPECT_EQ(42, makeFuture<float>(42).value());
 
   auto fun = [] { return 42; };
-  EXPECT_TYPE(makeFutureTry(fun), Future<int>);
-  EXPECT_EQ(42, makeFutureTry(fun).value());
+  EXPECT_TYPE(makeFutureWith(fun), Future<int>);
+  EXPECT_EQ(42, makeFutureWith(fun).value());
 
   auto failfun = []() -> int { throw eggs; };
-  EXPECT_TYPE(makeFutureTry(failfun), Future<int>);
-  EXPECT_THROW(makeFutureTry(failfun).value(), eggs_t);
+  EXPECT_TYPE(makeFutureWith(failfun), Future<int>);
+  EXPECT_THROW(makeFutureWith(failfun).value(), eggs_t);
 
   EXPECT_TYPE(makeFuture(), Future<void>);
 }

diff --git a/folly/wangle/channel/test/MockChannelHandler.h b/folly/wangle/channel/test/MockChannelHandler.h
index f32fc033611b20667ea6188b48ced01b5512cf80..15b88cb723b2f3b8009a35c3bdf56fea3f0973fa 100644 (file)
--- a/folly/wangle/channel/test/MockChannelHandler.h
+++ b/folly/wangle/channel/test/MockChannelHandler.h
@@ -57,13 +57,13 @@ class MockChannelHandler : public ChannelHandler<Rin, Rout, Win, Wout> {
   }
 
   Future<void> write(Context* ctx, Win msg) override {
-    return makeFutureTry([&](){
+    return makeFutureWith([&](){
       write_(ctx, msg);
     });
   }
 
   Future<void> close(Context* ctx) override {
-    return makeFutureTry([&](){
+    return makeFutureWith([&](){
       close_(ctx);
     });
   }