Include rearrangement: libutil

Change-Id: Ibf4ee57e430ce1cd175f994d1db7964c8407ffa7

src/libutil/abstract-setting-to-json.hh

@@ -2,10 +2,10 @@
 ///@file
 
 #include <nlohmann/json.hpp>
-#include "config.hh"
-#include "json-utils.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libutil/json-utils.hh"
 // Required for instances of to_json and from_json for ExperimentalFeature
-#include "experimental-features-json.hh"
+#include "lix/libutil/experimental-features-json.hh"
 
 namespace nix {
 template<typename T>

src/libutil/apply-config-options.hh

@@ -4,7 +4,7 @@
  * @brief Options for applying `Config` settings.
  */
 
-#include <types.hh>
+#include "lix/libutil/types.hh"
 
 namespace nix {
 

src/libutil/archive.cc

@@ -12,13 +12,13 @@
 #include <dirent.h>
 #include <fcntl.h>
 
-#include "archive.hh"
-#include "file-system.hh"
-#include "finally.hh"
-#include "serialise.hh"
-#include "config.hh"
-#include "logging.hh"
-#include "signals.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/signals.hh"
 
 namespace nix {
 

src/libutil/archive.hh

@@ -1,10 +1,10 @@
 #pragma once
 ///@file
 
-#include "generator.hh"
-#include "types.hh"
-#include "serialise.hh"
-#include "file-system.hh"
+#include "lix/libutil/generator.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/file-system.hh"
 
 
 namespace nix {

src/libutil/args.cc

@@ -1,12 +1,12 @@
-#include "args.hh"
-#include "args/root.hh"
-#include "hash.hh"
-#include "strings.hh"
-#include "json-utils.hh" // IWYU pragma: keep (instances)
-#include "environment-variables.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/args/root.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/json-utils.hh" // IWYU pragma: keep (instances)
+#include "lix/libutil/environment-variables.hh"
 
-#include "experimental-features-json.hh" // IWYU pragma: keep (instances)
-#include "logging.hh"
+#include "lix/libutil/experimental-features-json.hh" // IWYU pragma: keep (instances)
+#include "lix/libutil/logging.hh"
 
 #include <glob.h>
 

src/libutil/args.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "experimental-features.hh"
-#include "types.hh"
-#include "ref.hh"
+#include "lix/libutil/experimental-features.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/ref.hh"
 
 #include <functional>
 #include <map>

src/libutil/args/root.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "args.hh"
+#include "lix/libutil/args.hh"
 
 namespace nix {
 

src/libutil/canon-path.cc

@@ -1,5 +1,5 @@
-#include "canon-path.hh"
-#include "file-system.hh"
+#include "lix/libutil/canon-path.hh"
+#include "lix/libutil/file-system.hh"
 
 namespace nix {
 

src/libutil/cgroup.cc

@@ -1,10 +1,10 @@
-#include "logging.hh"
+#include "lix/libutil/logging.hh"
 #if __linux__
 
-#include "cgroup.hh"
-#include "file-system.hh"
-#include "finally.hh"
-#include "strings.hh"
+#include "lix/libutil/cgroup.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/strings.hh"
 
 #include <chrono>
 #include <cmath>

src/libutil/cgroup.hh

@@ -6,7 +6,7 @@
 #include <chrono>
 #include <optional>
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 

src/libutil/compression.cc

@@ -1,8 +1,8 @@
-#include "charptr-cast.hh"
-#include "compression.hh"
-#include "tarfile.hh"
-#include "signals.hh"
-#include "logging.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libutil/compression.hh"
+#include "lix/libutil/tarfile.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/logging.hh"
 
 #include <archive.h>
 #include <archive_entry.h>

src/libutil/compression.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "ref.hh"
-#include "types.hh"
-#include "serialise.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/serialise.hh"
 
 #include <string>
 

src/libutil/compute-levels.cc

@@ -1,4 +1,4 @@
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 #if HAVE_LIBCPUID
 #include <libcpuid/libcpuid.h>

src/libutil/compute-levels.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 

src/libutil/config-impl.hh

@@ -12,9 +12,9 @@
  * instantiation.
  */
 
-#include "args.hh"
-#include "config.hh"
-#include "logging.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libutil/logging.hh"
 
 namespace nix {
 

src/libutil/config.cc

@@ -1,14 +1,14 @@
-#include "config.hh"
-#include "apply-config-options.hh"
-#include "args.hh"
-#include "abstract-setting-to-json.hh"
-#include "experimental-features.hh"
-#include "deprecated-features.hh"
-#include "file-system.hh"
-#include "logging.hh"
-#include "strings.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libutil/apply-config-options.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/abstract-setting-to-json.hh"
+#include "lix/libutil/experimental-features.hh"
+#include "lix/libutil/deprecated-features.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/strings.hh"
 
-#include "config-impl.hh"
+#include "lix/libutil/config-impl.hh"
 
 #include <nlohmann/json.hpp>
 

src/libutil/config.hh

@@ -7,10 +7,10 @@
 
 #include <nlohmann/json_fwd.hpp>
 
-#include "types.hh"
-#include "experimental-features.hh"
-#include "deprecated-features.hh"
-#include "apply-config-options.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/experimental-features.hh"
+#include "lix/libutil/deprecated-features.hh"
+#include "lix/libutil/apply-config-options.hh"
 
 namespace nix {
 

src/libutil/current-process.cc

@@ -1,10 +1,11 @@
-#include "current-process.hh"
-#include "error.hh"
-#include "file-system.hh"
-#include "logging.hh"
-#include "namespaces.hh"
-#include "signals.hh"
-#include "strings.hh"
+#include "lix/libutil/current-process.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/namespaces.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/cgroup.hh"
 #include <math.h>
 
 #ifdef __APPLE__
@@ -21,7 +22,6 @@
 #endif
 
 #include <sys/mount.h>
-#include <cgroup.hh>
 
 namespace nix {
 

src/libutil/current-process.hh

@@ -4,7 +4,7 @@
 #include <optional>
 #include <sys/resource.h>
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 

src/libutil/deprecated-features-json.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "deprecated-features.hh"
-#include "json-utils.hh"
+#include "lix/libutil/deprecated-features.hh"
+#include "lix/libutil/json-utils.hh"
 
 namespace nix {
 

src/libutil/deprecated-features.cc

@@ -1,7 +1,7 @@
-#include "deprecated-features.hh"
+#include "lix/libutil/deprecated-features.hh"
 // Required for instances of to_json and from_json for DeprecatedFeature
-#include "deprecated-features-json.hh"
-#include "strings.hh"
+#include "lix/libutil/deprecated-features-json.hh"
+#include "lix/libutil/strings.hh"
 
 #include "nlohmann/json.hpp"
 

src/libutil/deprecated-features.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "error.hh"
-#include "types.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 

src/libutil/english.cc

@@ -1,4 +1,4 @@
-#include "english.hh"
+#include "lix/libutil/english.hh"
 
 namespace nix {
 

src/libutil/error.cc

@@ -1,10 +1,10 @@
-#include "environment-variables.hh"
-#include "error.hh"
-#include "logging.hh"
-#include "position.hh"
-#include "terminal.hh"
-#include "strings.hh"
-#include "signals.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/position.hh"
+#include "lix/libutil/terminal.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/signals.hh"
 
 #include <iostream>
 #include <optional>

src/libutil/error.hh

@@ -15,8 +15,8 @@
  * See libutil/tests/logging.cc for usage examples.
  */
 
-#include "suggestions.hh"
-#include "fmt.hh"
+#include "lix/libutil/suggestions.hh"
+#include "lix/libutil/fmt.hh"
 
 #include <cstring>
 #include <list>

src/libutil/escape-char.cc

@@ -2,7 +2,7 @@
 #include <iomanip>
 #include <iostream>
 
-#include "escape-char.hh"
+#include "lix/libutil/escape-char.hh"
 
 namespace nix {
 

src/libutil/escape-string.cc

@@ -2,11 +2,11 @@
 #include <ostream>
 #include <sstream>
 
-#include "ansicolor.hh"
-#include "escape-char.hh"
-#include "english.hh"
-#include "escape-string.hh"
-#include "print-elided.hh"
+#include "lix/libutil/ansicolor.hh"
+#include "lix/libutil/escape-char.hh"
+#include "lix/libutil/english.hh"
+#include "lix/libutil/escape-string.hh"
+#include "lix/libutil/print-elided.hh"
 
 namespace nix {
 

src/libutil/exit.cc

@@ -1,4 +1,4 @@
-#include "exit.hh"
+#include "lix/libutil/exit.hh"
 
 namespace nix {
 

src/libutil/experimental-features-json.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "experimental-features.hh"
-#include "json-utils.hh"
+#include "lix/libutil/experimental-features.hh"
+#include "lix/libutil/json-utils.hh"
 
 namespace nix {
 

src/libutil/experimental-features.cc

@@ -1,7 +1,7 @@
-#include "experimental-features.hh"
+#include "lix/libutil/experimental-features.hh"
 // Required for instances of to_json and from_json for ExperimentalFeature
-#include "experimental-features-json.hh"
-#include "strings.hh"
+#include "lix/libutil/experimental-features-json.hh"
+#include "lix/libutil/strings.hh"
 
 #include "nlohmann/json.hpp"
 

src/libutil/experimental-features.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "error.hh"
-#include "types.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/types.hh"
 
 namespace nix {
 

src/libutil/file-descriptor.cc

@@ -1,9 +1,9 @@
-#include "charptr-cast.hh"
-#include "file-system.hh"
-#include "finally.hh"
-#include "logging.hh"
-#include "serialise.hh"
-#include "signals.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/signals.hh"
 
 #include <fcntl.h>
 #include <unistd.h>

src/libutil/file-descriptor.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "error.hh"
-#include "generator.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/generator.hh"
 
 namespace nix {
 

src/libutil/file-system.cc

@@ -4,16 +4,16 @@
 #include <atomic>
 #include <random>
 
-#include "environment-variables.hh"
-#include "file-descriptor.hh"
-#include "file-system.hh"
-#include "finally.hh"
-#include "logging.hh"
-#include "serialise.hh"
-#include "signals.hh"
-#include "strings.hh"
-#include "types.hh"
-#include "users.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/file-descriptor.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/users.hh"
 
 namespace fs = std::filesystem;
 

src/libutil/file-system.hh

@@ -5,9 +5,9 @@
  * Utiltities for working with the file sytem and file paths.
  */
 
-#include "box_ptr.hh"
-#include "types.hh"
-#include "file-descriptor.hh"
+#include "lix/libutil/box_ptr.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/file-descriptor.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/libutil/fmt.cc

@@ -1,4 +1,4 @@
-#include "fmt.hh" // IWYU pragma: keep
+#include "lix/libutil/fmt.hh" // IWYU pragma: keep
 // Darwin and FreeBSD stdenv do not define _GNU_SOURCE but do have _Unwind_Backtrace.
 #if __APPLE__ || __FreeBSD__
 #define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED

src/libutil/fmt.hh

@@ -4,7 +4,7 @@
 #include <iostream>
 #include <string>
 #include <boost/format.hpp>
-#include "ansicolor.hh"
+#include "lix/libutil/ansicolor.hh"
 
 // Explicit instantiation in fmt.cc
 extern template class boost::basic_format<char>;

src/libutil/generator.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 #include <coroutine>
 #include <exception>

src/libutil/git.cc

@@ -1,4 +1,4 @@
-#include "git.hh"
+#include "lix/libutil/git.hh"
 
 #include <regex>
 

src/libutil/hash.cc

@@ -4,13 +4,13 @@
 #include <openssl/md5.h>
 #include <openssl/sha.h>
 
-#include "args.hh"
-#include "hash.hh"
-#include "archive.hh"
-#include "charptr-cast.hh"
-#include "logging.hh"
-#include "split.hh"
-#include "strings.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/split.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/libutil/hash.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "serialise.hh"
-#include "file-system.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/file-system.hh"
 
 
 namespace nix {

src/libutil/hilite.cc

@@ -1,4 +1,4 @@
-#include "hilite.hh"
+#include "lix/libutil/hilite.hh"
 
 namespace nix {
 

src/libutil/json-utils.cc

@@ -1,5 +1,5 @@
-#include "json-utils.hh"
-#include "error.hh"
+#include "lix/libutil/json-utils.hh"
+#include "lix/libutil/error.hh"
 
 namespace nix {
 

src/libutil/logging-json.hh

@@ -4,7 +4,7 @@
 ///@brief Logging functions for json specifically, split due to the cost of
 ///including nlohmann.
 
-#include "logging.hh"
+#include "lix/libutil/logging.hh"
 
 #include <nlohmann/json_fwd.hpp>
 

src/libutil/logging.cc

@@ -1,9 +1,9 @@
-#include "environment-variables.hh"
-#include "file-descriptor.hh"
-#include "logging.hh"
-#include "config.hh"
-#include "position.hh"
-#include "terminal.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/file-descriptor.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libutil/position.hh"
+#include "lix/libutil/terminal.hh"
 
 #include <algorithm>
 #include <atomic>

src/libutil/logging.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "error.hh"
-#include "config.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/config.hh"
 
 namespace nix {
 

src/libutil/monitor-fd.hh

@@ -10,9 +10,9 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "error.hh"
-#include "file-descriptor.hh"
-#include "signals.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/file-descriptor.hh"
+#include "lix/libutil/signals.hh"
 
 namespace nix {
 

src/libutil/mount.cc

@@ -1,7 +1,7 @@
-#include "mount.hh"
-#include "error.hh"
-#include "file-system.hh"
-#include "logging.hh"
+#include "lix/libutil/mount.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/logging.hh"
 #if __linux__
 #include <sys/mount.h>
 

src/libutil/mount.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 #if __linux__
 namespace nix {

src/libutil/namespaces.cc

@@ -1,9 +1,9 @@
-#include "file-descriptor.hh"
-#include "file-system.hh"
-#include "logging.hh"
-#include "namespaces.hh"
-#include "processes.hh"
-#include "strings.hh"
+#include "lix/libutil/file-descriptor.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/namespaces.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sys/mount.h>
 

src/libutil/pool.hh

@@ -7,8 +7,8 @@
 #include <memory>
 #include <cassert>
 
-#include "sync.hh"
-#include "ref.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libutil/ref.hh"
 
 namespace nix {
 

src/libutil/position.cc

@@ -1,4 +1,4 @@
-#include "position.hh"
+#include "lix/libutil/position.hh"
 
 namespace nix {
 

src/libutil/position.hh

@@ -8,7 +8,7 @@
 #include <cstdint>
 #include <string>
 
-#include "source-path.hh"
+#include "lix/libutil/source-path.hh"
 
 namespace nix {
 

src/libutil/print-elided.cc

@@ -1,6 +1,6 @@
-#include "print-elided.hh"
-#include "ansicolor.hh"
-#include "english.hh"
+#include "lix/libutil/print-elided.hh"
+#include "lix/libutil/ansicolor.hh"
+#include "lix/libutil/english.hh"
 
 namespace nix {
 

src/libutil/processes.cc

@@ -1,11 +1,11 @@
-#include "current-process.hh"
-#include "environment-variables.hh"
-#include "finally.hh"
-#include "logging.hh"
-#include "processes.hh"
-#include "strings.hh"
-#include "serialise.hh"
-#include "signals.hh"
+#include "lix/libutil/current-process.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/signals.hh"
 
 #include <cerrno>
 #include <cstdlib>

src/libutil/processes.hh

@@ -1,9 +1,9 @@
 #pragma once
 ///@file
 
-#include "types.hh"
-#include "error.hh"
-#include "file-descriptor.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/file-descriptor.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/libutil/references.cc

@@ -1,6 +1,6 @@
-#include "references.hh"
-#include "hash.hh"
-#include "logging.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libutil/hash.hh"
+#include "lix/libutil/logging.hh"
 
 #include <cstdlib>
 #include <mutex>

src/libutil/references.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "hash.hh"
+#include "lix/libutil/hash.hh"
 
 namespace nix {
 

src/libutil/regex-combinators.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "strings.hh"
+#include "lix/libutil/strings.hh"
 
 #include <string_view>
 

src/libutil/serialise.cc

@@ -1,6 +1,6 @@
-#include "serialise.hh"
-#include "charptr-cast.hh"
-#include "signals.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libutil/signals.hh"
 
 #include <cstring>
 #include <cerrno>

src/libutil/serialise.hh

@@ -3,10 +3,10 @@
 
 #include <memory>
 
-#include "charptr-cast.hh"
-#include "generator.hh"
-#include "types.hh"
-#include "file-descriptor.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libutil/generator.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/file-descriptor.hh"
 
 namespace nix {
 

src/libutil/shlex.cc

@@ -1,5 +1,5 @@
-#include "shlex.hh"
-#include "strings.hh"
+#include "lix/libutil/shlex.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libutil/shlex.hh

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "error.hh"
+#include "lix/libutil/error.hh"
 
 namespace nix {
 

src/libutil/signals.cc

@@ -1,7 +1,7 @@
-#include "signals.hh"
-#include "error.hh"
-#include "sync.hh"
-#include "terminal.hh"
+#include "lix/libutil/signals.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/sync.hh"
+#include "lix/libutil/terminal.hh"
 
 #include <map>
 #include <thread>

src/libutil/signals.hh

@@ -19,7 +19,7 @@
  */
 
 
-#include "error.hh"
+#include "lix/libutil/error.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/libutil/source-path.cc

@@ -1,5 +1,5 @@
-#include "source-path.hh"
-#include "strings.hh"
+#include "lix/libutil/source-path.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libutil/source-path.hh

@@ -5,12 +5,12 @@
  * @brief SourcePath
  */
 
-#include "ref.hh"
-#include "archive.hh"
-#include "canon-path.hh"
-#include "file-system.hh"
-#include "repair-flag.hh"
-#include "input-accessor.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libutil/archive.hh"
+#include "lix/libutil/canon-path.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/repair-flag.hh"
+#include "lix/libutil/input-accessor.hh"
 
 namespace nix {
 

src/libutil/strings.cc

@@ -1,5 +1,5 @@
-#include "strings.hh"
-#include "references.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/references.hh"
 #include <boost/lexical_cast.hpp>
 #include <stdint.h>
 

src/libutil/strings.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "error.hh"
-#include "types.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/types.hh"
 
 #include <vector>
 

src/libutil/suggestions.cc

@@ -1,6 +1,6 @@
-#include "suggestions.hh"
-#include "ansicolor.hh"
-#include "terminal.hh"
+#include "lix/libutil/suggestions.hh"
+#include "lix/libutil/ansicolor.hh"
+#include "lix/libutil/terminal.hh"
 
 #include <algorithm>
 #include <ostream>

src/libutil/suggestions.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "comparator.hh"
+#include "lix/libutil/comparator.hh"
 
 #include <set>
 #include <string_view>

src/libutil/tarfile.cc

@@ -1,11 +1,11 @@
 #include <archive.h>
 #include <archive_entry.h>
 
-#include "charptr-cast.hh"
-#include "file-system.hh"
-#include "logging.hh"
-#include "serialise.hh"
-#include "tarfile.hh"
+#include "lix/libutil/charptr-cast.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/tarfile.hh"
 
 namespace nix {
 

src/libutil/tarfile.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "serialise.hh"
+#include "lix/libutil/serialise.hh"
 #include <archive.h>
 
 namespace nix {

src/libutil/terminal.cc

@@ -1,6 +1,6 @@
-#include "terminal.hh"
-#include "environment-variables.hh"
-#include "sync.hh"
+#include "lix/libutil/terminal.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/sync.hh"
 
 #include <sys/ioctl.h>
 #include <unistd.h>

src/libutil/thread-pool.cc

@@ -1,6 +1,6 @@
-#include "thread-pool.hh"
-#include "logging.hh"
-#include "signals.hh"
+#include "lix/libutil/thread-pool.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/signals.hh"
 
 namespace nix {
 

src/libutil/thread-pool.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "error.hh"
-#include "sync.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/sync.hh"
 
 #include <map>
 #include <queue>

src/libutil/topo-sort.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "error.hh"
+#include "lix/libutil/error.hh"
 
 namespace nix {
 

src/libutil/unix-domain-socket.cc

@@ -1,7 +1,7 @@
-#include "file-system.hh"
-#include "processes.hh"
-#include "unix-domain-socket.hh"
-#include "strings.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/unix-domain-socket.hh"
+#include "lix/libutil/strings.hh"
 
 #include <sys/socket.h>
 #include <sys/un.h>

src/libutil/unix-domain-socket.hh

@@ -1,8 +1,8 @@
 #pragma once
 ///@file
 
-#include "file-descriptor.hh"
-#include "types.hh"
+#include "lix/libutil/file-descriptor.hh"
+#include "lix/libutil/types.hh"
 
 #include <unistd.h>
 

src/libutil/url-name.cc

@@ -1,6 +1,6 @@
 #include <regex>
 
-#include "url-name.hh"
+#include "lix/libutil/url-name.hh"
 
 namespace nix {
 

src/libutil/url-name.hh

@@ -4,7 +4,7 @@
 #include <string>
 #include <optional>
 
-#include "url.hh"
+#include "lix/libutil/url.hh"
 
 namespace nix {
 

src/libutil/url.cc

@@ -1,7 +1,7 @@
-#include "url.hh"
-#include "url-parts.hh"
-#include "split.hh"
-#include "strings.hh"
+#include "lix/libutil/url.hh"
+#include "lix/libutil/url-parts.hh"
+#include "lix/libutil/split.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

src/libutil/url.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "error.hh"
+#include "lix/libutil/error.hh"
 #include <map>
 
 namespace nix {

src/libutil/users.cc

@@ -1,7 +1,7 @@
-#include "environment-variables.hh"
-#include "file-system.hh"
-#include "logging.hh"
-#include "strings.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libutil/strings.hh"
 
 #include <pwd.h>
 #include <sys/types.h>

src/libutil/users.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 
 #include <sys/types.h>
 

src/libutil/xml-writer.cc

@@ -1,6 +1,6 @@
 #include <cassert>
 
-#include "xml-writer.hh"
+#include "lix/libutil/xml-writer.hh"
 
 
 namespace nix {