From 56d97d4b4df02e3464a2f003a90b7f6abae16722 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 24 Aug 2022 14:49:58 +0200
Subject: [PATCH] Remove redundant Finally

---
 src/libstore/store-api.cc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 2cd6c15ec..86b12257a 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -11,7 +11,6 @@
 #include "archive.hh"
 #include "callback.hh"
 #include "remote-store.hh"
-#include "finally.hh"
 
 #include <regex>
 
@@ -309,7 +308,6 @@ void Store::addMultipleToStore(
 
             auto & [info_, source_] = *infosMap.at(path);
             auto info = info_;
-            auto source = std::move(source_);
             info.ultimate = false;
 
             /* Make sure that the Source object is destroyed when
@@ -317,9 +315,7 @@ void Store::addMultipleToStore(
                be destroyed to ensure that the destructors on its
                stack frame are run; this includes
                LegacySSHStore::narFromPath()'s connection lock. */
-            Finally cleanupSource{[&]() {
-                source.reset();
-            }};
+            auto source = std::move(source_);
 
             if (!isValidPath(info.path)) {
                 MaintainCount<decltype(nrRunning)> mc(nrRunning);