From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Wed, 26 Jul 2017 18:52:29 +0000 (-0700)
Subject: Cut moveFromTry
X-Git-Tag: v2017.07.31.00~20
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1dd8e3878e8e3c3fa82e92f24eda677636200a04;p=folly.git

Cut moveFromTry

Summary: [Folly] Cut `moveFromTry`. Not necessary, and is even longer than `std::move`.

Reviewed By: WillerZ, ericniebler

Differential Revision: D5478450

fbshipit-source-id: ecd01cb1bcd435e49268a76dd558e57ba8dd9b9e
---

diff --git a/folly/Try-inl.h b/folly/Try-inl.h
index 272945f0..5517337c 100644
--- a/folly/Try-inl.h
+++ b/folly/Try-inl.h
@@ -133,15 +133,6 @@ void Try<void>::throwIfFailed() const {
   }
 }
 
-template <typename T>
-inline T moveFromTry(Try<T>& t) {
-  return std::move(t.value());
-}
-
-inline void moveFromTry(Try<void>& t) {
-  return t.value();
-}
-
 template <typename F>
 typename std::enable_if<
   !std::is_same<typename std::result_of<F()>::type, void>::value,
diff --git a/folly/Try.h b/folly/Try.h
index 9a6ef5fc..91d160e9 100644
--- a/folly/Try.h
+++ b/folly/Try.h
@@ -478,23 +478,6 @@ class Try<void> {
   exception_wrapper e_;
 };
 
-/*
- * Extracts value from try and returns it. Throws if try contained an exception.
- *
- * @param t Try to extract value from
- *
- * @returns value contained in t
- */
-template <typename T>
-T moveFromTry(Try<T>& t);
-
-/*
- * Throws if try contained an exception.
- *
- * @param t Try to move from
- */
-void moveFromTry(Try<void>& t);
-
 /*
  * @param f a function to execute and capture the result of (value or exception)
  *
diff --git a/folly/fibers/Promise-inl.h b/folly/fibers/Promise-inl.h
index bf39a96e..c34381c6 100644
--- a/folly/fibers/Promise-inl.h
+++ b/folly/fibers/Promise-inl.h
@@ -110,7 +110,7 @@ typename Promise<T, BatonT>::value_type Promise<T, BatonT>::await(F&& func) {
     std::rethrow_exception(funcException);
   }
 
-  return folly::moveFromTry(result);
+  return std::move(result).value();
 }
 }
 }