From 00d8f9a6997a977637aa372b1c21a27d5fc99f72 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 7 Sep 2023 22:31:19 -0400
Subject: [PATCH] Move `ParseSink` to its own header

We will soon add a new implemenation so the one for NARs in `archive.cc`
isn't the only one.
---
 src/libutil/archive.hh | 17 +----------------
 src/libutil/fs-sink.hh | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 src/libutil/fs-sink.hh

diff --git a/src/libutil/archive.hh b/src/libutil/archive.hh
index 2cf164a417d..3530783c1d2 100644
--- a/src/libutil/archive.hh
+++ b/src/libutil/archive.hh
@@ -3,6 +3,7 @@
 
 #include "types.hh"
 #include "serialise.hh"
+#include "fs-sink.hh"
 
 
 namespace nix {
@@ -72,22 +73,6 @@ time_t dumpPathAndGetMtime(const Path & path, Sink & sink,
  */
 void dumpString(std::string_view s, Sink & sink);
 
-/**
- * \todo Fix this API, it sucks.
- */
-struct ParseSink
-{
-    virtual void createDirectory(const Path & path) { };
-
-    virtual void createRegularFile(const Path & path) { };
-    virtual void closeRegularFile() { };
-    virtual void isExecutable() { };
-    virtual void preallocateContents(uint64_t size) { };
-    virtual void receiveContents(std::string_view data) { };
-
-    virtual void createSymlink(const Path & path, const std::string & target) { };
-};
-
 /**
  * If the NAR archive contains a single file at top-level, then save
  * the contents of the file to `s`.  Otherwise barf.
diff --git a/src/libutil/fs-sink.hh b/src/libutil/fs-sink.hh
new file mode 100644
index 00000000000..ed6484e6111
--- /dev/null
+++ b/src/libutil/fs-sink.hh
@@ -0,0 +1,25 @@
+#pragma once
+///@file
+
+#include "types.hh"
+#include "serialise.hh"
+
+namespace nix {
+
+/**
+ * \todo Fix this API, it sucks.
+ */
+struct ParseSink
+{
+    virtual void createDirectory(const Path & path) { };
+
+    virtual void createRegularFile(const Path & path) { };
+    virtual void closeRegularFile() { };
+    virtual void isExecutable() { };
+    virtual void preallocateContents(uint64_t size) { };
+    virtual void receiveContents(std::string_view data) { };
+
+    virtual void createSymlink(const Path & path, const std::string & target) { };
+};
+
+}