Move code around

src/libutil/local.mk

@@ -7,3 +7,5 @@ libutil_DIR := $(d)
 libutil_SOURCES := $(wildcard $(d)/*.cc)
 
 libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) $(BOOST_LDFLAGS) -lboost_context
+
+libutil_LIBS = libnixrust

src/libutil/rust-ffi.cc

@@ -1,5 +1,5 @@
 #include "logging.hh"
-#include "rust.hh"
+#include "rust-ffi.hh"
 
 namespace nix {
 

src/libutil/tarfile.cc

@@ -0,0 +1,14 @@
+#include "rust-ffi.hh"
+
+extern "C" {
+    rust::CBox2<rust::Result<std::tuple<>>> unpack_tarfile(rust::Source source, rust::StringSlice dest_dir);
+}
+
+namespace nix {
+
+void unpackTarfile(Source & source, Path destDir)
+{
+    unpack_tarfile(source, destDir).use()->unwrap();
+}
+
+}

src/libutil/tarfile.hh

@@ -0,0 +1,7 @@
+#include "serialise.hh"
+
+namespace nix {
+
+void unpackTarfile(Source & source, Path destDir);
+
+}