Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple

1 files changed, 7 insertions, 5 deletions

diff --git a/src/libutil/finally.hh b/src/libutil/finally.hh
index 7760cfe9a..db654301f 100644
--- a/src/libutil/finally.hh
+++ b/src/libutil/finally.hh
@@ -1,14 +1,16 @@
 #pragma once
+///@file
 
-#include <functional>
-
-/* A trivial class to run a function at the end of a scope. */
+/**
+ * A trivial class to run a function at the end of a scope.
+ */
+template<typename Fn>
 class Finally
 {
 private:
-    std::function<void()> fun;
+    Fn fun;
 
 public:
-    Finally(std::function<void()> fun) : fun(fun) { }
+    Finally(Fn fun) : fun(std::move(fun)) { }
     ~Finally() { fun(); }
 };