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 272945f06b631ef273d0c9659015af2023c7d13c..5517337cd1c45aa85dc1395c59f6270036d45ba1 100644 (file)
--- 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 9a6ef5fce9e83247c91f598b4ce8269ccf117972..91d160e90fdcc2d1982af235a004c2d1aa028b3b 100644 (file)
--- 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 bf39a96e361ef138c32c7213dd35623b381382b9..c34381c67de0699eee4b1ea1024611ba34d4eec9 100644 (file)
--- 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();
 }
 }
 }