Move result out of Future instead of copying it

support-lib/cpp/Future.hpp

@@ -56,13 +56,13 @@ template <typename T>
 struct ValueHolder {
     using type = T;
     std::optional<T> value;
-    T getValueUnsafe() const {return *value;}
+    T&& getValueUnsafe() && {return std::move(*value);}
 };
 template <>
 struct ValueHolder<void> {
     using type = bool;
     std::optional<bool> value;
-    void getValueUnsafe() const {}
+    void getValueUnsafe() && {}
 };
 
 template<typename T>
@@ -295,7 +295,7 @@ class Future {
         sharedState->cv.wait(lk, [state = sharedState] {return state->isReady();});
 #endif
         if (!sharedState->exception) {
-            return sharedState->getValueUnsafe();
+            return std::move(*sharedState).getValueUnsafe();
         } else {
             std::rethrow_exception(sharedState->exception);
         }

test-suite/handwritten-src/objc/tests/DBCppFutureTests.mm

@@ -0,0 +1,29 @@
+#import <XCTest/XCTest.h>
+
+#include <Future.hpp>
+
+@interface DBCppFutureTests : XCTestCase
+
+@end
+
+@implementation DBCppFutureTests
+
+- (void)setUp
+{
+    [super setUp];
+}
+
+- (void)tearDown
+{
+    [super tearDown];
+}
+
+- (void)testCppFutureMovesResult
+{
+    auto future = djinni::Promise<std::unique_ptr<int>>::resolve(std::make_unique<int>(5));
+    auto ptr = future.get();
+    XCTAssertTrue(!!ptr);
+    XCTAssertEqual(*ptr, 5);
+}
+
+@end