libutil: move overloaded into own header

util.hh is huge and an upcoming new header wants just overloaded, not
the entire rest. also step towards reducing compile times.

Change-Id: I5ebe8c4692b4e41bc794b8f2d6d138073134dd9e

src/libcmd/built-path.cc

@@ -1,6 +1,7 @@
 #include "built-path.hh"
 #include "derivations.hh"
 #include "store-api.hh"
+#include "overloaded.hh"
 
 #include <nlohmann/json.hpp>
 

src/libcmd/command.cc

@@ -5,6 +5,7 @@
 #include "nixexpr.hh"
 #include "profiles.hh"
 #include "repl.hh"
+#include "overloaded.hh"
 
 #include <nlohmann/json.hpp>
 

src/libcmd/installable-attr-path.cc

@@ -16,6 +16,7 @@
 #include "url.hh"
 #include "registry.hh"
 #include "build-result.hh"
+#include "overloaded.hh"
 
 #include <regex>
 #include <queue>

src/libcmd/installable-derived-path.cc

@@ -1,5 +1,6 @@
 #include "installable-derived-path.hh"
 #include "derivations.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libcmd/installable-flake.cc

@@ -17,6 +17,7 @@
 #include "url.hh"
 #include "registry.hh"
 #include "build-result.hh"
+#include "overloaded.hh"
 
 #include <regex>
 #include <queue>

src/libcmd/installables.cc

@@ -20,6 +20,7 @@
 #include "url.hh"
 #include "registry.hh"
 #include "build-result.hh"
+#include "overloaded.hh"
 
 #include <regex>
 #include <queue>

src/libexpr/eval-cache.cc

@@ -3,6 +3,7 @@
 #include "eval.hh"
 #include "eval-inline.hh"
 #include "store-api.hh"
+#include "overloaded.hh"
 
 namespace nix::eval_cache {
 

src/libexpr/eval.cc

@@ -19,6 +19,7 @@
 #include "fetch-to-store.hh"
 #include "flake/flakeref.hh"
 #include "parser-tab.hh"
+#include "overloaded.hh"
 
 #include <algorithm>
 #include <chrono>

src/libexpr/flake/flake.cc

@@ -8,6 +8,7 @@
 #include "fetchers.hh"
 #include "finally.hh"
 #include "fetch-settings.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libexpr/parser-state.hh

@@ -2,6 +2,7 @@
 ///@file
 
 #include "eval.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libexpr/primops.cc

@@ -15,6 +15,7 @@
 #include "value-to-xml.hh"
 #include "primops.hh"
 #include "fetch-to-store.hh"
+#include "overloaded.hh"
 
 #include <boost/container/small_vector.hpp>
 #include <nlohmann/json.hpp>

src/libexpr/primops/context.cc

@@ -2,6 +2,7 @@
 #include "eval-inline.hh"
 #include "derivations.hh"
 #include "store-api.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libexpr/value/context.cc

@@ -1,4 +1,5 @@
 #include "value/context.hh"
+#include "overloaded.hh"
 
 #include <optional>
 

src/libstore/build/derivation-goal.cc

@@ -13,6 +13,7 @@
 #include "topo-sort.hh"
 #include "callback.hh"
 #include "local-store.hh" // TODO remove, along with remaining downcasts
+#include "overloaded.hh"
 
 #include <regex>
 #include <queue>

src/libstore/build/local-derivation-goal.cc

@@ -16,6 +16,7 @@
 #include "cgroup.hh"
 #include "personality.hh"
 #include "namespaces.hh"
+#include "overloaded.hh"
 
 #include <regex>
 #include <queue>

src/libstore/build/worker.cc

@@ -5,6 +5,7 @@
 #include "local-derivation-goal.hh"
 #include "signals.hh"
 #include "hook-instance.hh"
+#include "overloaded.hh"
 
 #include <poll.h>
 

src/libstore/content-address.cc

@@ -1,6 +1,7 @@
 #include "args.hh"
 #include "content-address.hh"
 #include "split.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libstore/daemon.cc

@@ -13,6 +13,7 @@
 #include "archive.hh"
 #include "derivations.hh"
 #include "args.hh"
+#include "overloaded.hh"
 
 namespace nix::daemon {
 

src/libstore/derivations.cc

@@ -8,6 +8,7 @@
 #include "common-protocol.hh"
 #include "common-protocol-impl.hh"
 #include "fs-accessor.hh"
+#include "overloaded.hh"
 #include <boost/container/small_vector.hpp>
 #include <nlohmann/json.hpp>
 

src/libstore/derived-path-map.cc

@@ -1,4 +1,5 @@
 #include "derived-path-map.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libstore/derived-path.cc

@@ -1,5 +1,6 @@
 #include "derived-path.hh"
 #include "store-api.hh"
+#include "overloaded.hh"
 
 #include <nlohmann/json.hpp>
 

src/libstore/downstream-placeholder.cc

@@ -1,5 +1,6 @@
 #include "downstream-placeholder.hh"
 #include "derivations.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libstore/legacy-ssh-store.cc

@@ -10,6 +10,7 @@
 #include "ssh.hh"
 #include "derivations.hh"
 #include "callback.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libstore/local-store.cc

@@ -11,6 +11,7 @@
 #include "signals.hh"
 #include "finally.hh"
 #include "compression.hh"
+#include "overloaded.hh"
 
 #include <iostream>
 #include <algorithm>

src/libstore/misc.cc

@@ -8,6 +8,7 @@
 #include "callback.hh"
 #include "closure.hh"
 #include "filetransfer.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libstore/outputs-spec.cc

@@ -5,6 +5,7 @@
 #include "regex-combinators.hh"
 #include "outputs-spec.hh"
 #include "path-regex.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libstore/path-info.cc

@@ -1,5 +1,6 @@
 #include "path-info.hh"
 #include "store-api.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libstore/path-with-outputs.cc

@@ -1,5 +1,6 @@
 #include "path-with-outputs.hh"
 #include "store-api.hh"
+#include "overloaded.hh"
 
 #include <regex>
 

src/libstore/remote-store.cc

@@ -17,6 +17,7 @@
 #include "logging.hh"
 #include "callback.hh"
 #include "filetransfer.hh"
+#include "overloaded.hh"
 #include <nlohmann/json.hpp>
 
 namespace nix {

src/libstore/store-api.cc

@@ -15,6 +15,7 @@
 // FIXME this should not be here, see TODO below on
 // `addMultipleToStore`.
 #include "worker-protocol.hh"
+#include "overloaded.hh"
 
 #include <nlohmann/json.hpp>
 #include <regex>

src/libstore/worker-protocol.cc

@@ -7,6 +7,7 @@
 #include "worker-protocol-impl.hh"
 #include "archive.hh"
 #include "path-info.hh"
+#include "overloaded.hh"
 
 #include <nlohmann/json.hpp>
 

src/libutil/overloaded.hh

@@ -0,0 +1,17 @@
+#pragma once
+
+namespace nix {
+
+/**
+ * C++17 std::visit boilerplate
+ */
+template<class... Ts>
+struct overloaded : Ts...
+{
+    using Ts::operator()...;
+};
+
+template<class... Ts>
+overloaded(Ts...) -> overloaded<Ts...>;
+
+}

src/libutil/position.cc

@@ -1,4 +1,5 @@
 #include "position.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/libutil/util.hh

@@ -880,13 +880,6 @@ constexpr auto enumerate(T && iterable)
 }
 
 
-/**
- * C++17 std::visit boilerplate
- */
-template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
-template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
-
-
 std::string showBytes(uint64_t bytes);
 
 

src/nix/app.cc

@@ -8,6 +8,7 @@
 #include "command.hh"
 #include "derivations.hh"
 #include "downstream-placeholder.hh"
+#include "overloaded.hh"
 
 namespace nix {
 

src/nix/build.cc

@@ -4,6 +4,7 @@
 #include "store-api.hh"
 #include "local-fs-store.hh"
 #include "progress-bar.hh"
+#include "overloaded.hh"
 
 #include <nlohmann/json.hpp>
 

src/nix/log.cc

@@ -4,6 +4,7 @@
 #include "store-api.hh"
 #include "log-store.hh"
 #include "progress-bar.hh"
+#include "overloaded.hh"
 
 using namespace nix;
 

src/nix/profile.cc

@@ -10,6 +10,7 @@
 #include "../nix-env/user-env.hh"
 #include "profiles.hh"
 #include "names.hh"
+#include "overloaded.hh"
 
 #include <nlohmann/json.hpp>
 #include <regex>

tests/unit/libutil-support/tests/cli-literate-parser.cc

@@ -2,6 +2,7 @@
 #include "libexpr/print.hh"
 #include "debug-char.hh"
 #include "types.hh"
+#include "overloaded.hh"
 #include "util.hh"
 #include <iostream>
 #include <memory>