From: Hans Fugal <fugalh@fb.com>
Date: Fri, 21 Feb 2014 18:33:24 +0000 (-0800)
Subject: s/valueTry/getTry/
X-Git-Tag: v0.22.0~672
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c4b348c318941e5a3940e67ce6e529c9ef03df95;p=folly.git

s/valueTry/getTry/

Summary: This is a better name

Test Plan: unit tests. fbgs shows no external usage of this.

Reviewed By: hannesr@fb.com

FB internal diff: D1184905
---

diff --git a/folly/wangle/Future-inl.h b/folly/wangle/Future-inl.h
index ce9cb7fc..c1da48fe 100644
--- a/folly/wangle/Future-inl.h
+++ b/folly/wangle/Future-inl.h
@@ -178,10 +178,10 @@ typename std::add_lvalue_reference<const T>::type Future<T>::value() const {
 }
 
 template <class T>
-Try<T>& Future<T>::valueTry() {
+Try<T>& Future<T>::getTry() {
   throwIfInvalid();
 
-  return obj_->valueTry();
+  return obj_->getTry();
 }
 
 template <class T>
diff --git a/folly/wangle/Future.h b/folly/wangle/Future.h
index 354a0bae..39b3c0a8 100644
--- a/folly/wangle/Future.h
+++ b/folly/wangle/Future.h
@@ -79,7 +79,8 @@ class Future {
       when this returns true. */
   bool isReady() const;
 
-  Try<T>& valueTry();
+  /** A reference to the Try of the value */
+  Try<T>& getTry();
 
   /** When this Future has completed, execute func which is a function that
     takes a Try<T>&&. A Future for the return type of func is
diff --git a/folly/wangle/detail.h b/folly/wangle/detail.h
index bf85041e..f939cb0d 100644
--- a/folly/wangle/detail.h
+++ b/folly/wangle/detail.h
@@ -40,7 +40,7 @@ class FutureObject {
   FutureObject(FutureObject&&) = delete;
   FutureObject& operator=(FutureObject&&) = delete;
 
-  Try<T>& valueTry() {
+  Try<T>& getTry() {
     return *value_;
   }
 
diff --git a/folly/wangle/test/FutureTest.cpp b/folly/wangle/test/FutureTest.cpp
index 24a318f2..2468c580 100644
--- a/folly/wangle/test/FutureTest.cpp
+++ b/folly/wangle/test/FutureTest.cpp
@@ -108,13 +108,13 @@ TEST(Future, isReady) {
   }
 
 TEST(Future, hasException) {
-  EXPECT_TRUE(makeFuture<int>(eggs).valueTry().hasException());
-  EXPECT_FALSE(makeFuture(42).valueTry().hasException());
+  EXPECT_TRUE(makeFuture<int>(eggs).getTry().hasException());
+  EXPECT_FALSE(makeFuture(42).getTry().hasException());
 }
 
 TEST(Future, hasValue) {
-  EXPECT_TRUE(makeFuture(42).valueTry().hasValue());
-  EXPECT_FALSE(makeFuture<int>(eggs).valueTry().hasValue());
+  EXPECT_TRUE(makeFuture(42).getTry().hasValue());
+  EXPECT_FALSE(makeFuture<int>(eggs).getTry().hasValue());
 }
 
 TEST(Future, makeFuture) {
@@ -329,7 +329,7 @@ TEST(Future, whenAll) {
     promises[3].setException(eggs);
 
     EXPECT_TRUE(allf.isReady());
-    EXPECT_FALSE(allf.valueTry().hasException());
+    EXPECT_FALSE(allf.getTry().hasException());
 
     auto& results = allf.value();
     EXPECT_EQ(42, results[0].value());