From 55f34d09f58adb31ff758883a6ce2c867f48584f Mon Sep 17 00:00:00 2001
From: Hans Fugal <fugalh@fb.com>
Date: Tue, 13 Oct 2015 14:20:21 -0700
Subject: [PATCH] (folly) have Try::moveFromTry take an lvalue

Summary: This is a case of having to say what you're doing twice, and it's unnecessary.
This change should not break anything as calling `std::move(lvalue)` where an
lvalue reference is expected will just be superfluous.

Reviewed By: @jsedgwick

Differential Revision: D2534944

fb-gh-sync-id: fdcd168f369d95b0f28abe23b401b4321f51fc36
---
 folly/experimental/fibers/FiberManager-inl.h | 2 +-
 folly/futures/Try-inl.h                      | 4 ++--
 folly/futures/Try.h                          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/folly/experimental/fibers/FiberManager-inl.h b/folly/experimental/fibers/FiberManager-inl.h
index 5b57c855..8df38576 100644
--- a/folly/experimental/fibers/FiberManager-inl.h
+++ b/folly/experimental/fibers/FiberManager-inl.h
@@ -519,7 +519,7 @@ inline await(F&& func) {
       func(Promise<Result>(result, baton));
     });
 
-  return folly::moveFromTry(std::move(result));
+  return folly::moveFromTry(result);
 }
 
 }}
diff --git a/folly/futures/Try-inl.h b/folly/futures/Try-inl.h
index 05f384a8..c6673cb8 100644
--- a/folly/futures/Try-inl.h
+++ b/folly/futures/Try-inl.h
@@ -131,11 +131,11 @@ void Try<void>::throwIfFailed() const {
 }
 
 template <typename T>
-inline T moveFromTry(Try<T>&& t) {
+inline T moveFromTry(Try<T>& t) {
   return std::move(t.value());
 }
 
-inline void moveFromTry(Try<void>&& t) {
+inline void moveFromTry(Try<void>& t) {
   return t.value();
 }
 
diff --git a/folly/futures/Try.h b/folly/futures/Try.h
index e5e38afb..beec20a2 100644
--- a/folly/futures/Try.h
+++ b/folly/futures/Try.h
@@ -350,14 +350,14 @@ class Try<void> {
  * @returns value contained in t
  */
 template <typename T>
-T moveFromTry(Try<T>&& t);
+T moveFromTry(Try<T>& t);
 
 /*
  * Throws if try contained an exception.
  *
  * @param t Try to move from
  */
-void moveFromTry(Try<void>&& t);
+void moveFromTry(Try<void>& t);
 
 /*
  * @param f a function to execute and capture the result of (value or exception)
-- 
2.34.1